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
884 Commits 4 Branches 2 Tags
c1fdad21560636472da64c84f61c994fad968d8e
Commit Graph

53 Commits

Author SHA1 Message Date
Filip Maj
f038b525c6 Cleaning up imports. 2019-05-06 16:07:06 -04:00
Filip Maj
bcb609e4f6 Merge branch 'inventory_refactor' into develop 
# Conflicts:
#	FFXIVClassic Map Server/Database.cs
#	FFXIVClassic Map Server/FFXIVClassic Map Server.csproj
#	FFXIVClassic Map Server/WorldManager.cs
#	FFXIVClassic Map Server/actors/area/Area.cs
#	FFXIVClassic Map Server/actors/area/Zone.cs
#	FFXIVClassic Map Server/actors/chara/Character.cs
#	FFXIVClassic Map Server/actors/chara/npc/Npc.cs
#	FFXIVClassic Map Server/actors/chara/player/Inventory.cs
#	FFXIVClassic Map Server/actors/chara/player/Player.cs
#	FFXIVClassic Map Server/dataobjects/ZoneConnection.cs
#	FFXIVClassic Map Server/lua/LuaEngine.cs
#	FFXIVClassic Map Server/packets/send/Actor/AddActorPacket.cs
#	FFXIVClassic Map Server/packets/send/Actor/DeleteAllActorsPacket.cs
#	FFXIVClassic Map Server/packets/send/Actor/SetActorPropetyPacket.cs
#	FFXIVClassic Map Server/packets/send/Actor/SetActorStatePacket.cs
#	FFXIVClassic Map Server/packets/send/Actor/SetActorStatusAllPacket.cs
#	FFXIVClassic Map Server/packets/send/Actor/SetActorStatusPacket.cs
#	FFXIVClassic Map Server/packets/send/Actor/_0x132Packet.cs
#	FFXIVClassic Map Server/packets/send/Actor/battle/BattleAction.cs
#	FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX10Packet.cs
#	FFXIVClassic Map Server/packets/send/Actor/battle/BattleActionX18Packet.cs
#	FFXIVClassic Map Server/packets/send/Actor/battle/CommandResultX00Packet.cs
#	FFXIVClassic Map Server/packets/send/Actor/events/SetEmoteEventCondition.cs
#	FFXIVClassic Map Server/packets/send/Actor/inventory/InventoryRemoveX08Packet.cs
#	data/scripts/commands/gm/giveitem.lua
 2019-05-06 15:59:09 -04:00
Filip Maj
3066efeebb Cleanup the messy imports. 2019-05-06 13:39:24 -04:00
Filip Maj
10017b7e8c Cleaned up some warnings. 2019-05-04 20:53:08 -04:00
Filip Maj
1e4a1cf263 Merge branch 'ai-open' into develop 
# Conflicts:
#	FFXIVClassic Lobby Server/Database.cs
#	FFXIVClassic Map Server/Database.cs
#	FFXIVClassic Map Server/FFXIVClassic Map Server.csproj
#	FFXIVClassic Map Server/actors/chara/player/Inventory.cs
#	FFXIVClassic Map Server/actors/chara/player/Player.cs
#	FFXIVClassic Map Server/dataobjects/Session.cs
#	FFXIVClassic World Server/Server.cs
 2019-05-04 20:13:29 -04:00
Filip Maj
42aa3d7512 Fixed some errors from the previous changes. 2018-10-20 12:31:24 -04:00
Filip Maj
bec0cae0eb Removed more dapper code and unsupported syntax. 2018-10-20 12:08:47 -04:00
Filip Maj
5bb3cc3b4e Cleaned up unused nuget packages. Downgraded JSON lib as the latest one has dependencies. Cleaned up some DB code using dapper (since it's deleted). 2018-10-08 15:31:41 -04:00
Tahir Akhlaq
cd60c571ac Merge branch 'ai-open' of https://bitbucket.org/skeletonhorn/ffxiv-classic-server-ai-fork into ai 
# Conflicts:
#	data/scripts/modifiers.lua
 2017-12-10 15:07:28 +00:00
yogurt
92de857cda opening quest stuff 2017-10-10 13:32:47 -05:00
yogurt
5dfbc0f249 EXP and levels now get saved and loaded from database, changed battlecommand id dictionary to hold lists to account for archer and DoH/DoLs getting multiple abilities at certain levels. Level 1 abilities are now added to the hotbar on character creation. 2017-09-30 07:28:08 -05:00
Filip Maj
62484e2f87 Fixed the retainer database error. Loading code now matches the new retainer db schema. 2017-09-03 16:37:05 -04:00
Filip Maj
afe79e6c5f Set version number to v0.1. 2017-08-26 14:00:40 -04:00
dude22072
5a5c0a3a5f Fixed the "pretty borders" inconsistency. 2017-07-06 22:30:03 -05:00
Filip Maj
f12ffc468d Updated lobby code for new Subpacket type. 2017-06-29 11:38:28 -04:00
Tahir Akhlaq
a2a30003e0 added db launch args and improved import time on gamedata_actor_class.sql 2017-03-25 04:36:19 +00:00
Tahir Akhlaq
4a320d7096 added launch args for ip/port and default config loading 
- fixed char create issues by adding default values to fields (todo: fix actual query)
- added post build command to copy scripts folder to bin
 2016-12-05 14:26:20 +00:00
Filip Maj
3864bf6d85 Merge branch 'proxy_server' into develop 
# Conflicts:
#	FFXIVClassic Common Class Lib/packages.config
 2016-12-03 14:03:13 -05:00
Filip Maj
bd26a71fef Changed folder from Proxy to World. Did some nlog configing. 2016-08-28 14:25:37 -04:00
Filip Maj
c67f74130f Moved packet structures to common. 2016-08-22 10:43:04 -04:00
Filip Maj
b6c3c7f71c Added MS Compilers package to let solution compile in VS2013. Added new sql files with Gridania NPCs. Added the new seamless boundry table. 2016-08-14 09:45:06 -04:00
Tahir Akhlaq
59f3cfa2f1 derped with some debug logging (thought i pushed this earlier) 2016-07-17 11:34:37 +01:00
deviltti
7a25c818f2 demo...srs? 2016-06-21 21:52:40 -04:00
Tahir Akhlaq
bb02f94d38 changed date formatting for logging 2016-06-22 02:31:05 +01:00
deviltti
b8a563f9d7 Lobby and game server packet ConsoleColor to NLog cleanup. 2016-06-21 21:13:01 -04:00
Tahir Akhlaq
0aac675b30 cleaned up previous commit 2016-06-21 21:47:07 +01:00
Tahir Akhlaq
37d91480f9 Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into lua_commands 
# Conflicts:
#	FFXIVClassic Common Class Lib/packages.config
#	FFXIVClassic Lobby Server/Program.cs
#	FFXIVClassic Map Server/CommandProcessor.cs
#	FFXIVClassic Map Server/Program.cs
#	FFXIVClassic Map Server/actors/Actor.cs
 2016-06-18 05:59:42 +01:00
Tahir Akhlaq
1ad2b5d7d0 more work on commands 
- moved script object to wrapper class to catch and log exceptions
- added loggers for basepacket/subpacket (todo: colour and use them in NLog.config)
- finished up most commands (todo: !property and !property2)
- todo: create and use mysql wrapper class to log exceptions
 2016-06-18 05:42:14 +01:00
Filip Maj
fbf6810c5c Fixed logs on lobby. 2016-06-15 20:06:08 -04:00
Tahir Akhlaq
1159c75ab8 moved stray console.writeline to use main logger 2016-06-15 19:15:24 +01:00
Filip Maj
1bac69c893 Fixed some startup output. 2016-06-15 10:40:30 -04:00
Tahir Akhlaq
2b81660dce accidentally mass replaced "target", fixed now 2016-06-15 04:27:25 +01:00
Tahir Akhlaq
ba13d5798d derp 2016-06-15 00:08:05 +01:00
Tahir Akhlaq
335a59204c Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into method_casing 
# Conflicts:
#	FFXIVClassic Map Server/CommandProcessor.cs
#	FFXIVClassic Map Server/WorldManager.cs
#	FFXIVClassic Map Server/actors/area/Area.cs
#	FFXIVClassic Map Server/actors/area/PrivateArea.cs
#	FFXIVClassic Map Server/actors/area/Zone.cs
#	FFXIVClassic Map Server/actors/chara/npc/Npc.cs
#	FFXIVClassic Map Server/common/Utils.cs
#	FFXIVClassic Map Server/dataobjects/ConnectedPlayer.cs
 2016-06-14 22:54:02 +01:00
Tahir Akhlaq
24f55139dd mass replaced all methods to pascal case 2016-06-14 21:29:10 +01:00
Tahir Akhlaq
ed0a0a58f7 added nlog logging (todo: custom logger for packets) 2016-06-14 19:06:55 +01:00
Tahir Akhlaq
c5516511b0 cleaned up logging, added log_level param to enable/disable types of logging 2016-06-14 03:00:57 +01:00
Tahir Akhlaq
c23f9c7ca9 PROJECT: added common library to make common files actually common 
- renamed sln to FFXIVClassic.sln
- threaded logging
- todo: print packets using Log.Packet
 2016-06-12 20:12:59 +01:00
deviltti
16d4779970 Fixed packet ByteArrayToHex output 2016-06-10 22:40:46 -04:00
deviltti
554c8b5514 Fixed packet Console output 2016-06-10 21:14:28 -04:00
deviltti
33a52c4fa8 Fixed derp in Console output 2016-06-10 20:17:35 -04:00
deviltti
1c712c7533 Cleaned up LogFile and ByteArrayToHex utils. 2016-06-10 19:58:01 -04:00
Tahir Akhlaq
8b93abe86e servers now log (almost) everything to file 
- regex'd in mysqlexception logging
- servers can now specify server_port, log_path, log_file
- added scripts to import/export all tables (exporting will export a handful of garbage table names, open and check for structure before deleting)
- fixed packet logging (thanks deviltti)
 2016-06-09 19:48:06 +01: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/pplStd_11@0C100.lua
 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
TheManii
ddf4d0d202 Consolidated server data and automatically place them in approporate directories post build 2016-04-05 10:42:42 -07: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
Andrew Babbitt
eaafba79e2 Updated .gitignore and changed all projects to build in a central directory at the root of the project. 2016-03-29 17:38:41 -06:00