Commit Graph

12 Commits

Author SHA1 Message Date
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
0209f3e617 Added patching server web files. 2018-05-29 01:06:44 -04:00
Filip Maj
e799e8327f These should not have been here 2018-05-29 01:05:50 -04:00
Joseph Mikel Keller
9513389e0a database.php edited online with Bitbucket 2017-04-14 19:08:08 +00:00
Joseph Mikel Keller
b490cdf124 database.php edited online with Bitbucket 2017-04-14 19:06:25 +00:00
Filip Maj
a8f3fe28d4 Uploaded the 1.0 launcher website as well as test patcher website. 2017-01-11 19:21:33 -05:00
TheManii
14a7a4172a Added rest of fields, chocobo fields are disabled as they dont work if there is no chocobo entries for a character 2016-04-14 03:44:05 -04:00
TheManii
863e006830 Converted initial profile + appearence to new db schema, currently only read only due to submit functions being unmodified 2016-04-11 17:00:26 -04:00
TheManii
e33bd05f09 Removed wrong files 2016-04-11 14:40:08 -04:00
TheManii
c9838254b9 Revert "Remove unused files"
This reverts commit 1ce34914bc.
2016-04-11 14:39:33 -04:00
TheManii
1ce34914bc Remove unused files 2016-04-11 14:35:17 -04:00
Filip Maj
94db8336df Added login site. 2016-03-28 22:07:10 -04:00