mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-09 20:27:45 +00:00
Code Activity
6140 commits 10 branches 14 tags 26 MiB
Commit graph

397 commits

Author SHA1 Message Date
Mordred
495a675f35 Fixed an exp ui issue 2021-12-21 11:46:40 +01:00
Mordred
296dbb9904 GiveQuestRewards is no longer used in quests, but called automatically on finish 2021-12-21 01:05:08 +01:00
Mordred
e3dfcf2cfd Base implementation of event items, action still need to be generalized 2021-12-17 15:48:56 +01:00
Alice Ogeda
ab668bdc68 more const correct; 2021-12-14 16:06:23 -03:00
Alice Ogeda
4a46e87641 transfer result handling to blmgr; more error checking; const correct; 2021-12-13 23:04:07 -03:00
Alice Ogeda
e07b182a19 add blacklist mgr + handlers + paging; 2021-12-13 22:36:29 -03:00
Mordred
8eeba39edb Renaming of linkshells implemented 2021-12-12 23:26:12 +01:00
Mordred
72db0a026c Implemented change master for linkshells 2021-12-12 15:56:45 +01:00
Mordred
001e0c2e5c Added leader modification functions for linkshells 2021-12-12 13:06:15 +01:00
Mordred
755aeedf60 Implemented linkshell kick 2021-12-09 23:38:23 +01:00
Mordred
fed653ed62 Fix create linkshell event with existing name 2021-12-09 22:10:14 +01:00
Mordred
0c6a0b0323 Do not allow creation of a linkshell if already existing 2021-12-07 14:27:43 +01:00
Mordred
033d0d3c4c fixed wrong type 2021-12-07 00:13:18 +01:00
Mordred
139f771e7a Linkshell join logic redone to use linkshell result packets. 2021-12-07 00:02:41 +01:00
Mordred
b7ad7965a7 Improved chat channel join calles. 2021-12-05 21:16:36 +01:00
Mordred
c5ed71325b Fixed linkshell chat channels 2021-12-05 17:21:37 +01:00
Mordred
e84c034509 Join and leave linkshell implemented 2021-12-05 00:37:52 +01:00
Mordred
47df62f0b4 Moved ls logic from packetHandler to linkshellHandler, improved invite logic 2021-12-04 21:53:04 +01:00
Mordred
85bbe38562 Implemented db update for linkshells. 2021-12-04 12:29:54 +01:00
Mordred
ee0cdfad0b Allow invite to show, invite packets and linkshell updating not included 2021-12-04 01:27:35 +01:00
Mordred
8ce29c0bdc Properly sent linkshell member status in linkshell list 2021-12-04 01:02:25 +01:00
Mordred
3023a78533 Send linkshell action result after creation of linkshells. 2021-12-03 22:21:18 +01:00
Mordred
c4b74f7d2e Fixed another issue with ls creation' 2021-12-03 00:54:05 +01:00
Mordred
1378ff4a43 Event cleanup from linkshell changes 2021-12-02 23:02:52 +01:00
Mordred
e385522e52 Linkshell groundwork, events can now be implemented more easy 2021-12-02 22:58:36 +01:00
Alice Ogeda
19fc371b1d styling; 2021-12-02 15:06:52 -03:00
Alice Ogeda
36f348d6b7 Merge branch 'ThreePointOh' of https://github.com/SapphireServer/Sapphire into 3.0-friendlist 2021-12-01 21:30:22 -03:00
Alice Ogeda
3e73da6463 add initial friendlist impl; fix teri crash on login if commonlist is called; fix sql type and initial data on player creation; 2021-12-01 21:30:12 -03:00
Rushi
8b9339004d Remove duplicate header inclusion 2021-12-01 20:43:20 +01:00
Mordred
c03c5821ab Send system messages instead of debug 2021-11-27 18:19:13 +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
collett
1fa5aadf1c update proper event type check 2021-09-15 16:55:45 +09:00
collett
0fe75c373e fix the loading of some quest battles 2021-09-15 01:24:02 +09:00
Taezen
71b459ba62 fix for previous quest and quest lock check 2021-09-11 14:00:04 +02: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
Taezen
e8c7c83197 Map support 2021-08-30 10:16:05 +02:00
コレット
23b7b052a1
PublicContent support. (#720) 
* PublicContent support.

* update code
 2021-08-16 18:18:29 +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
collett
301bd61180 update to 5.55 hotfix 
Co-authored-by: Jeido Uran <tourais.q@gmail.com>
 2021-07-27 07:33:55 +09:00
collett
c4effc7e21 EquipSlotCategory reverted back or I updated the wrong enum last time? Anyway all values are checked manually and better naming. 2021-02-16 23:56:31 +09:00
collett
f5c9e56aa1 bug fixes and implement house exterior editing. 2021-02-06 05:18:26 +09:00
Jeido
de160f96de Several fixes and improvements 
-Eobj will keep their animation flag even after respawning
-Using !set classjob properly updates stats and UI
-Using an emote while /changepose is active doesn't immediatly interrupt the emote anymore
-GM2Command Logging moved to info instead of debug to match GM1
-//gm raise doesn't raise the target twice anymore
-Fix modelSubWeapon always being reset to 0 upon logging in
-Added TerritoryIntendedUses
 2021-01-25 17:41:45 +01:00
collett
3ae54d3db0 fix build 2020-05-16 06:13:07 +09:00
collett
37fbb35c0a Fix armory. 2020-05-12 00:19:18 +09:00