cassidy/project-meteor-server
1
0 Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-05-20 08:26:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
395 Commits 4 Branches 2 Tags
b43a6885c56b2833bd651a965f9fb8595f201bea
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Filip Maj b43a6885c5 Added functions to allow for an improved seamless zone change. Player can now pull actors from two zones when performing a seamless zone change to give a improved feel. 2016-07-31 21:48:17 -04:00
Filip Maj 63edbe81f3 Added code to generate lua files from db. 2016-07-31 21:07:37 -04:00
Filip Maj 205136d661 Improved trigger box packet. 2016-07-31 21:07:26 -04:00
Filip Maj 2939683183 Added property flags for actors. Cleaned up NPC constructor. 2016-07-24 10:21:45 -04:00
Filip Maj 4ef62a16ec Merge branch 'master' into develop 2016-07-17 13:06:56 -04:00
Filip Maj 7f65cfcbbf Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server 2016-07-17 13:06:38 -04:00
Filip Maj 70b4fc8630 Removed some packet debug outputs. 2016-07-17 09:21:17 -04:00
Filip Maj 2c30b7dfc1 Merged in xdemolish/ffxiv-classic-server/lua_commands (pull request #17) 
derped with some debug logging (thought i pushed this earlier)
 2016-07-17 09:20:13 -04:00
Filip Maj 136ced3aae Added all the shop keeper scripts in Ul'dah. Fixed some broken populace scripts. Changed .ini files, wrong default. Fixed a syntax error in CommandProcessor.cs. 2016-07-16 20:12:04 -04:00
Filip Maj 5b7ad2364b Merge branch 'master' into develop 2016-07-16 20:04:49 -04:00
Filip Maj 302d7bd68a Merged in xdemolish/ffxiv-classic-server/lua_commands (pull request #16) 
dynamic gm commands + packet logging fix
 2016-07-16 19:52:54 -04:00
Filip Maj d26b64b458 Fixed some minor lua related crashing when the parent file was not found for some reason. Used decorated message for error output, not normal message. 2016-07-16 19:52:13 -04:00
Filip Maj 110cfbccc2 Fixed errors in the spawn location tables. 2016-06-21 23:00:39 -04:00
Filip Maj 3cd181f5da Ported over the Limsa/Uldah opening zone scripts. Still not 100% done. 2016-06-21 22:50:30 -04:00
Filip Maj 926e9146e2 Fixed a few scripts. Jellyfish init script was built so it didn't crash boat zone. 2016-06-21 20:07:02 -04:00
Filip Maj 4c7316702d Limsa Town npcs ported over. 2016-06-21 19:54:52 -04:00
Filip Maj 44acee7e6d Made a note that Guencen is unreachable and has no real script. 2016-06-21 18:01:12 -04:00
Filip Maj d06bf5499f Set Ansgor to correct talk. 2016-06-21 17:56:38 -04:00
Filip Maj 3969fff64a Finished converting over all scripts. 2016-06-21 17:48:50 -04:00
Filip Maj 8b44d90114 Modified all wil0Town01 scripts to new way. 2016-06-21 15:48:16 -04:00
Filip Maj ff2f587959 Modified all wil0Town01a scripts to new way. 2016-06-21 15:29:48 -04:00
Filip Maj 1242a8b00c New event conditions to take advantage of PlaceDrivenCommands. 2016-06-19 23:24:19 -04:00
Filip Maj 1546ed54fc Moved aetheryte script to new system. 2016-06-19 23:23:01 -04:00
Filip Maj 97c1fb06cf More script work. 2016-06-19 23:16:31 -04:00
Filip Maj 8743042950 Cleaned up the new scripting code. Added a helper function to do the yielding automatically. Modified all the scripts to use the new system and added a few new ones. 2016-06-19 18:52:34 -04:00
Filip Maj 51bbf4ae2e Non-npc stuff is now also using script system. Wrote new scripts for all sidemenu commands. 2016-06-18 12:26:29 -04:00
Filip Maj 4e69022072 New style of scripting for better complex menus. 2016-06-17 23:17:24 -04:00
Filip Maj cdf4b3a2f2 GuildShop script done. 2016-06-16 22:44:50 -04:00
Filip Maj f4060e16bf Merged in xdemolish/ffxiv-classic-server/derp (pull request #15) 
fixed derps causing client/server crashes
 2016-06-16 14:20:40 -04:00
Filip Maj 8eaa920751 Fixed logs on map. 2016-06-15 20:09:53 -04:00
Filip Maj fbf6810c5c Fixed logs on lobby. 2016-06-15 20:06:08 -04:00
Filip Maj 9b3712044d Merged in xdemolish/ffxiv-classic-server/logging_and_casing (pull request #14) 
moved stray console.writeline to use main logger
 2016-06-15 14:22:05 -04:00
Filip Maj 1bac69c893 Fixed some startup output. 2016-06-15 10:40:30 -04:00
Filip Maj 9a29d0806a Merged in xdemolish/ffxiv-classic-server/logging_and_casing (pull request #13) 
fixed logging and casing
 2016-06-15 10:23:42 -04:00
Filip Maj c612b885dd Ul'dah npcs completed. 2016-06-14 21:47:54 -04:00
Filip Maj f5619ff800 All of Limsa scripted. Ul'dah scripts auto generated. 2016-06-13 22:27:12 -04:00
Filip Maj d1c8987091 Scripted almost all of lower limsa. 2016-06-13 21:26:19 -04:00
Filip Maj 65389e3362 Added scripts for the inn keepers. Added default event conditions to almost all actors. Updated sql for actorClass, spawnLocations, and new zoneEntrances. 2016-06-12 21:30:47 -04:00
Filip Maj 5723f77b1f Added all the new scripts for the actor instancing system. 2016-06-12 19:06:03 -04:00
Filip Maj a4ea5f024b Merge branch 'actor_instancing' into develop 
# Conflicts:
#	sql/gamedata_actor_class.sql
 2016-06-12 18:52:30 -04:00
Filip Maj fec348136e Merge branch 'master' into develop 
# Conflicts:
#	FFXIVClassic Map Server/CommandProcessor.cs
 2016-06-12 18:51:24 -04:00
Filip Maj 957a8d89bb Null event conditions get defaulted to empty conditions to allow anything to spawn. More work on the scripts. Committing the new sql schema + imports of all 3 town zones. 2016-06-12 18:43:41 -04:00
Filip Maj f0d4429f65 Child scripts now loaded by a uniqueId in the spawn table. 2016-06-09 22:58:03 -04:00
Filip Maj 23b6ede128 Designed the new script system for npcs. Added missing appearance info. 2016-06-09 00:46:17 -04:00
Filip Maj 92339ba0c4 Merged in xdemolish/ffxiv-classic-server (pull request #11) 
fixed character create errors and..
 2016-06-08 14:04:02 -04:00
Filip Maj 62d1fec8b3 README.md edited online with Bitbucket 2016-06-06 15:26:03 +00:00
Filip Maj abbdaf1368 README.md edited online with Bitbucket, changed IRC server to Discord. 2016-06-06 15:24:57 +00:00
Filip Maj fc51b7f564 Modified scripts to work with new system. 2016-05-29 16:03:24 -04:00
Filip Maj 62ed9b22f1 Implemented actor instancing, as well as automatic name generation for NPCs. 2016-05-29 15:14:09 -04:00
Filip Maj f0ec2125ac Found out the second weather packet value is a transition time. 2016-05-09 22:19:57 -04:00
Filip Maj b45390adb6 Fixed null worldManager due to it being set as a static variable at class creation. 2016-05-09 20:57:32 -04:00
Filip Maj 8df79c9e6f Modified the SetWeatherPacket. Second value is a toggle for instant or smooth transitions. 2016-05-09 20:48:18 -04:00
Filip Maj 78f2b18641 Merged in TheManii/ffxiv-classic-server (pull request #10) 
Merge ingame_help part 3
 2016-05-09 20:38:28 -04:00
Filip Maj 541456bd8e Fixed bug with warp. WorldManager cannot be statically stored like that. 2016-04-24 17:59:50 -04:00
Ioncannon 9e2960c047 Merged in TheManii/ffxiv-classic-server (pull request #9) 
Make post build not fail due to modified files/silently ignore updated files
 2016-04-18 16:23:55 -04:00
Ioncannon c944d262b3 Merged in TheManii/ffxiv-classic-server (pull request #8) 
Merge web_part_1
 2016-04-18 13:49:46 -04:00
Filip Maj 7827fbf8d3 Took out some test code for the limsa opening script. 2016-04-18 13:44:51 -04:00
Filip Maj d01c780cac Latest sql files. Also the gamedata ones were split from the main core. 2016-04-18 13:43:09 -04:00
Filip Maj ffae2b744f Untracked the ./scripts folder since it was moved to ./data/scripts 2016-04-18 13:35:10 -04:00
Filip Maj 53064a7345 All the script changes done to get the openings working. 2016-04-18 13:33:31 -04:00
Filip Maj 3d5fa45730 Merge branch 'develop' 
# Conflicts:
#	FFXIVClassic Map Server/FFXIVClassic Map Server.csproj
#	FFXIVClassic Map Server/Server.cs
#	data/scripts/player.lua
#	scripts/zones/193/npcs/[email protected]
 2016-04-18 13:31:55 -04:00
Filip Maj 79eaf5d79e Added more quest functions and completed the scripts for Gridania and most of Ul'dah. Up to the battle part that is. 2016-04-17 19:09:01 -04:00
Filip Maj 95849e1c1c onInit was added to all the scripts. Added code for all the Limsa opening event npcs. 2016-04-14 08:31:39 -04:00
Filip Maj bd4e4a293c Removed a buffer being created for no reason. 2016-04-14 08:30:34 -04:00
Filip Maj d989ec2a58 Added two callbacks to the Director; onTalked and onCommand. Split the command and event starts and keep track of them separately. 2016-04-14 08:30:21 -04:00
Filip Maj 108f5aa677 Fixed crash due to bad constructor for QuestDirectorMan0L001. Unsigned integers will also write out as lua 0-datatype. 2016-04-11 22:49:05 -04:00
Filip Maj fe111ab6ca Quest data is now saved/loaded from the DB. 2016-04-10 13:11:12 -04:00
Ioncannon de7484a931 Merged in TheManii/ffxiv-classic-server (pull request #7) 
Merge ingame_help part 2
 2016-04-10 11:17:37 -04:00
Filip Maj b8a3d4f1e0 Added quest director class. 2016-04-10 11:14:36 -04:00
Filip Maj c0cd7555e1 -Fixed up the quest flag functions. 
-Renamed the ActorSpecialGraphicPacket to SetActorQuestGraphic as those icons all have to do with questing.
-Got onSpawn to work and implemented the quest graphics.
-Added new QuestDirector class.
 2016-04-07 22:34:10 -04:00
Filip Maj 1f5788def8 Redundent zoneid was redundent. 2016-04-07 22:32:04 -04:00
Ioncannon 8b55993f25 Merged in TheManii/ffxiv-classic-server (pull request #5) 
Disable login10/11
 2016-04-07 13:23:44 -04:00
Ioncannon dabbff1fda Merged in TheManii/ffxiv-classic-server (pull request #3) 
Simplify post build steps
 2016-04-06 13:40:45 -04:00
Ioncannon 77c12c489c Merged in VeryCrushed/ffxiv-classic-server (pull request #4) 
Fixed the SQL schema to work with the map server as well as updated the server id in the config file to match that in the database
 2016-04-06 13:39:52 -04:00
Filip Maj 23aef8cc46 Removed need for the login2.bin packet file. 2016-04-05 17:34:34 -04:00
Filip Maj b68d13ea7f Cleaned up the lua calls and renamed "onInstantiation" to "init". Added a "onSpawn" callback but still working on it. Added the "ActorSpecialGraphicPacket" and functions to use it. 2016-04-02 17:56:01 -04:00
Filip Maj e501d5b796 Merge branch 'develop' 2016-04-01 23:50:29 -04:00
Filip Maj 4c391f64bc Removed old inn code and realigned all the cutscene flags. Offsets will need to be figured out again though. 2016-04-01 23:50:17 -04:00
Filip Maj ae9a712477 Added scripts for all the npcs (minus the door) in the Limsa Opening zone (boat). The beginning tutorial stuff is also scripted. 2016-04-01 23:32:52 -04:00
Filip Maj 91842ab08a Merge branch 'develop' 
# Conflicts:
#	FFXIVClassic Map Server/FFXIVClassic Map Server.csproj
 2016-04-01 23:27:34 -04:00
Filip Maj 1dd04e2174 Merge branch 'director_and_questing' into develop 2016-04-01 23:24:28 -04:00
Filip Maj 6c3918ac2f Got the kick event packet working and implemented the director parameter in the player instantiation. The first argument of the set event status packet is an "isEnabled" flag; switched to bool rather than int. 2016-04-01 23:24:14 -04:00
Filip Maj cf73522291 Reversed change to output folder that was done in previous pull request merge. 2016-03-30 20:49:37 -04:00
Filip Maj 8da3a6ff9c Merge branch 'develop' 
# Conflicts:
#	FFXIVClassic Map Server/packets/send/Actor/events/SetEmoteEventCondition.cs
 2016-03-30 20:18:28 -04:00
Filip Maj 60b4035ec5 Receive routine in the lobby server now checks if bytes read is > (not >=) than 0. This was causing connections to stay active and cause the CPU to get bogged down. 2016-03-30 20:16:59 -04:00
Filip Maj 597a800599 More work trying to get the opening cutscene to fire right away. 2016-03-30 20:15:21 -04:00
Ioncannon 48b9fa39b5 Merged in VeryCrushed/ffxiv-classic-server (pull request #1) 
Small Fixes
 2016-03-30 11:06:17 -04:00
Filip Maj 6124e6906d Uploaded a template config.ini file. 2016-03-29 17:30:51 -04:00
Filip Maj 48f1fbc8f5 Implemented the emote and notice event conditions. 2016-03-29 17:09:16 -04:00
Filip Maj 1dccc0530e Static actor file can be now loaded from the original encrypted script in the FFXIV folder. This way I do not run into issues of sharing client files. 2016-03-28 23:05:19 -04:00
Filip Maj 94db8336df Added login site. 2016-03-28 22:07:10 -04:00
Filip Maj b33b0b1bc4 When zoning into a inn, cutscene packet will be sent as well. 2016-03-28 22:00:11 -04:00
Filip Maj b69e18ff3c Companion name was off by 1. 2016-03-28 21:52:02 -04:00
Filip Maj a615f29e63 Added path companion data to the cutscene book packet. Now that packet will fire if zoning into the inn. Removed some debug logs. Removed a duplicate zone packet send call. 2016-03-28 21:00:33 -04:00
Filip Maj 4d57aa72a6 Cleaned up the 0x02 packet. It fires in response to the 0x2 packet sent by the client it seems. 2016-03-28 12:14:10 -04:00
Filip Maj a30311d12a Added director related code to player and packet processor. Cleaned up some debug messages. Added a flag when a player is "zoning in". 2016-03-28 11:31:21 -04:00
Filip Maj f8ab0cd86d Added langauge code packet (0x6) and 0x2/0x7 temp packets to clean up the login packets sent by client. 2016-03-28 11:30:02 -04:00
Filip Maj 9c28e966f7 Added director code to player class and actor namespace. 2016-03-23 01:27:12 -04:00
Filip Maj 49a13effca Fleshed out the quest actor and added a place to store the current active quest actors in the Player actor. 2016-03-21 11:42:27 -04:00
Filip Maj 3162bedb17 Added trigger name to all the scripts that had params. Implemented the Gridania opening stoper. 2016-03-20 21:19:40 -04:00