Mordred
|
4e776bd5f9
|
Merge branch 'ThreePointOh' of https://github.com/SapphireMordred/Sapphire into ThreePointOh
|
2021-11-27 18:19:21 +01:00 |
|
Mordred
|
c03c5821ab
|
Send system messages instead of debug
|
2021-11-27 18:19:13 +01:00 |
|
Adam
|
790650f967
|
working ci & support more mariadb versions
|
2021-11-27 18:31:38 +11:00 |
|
Adam
|
0dcd4f967e
|
fixup mariadb support
|
2021-11-27 16:04:45 +11:00 |
|
Mordred
|
ca3db59d19
|
Updated readme
|
2021-11-27 01:58:53 +01:00 |
|
Mordred
|
48ed9da414
|
Initial commit of Sapphire for FFXIV 3.0 "light rewrite"
|
2021-11-27 00:53:57 +01:00 |
|
Mordred
|
dceff7eed6
|
Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop
# Conflicts:
# .appveyor.yml
# .gitmodules
# .travis.yml
# CMakeLists.txt
# CMakeSettings.json
# README.md
# cmake/FindMySQL.cmake
# cmake/paths.cmake
# deps/datReader/Dat.cpp
# deps/datReader/Dat.h
# deps/datReader/DatCat.cpp
# deps/datReader/DatCat.h
# deps/datReader/DatCategories/bg/lgb.h
# deps/datReader/DatCategories/bg/sgb.h
# deps/datReader/Exd.cpp
# deps/datReader/Exd.h
# deps/datReader/ExdCat.cpp
# deps/datReader/ExdCat.h
# deps/datReader/ExdData.cpp
# deps/datReader/ExdData.h
# deps/datReader/Exh.cpp
# deps/datReader/Exh.h
# deps/datReader/File.cpp
# deps/datReader/File.h
# deps/datReader/GameData.cpp
# deps/datReader/GameData.h
# deps/datReader/Index.cpp
# deps/datReader/Index.h
# deps/datReader/SqPack.cpp
# deps/datReader/SqPack.h
# deps/datReader/bparse.cpp
# deps/datReader/bparse.h
# deps/datReader/conv.cpp
# deps/datReader/conv.h
# deps/datReader/crc32.cpp
# deps/datReader/crc32.h
# deps/datReader/stream.cpp
# deps/datReader/stream.h
# deps/datReader/zlib.cpp
# deps/datReader/zlib.h
# deps/mysqlConnector/Connection.cpp
# deps/mysqlConnector/Connection.h
# deps/watchdog/Watchdog.h
# sql/schema/inserts.sql
# sql/schema/schema.sql
# src/api/PlayerMinimal.h
# src/api/SapphireApi.cpp
# src/api/main.cpp
# src/common/Common.h
# src/common/CommonGen.h
# src/common/Config/ConfigMgr.cpp
# src/common/Database/DbCommon.h
# src/common/Database/DbConnection.cpp
# src/common/Database/DbWorkerPool.cpp
# src/common/Exd/ExdDataGenerated.cpp
# src/common/Exd/ExdDataGenerated.h
# src/common/Logging/Logger.cpp
# src/common/Network/CommonActorControl.h
# src/common/Network/Connection.cpp
# src/common/Network/Connection.h
# src/common/Network/PacketDef/Ipcs.h
# src/common/Network/PacketDef/Zone/ClientZoneDef.h
# src/common/Network/PacketDef/Zone/ServerZoneDef.h
# src/common/Util/Util.cpp
# src/common/Util/UtilMath.cpp
# src/common/Util/UtilMath.h
# src/dbm/DbManager.cpp
# src/dbm/main.cpp
# src/lobby/Forwards.h
# src/lobby/GameConnection.cpp
# src/lobby/GameConnection.h
# src/lobby/ServerLobby.cpp
# src/lobby/mainLobbyServer.cpp
# src/scripts/action/common/ActionSprint3.cpp
# src/scripts/common/CmnDefCutSceneReplay.cpp
# src/scripts/common/GilShop.cpp
# src/scripts/common/aethernet/Aetheryte.cpp
# src/scripts/common/aethernet/HousingAethernet.cpp
# src/scripts/common/eobj/HousingEstateEntrance.cpp
# src/scripts/common/housing/CmnDefHousingSignboard.cpp
# src/scripts/common/warptaxi/WarpTaxi.cpp
# src/scripts/instances/questbattles/ChasingShadows.cpp
# src/scripts/quest/ManFst001.cpp
# src/scripts/quest/ManFst002.cpp
# src/scripts/quest/ManFst003.cpp
# src/scripts/quest/ManFst004.cpp
# src/scripts/quest/ManFst005.cpp
# src/scripts/quest/ManSea001.cpp
# src/scripts/quest/ManSea002.cpp
# src/scripts/quest/ManSea003.cpp
# src/scripts/quest/ManWil001.cpp
# src/scripts/quest/ManWil002.cpp
# src/scripts/quest/ManWil003.cpp
# src/scripts/quest/ManWil004.cpp
# src/scripts/quest/subquest/gridania/SubFst001.cpp
# src/scripts/quest/subquest/gridania/SubFst002.cpp
# src/scripts/quest/subquest/gridania/SubFst003.cpp
# src/scripts/quest/subquest/gridania/SubFst004.cpp
# src/scripts/quest/subquest/gridania/SubFst005.cpp
# src/scripts/quest/subquest/gridania/SubFst008.cpp
# src/scripts/quest/subquest/gridania/SubFst009.cpp
# src/scripts/quest/subquest/gridania/SubFst010.cpp
# src/scripts/quest/subquest/gridania/SubFst011.cpp
# src/scripts/quest/subquest/gridania/SubFst013.cpp
# src/scripts/quest/subquest/gridania/SubFst014.cpp
# src/scripts/quest/subquest/gridania/SubFst015.cpp
# src/scripts/quest/subquest/gridania/SubFst019.cpp
# src/scripts/quest/subquest/gridania/SubFst026.cpp
# src/scripts/quest/subquest/gridania/SubFst029.cpp
# src/scripts/quest/subquest/gridania/SubFst030.cpp
# src/scripts/quest/subquest/gridania/SubFst034.cpp
# src/scripts/quest/subquest/gridania/SubFst039.cpp
# src/scripts/quest/subquest/gridania/SubFst041.cpp
# src/scripts/quest/subquest/gridania/SubFst045.cpp
# src/scripts/quest/subquest/limsa/SubSea001.cpp
# src/scripts/quest/subquest/limsa/SubSea012.cpp
# src/scripts/quest/subquest/uldah/SubWil000.cpp
# src/scripts/quest/subquest/uldah/SubWil001.cpp
# src/scripts/quest/subquest/uldah/SubWil002.cpp
# src/scripts/quest/subquest/uldah/SubWil004.cpp
# src/scripts/quest/subquest/uldah/SubWil006.cpp
# src/scripts/quest/subquest/uldah/SubWil007.cpp
# src/scripts/quest/subquest/uldah/SubWil018.cpp
# src/scripts/quest/subquest/uldah/SubWil019.cpp
# src/scripts/quest/subquest/uldah/SubWil020.cpp
# src/scripts/quest/subquest/uldah/SubWil021.cpp
# src/scripts/quest/subquest/uldah/SubWil022.cpp
# src/scripts/quest/subquest/uldah/SubWil027.cpp
# src/scripts/quest/subquest/uldah/SubWil028.cpp
# src/scripts/quest/subquest/uldah/SubWil029.cpp
# src/tools/action_parse/main.cpp
# src/tools/discovery_parser/main.cpp
# src/tools/event_object_parser/instance.tmpl
# src/tools/event_object_parser/main.cpp
# src/tools/event_object_parser/questbattle.tmpl
# src/tools/exd_common_gen/main.cpp
# src/tools/exd_struct_gen/ExdData.cpp.tmpl
# src/tools/exd_struct_gen/ExdData.h.tmpl
# src/tools/exd_struct_gen/main.cpp
# src/tools/exd_struct_test/main.cpp
# src/tools/mob_parse/main.cpp
# src/tools/nav_export/lgb.h
# src/tools/nav_export/main.cpp
# src/tools/nav_export/nav/TiledNavmeshGenerator.cpp
# src/tools/nav_export/navmesh_exporter.h
# src/tools/nav_export/obj_exporter.h
# src/tools/pcb_reader/lgb.h
# src/tools/pcb_reader/main.cpp
# src/tools/pcb_reader/nav/TiledNavmeshGenerator.cpp
# src/tools/pcb_reader/navmesh_exporter.h
# src/tools/pcb_reader/obj_exporter.h
# src/tools/quest_parser/main.cpp
# src/tools/questbattle_bruteforce/main.cpp
# src/world/Action/Action.cpp
# src/world/Action/Action.h
# src/world/Action/ActionLut.h
# src/world/Action/ActionLutData.cpp
# src/world/Action/EffectBuilder.cpp
# src/world/Action/EffectBuilder.h
# src/world/Action/EffectResult.cpp
# src/world/Action/EffectResult.h
# src/world/Action/EventAction.cpp
# src/world/Action/EventAction.h
# src/world/Action/ItemAction.cpp
# src/world/Action/ItemAction.h
# src/world/Actor/Actor.cpp
# src/world/Actor/Actor.h
# src/world/Actor/BNpc.cpp
# src/world/Actor/BNpc.h
# src/world/Actor/Chara.cpp
# src/world/Actor/Chara.h
# src/world/Actor/EventObject.cpp
# src/world/Actor/EventObject.h
# src/world/Actor/Npc.cpp
# src/world/Actor/Npc.h
# src/world/Actor/Player.cpp
# src/world/Actor/Player.h
# src/world/Actor/PlayerEvent.cpp
# src/world/Actor/PlayerInventory.cpp
# src/world/Actor/PlayerQuest.cpp
# src/world/Actor/PlayerSql.cpp
# src/world/Event/Director.cpp
# src/world/Event/Director.h
# src/world/Event/EventHandler.h
# src/world/ForwardsZone.h
# src/world/Inventory/HousingItem.cpp
# src/world/Inventory/HousingItem.h
# src/world/Inventory/Item.cpp
# src/world/Inventory/Item.h
# src/world/Inventory/ItemContainer.cpp
# src/world/Inventory/ItemContainer.h
# src/world/Linkshell/Linkshell.h
# src/world/Manager/ActionMgr.cpp
# src/world/Manager/ActionMgr.h
# src/world/Manager/DebugCommandMgr.cpp
# src/world/Manager/DebugCommandMgr.h
# src/world/Manager/EventMgr.cpp
# src/world/Manager/EventMgr.h
# src/world/Manager/HousingMgr.cpp
# src/world/Manager/HousingMgr.h
# src/world/Manager/InventoryMgr.cpp
# src/world/Manager/InventoryMgr.h
# src/world/Manager/ItemMgr.cpp
# src/world/Manager/ItemMgr.h
# src/world/Manager/LinkshellMgr.cpp
# src/world/Manager/LinkshellMgr.h
# src/world/Manager/MarketMgr.cpp
# src/world/Manager/MarketMgr.h
# src/world/Manager/NaviMgr.cpp
# src/world/Manager/NaviMgr.h
# src/world/Manager/PlayerMgr.cpp
# src/world/Manager/PlayerMgr.h
# src/world/Manager/RNGMgr.cpp
# src/world/Manager/RNGMgr.h
# src/world/Manager/ShopMgr.cpp
# src/world/Manager/ShopMgr.h
# src/world/Manager/TerritoryMgr.cpp
# src/world/Manager/TerritoryMgr.h
# src/world/Math/CalcBattle.cpp
# src/world/Math/CalcStats.cpp
# src/world/Math/CalcStats.h
# src/world/Navi/NaviProvider.cpp
# src/world/Navi/NaviProvider.h
# src/world/Network/GameConnection.cpp
# src/world/Network/GameConnection.h
# src/world/Network/Handlers/ActionHandler.cpp
# src/world/Network/Handlers/CFHandlers.cpp
# src/world/Network/Handlers/ClientTriggerHandler.cpp
# src/world/Network/Handlers/EventHandlers.cpp
# src/world/Network/Handlers/GMCommandHandlers.cpp
# src/world/Network/Handlers/InventoryHandler.cpp
# src/world/Network/Handlers/PacketHandlers.cpp
# src/world/Network/PacketWrappers/ActorControlSelfPacket.h
# src/world/Network/PacketWrappers/EffectPacket.h
# src/world/Network/PacketWrappers/ExaminePacket.h
# src/world/Network/PacketWrappers/NpcSpawnPacket.h
# src/world/Network/PacketWrappers/PlayerSetupPacket.h
# src/world/Network/PacketWrappers/PlayerSpawnPacket.h
# src/world/Network/PacketWrappers/UpdateInventorySlotPacket.h
# src/world/Script/NativeScriptApi.cpp
# src/world/Script/NativeScriptApi.h
# src/world/Script/NativeScriptMgr.cpp
# src/world/Script/NativeScriptMgr.h
# src/world/Script/ScriptLoader.cpp
# src/world/Script/ScriptMgr.cpp
# src/world/Script/ScriptMgr.h
# src/world/ServerMgr.cpp
# src/world/ServerMgr.h
# src/world/Session.cpp
# src/world/Session.h
# src/world/StatusEffect/StatusEffect.cpp
# src/world/StatusEffect/StatusEffect.h
# src/world/Territory/Cell.cpp
# src/world/Territory/House.cpp
# src/world/Territory/House.h
# src/world/Territory/Housing/HousingInteriorTerritory.cpp
# src/world/Territory/Housing/HousingInteriorTerritory.h
# src/world/Territory/HousingZone.cpp
# src/world/Territory/HousingZone.h
# src/world/Territory/InstanceContent.cpp
# src/world/Territory/InstanceContent.h
# src/world/Territory/Land.cpp
# src/world/Territory/Land.h
# src/world/Territory/QuestBattle.cpp
# src/world/Territory/QuestBattle.h
# src/world/Territory/Territory.cpp
# src/world/Territory/Territory.h
# src/world/mainGameServer.cpp
|
2021-11-22 23:29:45 +01:00 |
|
Adam
|
fee9ed6b05
|
Merge pull request #731 from collett8192/patch
prevent writing an invalid intermediate state to db when inventory action happens inside a single container
|
2021-09-17 21:56:36 +10:00 |
|
collett
|
413c69aa41
|
container db fix
|
2021-09-17 02:07:15 +09:00 |
|
Adam
|
1689b3fd1a
|
Merge pull request #730 from collett8192/patch
fix the loading of some quest battles
|
2021-09-15 19:16:20 +10:00 |
|
collett
|
1fa5aadf1c
|
update proper event type check
|
2021-09-15 16:55:45 +09:00 |
|
Adam
|
a87572de2b
|
Merge pull request #729 from Skyliegirl33/develop
Update opcodes for 5.58 hotfix and fix CFCommenceHandler
|
2021-09-15 09:51:38 +10:00 |
|
collett
|
0fe75c373e
|
fix the loading of some quest battles
|
2021-09-15 01:24:02 +09:00 |
|
Skyliegirl33
|
b0022f149e
|
Fix whitespaces
|
2021-09-14 00:18:37 +00:00 |
|
Adam
|
d05f72fe99
|
Merge pull request #728 from Taezen/develop
exd parser optimizations + support for sub rows in get_rows()
|
2021-09-14 10:09:23 +10:00 |
|
Taezen
|
b771630fd3
|
fix InitZone packet
|
2021-09-13 20:01:52 +02:00 |
|
Skyliegirl33
|
1f6b31dd4c
|
Update opcodes and fix CFCommenceHandler
|
2021-09-13 18:53:53 +02:00 |
|
Taezen
|
7f983bbf67
|
exd parser optimizations
|
2021-09-13 16:30:32 +02:00 |
|
Adam
|
067f3e6182
|
Merge pull request #727 from collett8192/patch
fix duty info remaining on client after leaving.
|
2021-09-13 20:56:19 +10:00 |
|
collett
|
e360dadb95
|
fix duty info remaining on client after leaving
|
2021-09-13 05:29:53 +09:00 |
|
Adam
|
87ba83ce50
|
Merge pull request #726 from collett8192/patch
fix wrong value used to determine armory container for swapped out equipment.
|
2021-09-12 10:49:25 +10:00 |
|
collett
|
378e5d75bc
|
fix wrong value used to determine armory container for swapped out equipment.
|
2021-09-12 00:18:04 +09:00 |
|
Adam
|
7ccab5b7c2
|
Merge pull request #725 from Taezen/develop-map
fix for previous quest and quest lock check
|
2021-09-11 23:54:10 +10:00 |
|
Taezen
|
71b459ba62
|
fix for previous quest and quest lock check
|
2021-09-11 14:00:04 +02:00 |
|
Adam
|
384f86c55c
|
Merge pull request #724 from collett8192/patch
Correctly removes players from their cells when leaving zone, fixes mob-in-city problem.
|
2021-09-11 10:13:56 +10:00 |
|
collett
|
46ce78aa45
|
Correctly removes players from their cells when leaving zone, fixes mob-in-city problem.
|
2021-09-11 00:52:59 +09:00 |
|
Adam
|
95df885a86
|
Merge pull request #723 from collett8192/patch
load quest icon correctly after finishing a quest.
|
2021-09-11 00:26:00 +10:00 |
|
collett
|
26f0b7f88f
|
load quest icon correctly after finishing a quest.
|
2021-09-10 18:28:39 +09:00 |
|
Adam
|
0ebc900cc4
|
Merge pull request #721 from Taezen/develop-map
Including support for basic map icons
|
2021-09-08 20:47:31 +10:00 |
|
Taezen
|
322a7bb4c2
|
better naming
|
2021-09-08 11:25:16 +02:00 |
|
Taezen
|
774d16667d
|
little map manager rework
|
2021-09-07 16:50:13 +02:00 |
|
Taezen
|
55247a41f6
|
minor changes for the map implementation
|
2021-09-06 11:39:52 +02:00 |
|
コレット
|
f4d84e0a17
|
fix /sit rotation on other client (#722)
|
2021-09-01 16:50:45 +10:00 |
|
Taezen
|
e8c7c83197
|
Map support
|
2021-08-30 10:16:05 +02:00 |
|
Taezen
|
475f560982
|
Eorzean time fix
|
2021-08-30 09:56:37 +02:00 |
|
コレット
|
23b7b052a1
|
PublicContent support. (#720)
* PublicContent support.
* update code
|
2021-08-16 18:18:29 +10:00 |
|
コレット
|
b1e430cf39
|
CF register fix. (#719)
* CF register fix.
* typo
|
2021-08-10 16:55:10 +10:00 |
|
Adam
|
fe534029c8
|
Merge pull request #717 from lmcintyre/develop
include vector
|
2021-07-31 13:09:48 +10:00 |
|
liam
|
99279db982
|
include vector
|
2021-07-30 20:05:06 -04:00 |
|
Adam
|
4364a1e603
|
Merge pull request #715 from collett8192/housing_update
Implement housing edit interior.
|
2021-07-30 22:31:02 +10:00 |
|
collett
|
46aa33cffa
|
keep the const
|
2021-07-29 16:54:24 +09:00 |
|
collett
|
245d709566
|
minor update
|
2021-07-29 16:42:31 +09:00 |
|
collett
|
602f175912
|
remove reference from LandIdent param
|
2021-07-29 16:39:36 +09:00 |
|
collett
|
b014b9265d
|
housing edit interior
|
2021-07-29 02:01:02 +09:00 |
|
Adam
|
37fabec6f5
|
Merge pull request #714 from collett8192/5.58_pr
Update to 5.58.
|
2021-07-28 18:59:37 +10:00 |
|
collett
|
ca663de5ed
|
update to 5.58, part of the opcodes are from github.com/Taezen
Co-authored-by: Taezen <Taezen>
|
2021-07-27 21:08:23 +09:00 |
|
collett
|
301bd61180
|
update to 5.55 hotfix
Co-authored-by: Jeido Uran <tourais.q@gmail.com>
|
2021-07-27 07:33:55 +09:00 |
|
Adam
|
8b7fbc82f6
|
Merge pull request #711 from collett8192/perform
Fix performing.
|
2021-02-26 08:17:32 +11:00 |
|
collett
|
627cf93b4c
|
fix performing
|
2021-02-25 21:28:58 +09:00 |
|
Adam
|
b1ab980d01
|
Merge pull request #709 from collett8192/update_5.45hotfix
Update to 5.45 hotfix.
|
2021-02-23 09:52:48 +11:00 |
|