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

104 commits

Author SHA1 Message Date
mordred
02e968fbc2 Added getter and setter for territoryId to player 2018-11-06 10:48:46 +01:00
Mordred
c512a63b92 Use territoryType instead of TerritoryId, also refactor variables to reflect the change 2018-11-05 23:07:39 +01:00
mordred
cabb9b27f8 More CI fixes 2018-10-26 14:11:02 +02:00
mordred
6d27d957e1 More boost gone 2018-10-25 15:15:27 +02:00
NotAdam
42064014ac remove more boost 2018-10-25 12:44:51 +11:00
Squall Leonhart
d728ecdaf4 These should be the only references. 2018-10-20 15:39:20 +03:00
Squall Leonhart
679686e6ff Add level1 to setCLassJob. 2018-10-20 13:56:01 +03:00
Biscuit Boy
b96ee1aeba Should probs mention it's decimal not hex 2018-09-20 00:00:01 +10:00
Biscuit Boy
953affede1 Fix InitZone bitmask and add my findings 2018-09-19 23:53:34 +10:00
Mordred
ddb3b69bd6 Merge branch 'bnpc' of https://github.com/SapphireMordred/Sapphire into bnpc 2018-09-17 23:10:59 +02:00
Mordred
827250f9cd Inventory fix 2018-09-17 22:52:57 +02:00
Mordred Admin
238ea28d75 Merge develop into bnpc 2018-09-17 14:04:40 +02:00
Mordred
197d846a85 Fixed discovery information not being used correctly. 2018-09-17 08:41:09 +02:00
Mordred
d97970802b Mobs can now be spawned from templates using debug commands 2018-09-13 22:14:31 +02:00
NotAdam
0946b0636e allow for multiple festivals to run at once 2018-09-01 20:55:28 +10:00
Mordred
e745bd0329 Code style adjusted for 2 spaces and various other small things, checkout CodeStyle.xml for details 2018-08-29 21:40:59 +02:00
Mordred
eb5a567730 Simplified actorcontrol creation 2018-08-28 19:05:52 +02:00
Mordred
c3e715128f Some cleanups in preperation for bnpcs 2018-08-28 00:17:51 +02:00
NotAdam
e68b302f42 fix db storage for classjobs, improve switching between classes 2018-08-26 16:19:05 +10:00
NotAdam
7131c254ea EquipSlot -> GearSetSlot 2018-08-25 22:56:46 +10:00
Mordred
d80753a657 Merge remote-tracking branch 'origin/inventory_rework' into develop 2018-07-26 23:43:27 +02:00
Mordred
b85c1c244e Not compilable atm, still moving stuff around 2018-07-24 23:58:08 +02:00
NotAdam
778de8f154 replace old inline generation of effects packet with a wrapper 2018-07-21 23:32:10 +10:00
NotAdam
f24bfaf74c fix builds with new effect packet 2018-07-21 15:54:37 +10:00
Mordred
6579a5d841 First step of inventory cleanup, moving defs to common 2018-07-20 22:39:10 +02:00
Maru
3032d9dc31 InitUI pose def + set val; 2018-07-14 19:32:50 -03:00
Mordred
d09cdb15af Groundwork for pose, still needs to be added to spawn / initui 2018-07-11 23:52:24 +02:00
NotAdam
0b88f63aa9 persist emotes now persist through logout/login 2018-07-11 18:07:48 +10:00
Maru
a52b6803fd Emote stuff, launcher; 
Please don't look

Emote stuff;
 2018-07-09 01:29:16 -03:00
Mordred
e9891a35c0 Emotes can now be interrupted, getting in and out of persistant emotes including /sit should work fine, too #329 2018-07-08 23:44:37 +02:00
Mordred
58efdbb519 emotes with motion only added #329 2018-07-08 23:25:27 +02:00
Mordred
406b69b88d Walking displays correctly 2018-07-08 00:43:03 +02:00
Mordred
814d9e995c Some movement improvements, still not perfect.. baby steps... 2018-07-07 00:10:16 +02:00
NotAdam
3d09b3efc0 unlockAction now takes u16 param, unlockAction debug command added 2018-07-04 19:28:54 +10:00
Mordred Admin
9d620d160c Merge remote-tracking branch 'origin/develop' into packet_work 
Conflicts:
	src/servers/sapphire_zone/Action/EventAction.cpp
	src/servers/sapphire_zone/Actor/Chara.cpp
	src/servers/sapphire_zone/Actor/EventObject.cpp
	src/servers/sapphire_zone/Actor/Player.cpp
	src/servers/sapphire_zone/Actor/PlayerInventory.cpp
	src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp
	src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
	src/servers/sapphire_zone/Zone/Zone.cpp
 2018-07-03 15:01:13 +02:00
Mordred
57cf959c94 Merge pull request #323 from goaaats/actor_control_redo 
common, zone: Streamline ActorControlTypes, refactor ActionHandler/ClientTrigger to ClientActorControl
 2018-07-03 14:38:57 +02:00
Mordred Admin
c7760a0dc6 Merge remote-tracking branch 'origin/develop' into packet_work 
Conflicts:
	src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
	src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
 2018-07-03 09:32:14 +02:00
Mordred Admin
8e6cdf0eda Removed old GamePacket 2018-07-03 09:20:09 +02:00
Mordred
30b08d5817 More packet conversion for lobby and zone 2018-07-03 00:01:26 +02:00
Mordred
70425780d5 Merge pull request #287 from AcedArmy/actor_rewrite 
Fixed making new zones and done some more gm stuff
 2018-07-02 11:34:47 +02:00
Biscuit Boy
27cfa2f27f change isActingAsGm const location and add const to getOnlineStatus 2018-07-02 07:31:23 +10:00
Biscuit Boy
c83c59c25d Update isActingAsGm so we don't call getOnlineStatus 3 times 2018-07-01 21:43:50 +10:00
Biscuit Boy
4909791003 add isActingAsGm in Player 2018-07-01 21:31:49 +10:00
Mordred
e9c9eaa53a Packet rework of server_zone 2018-06-28 00:07:07 +02:00
goaaats
f2c2087d7b Streamline ActorControlTypes, refactor ActionHandler/ClientTrigger to ClientActorControl 2018-06-23 21:38:04 +02:00
NotAdam
2452410c58 remove old XMLConfig completely and implement new ConfigMgr 2018-06-11 02:34:26 +10:00
Mordred
86b2a9cded More cleanup yet 2018-06-02 15:52:35 +02:00
Mordred
052ea5f1d2 Zone-Server should now start up fine again 2018-05-22 17:42:50 +02:00
Adam
92e03bfcdd shouldn't default to a nonexistant onlinestatus... 2018-04-24 20:36:06 +10:00
Adam
248952443f biscuit didn't copy my code correctly 😢 2018-04-24 20:34:36 +10:00