mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-25 14:07:46 +00:00
Code Activity
1331 commits 10 branches 14 tags 26 MiB
Commit graph

71 commits

Author SHA1 Message Date
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
Biscuit Boy
fb8208af1e How did I not notice that.... 2018-04-20 02:22:09 +10:00
Biscuit Boy
879ce3609e Spacing should go back here 2018-04-19 23:04:31 +10:00
Biscuit Boy
6f86347aa0 Must be a fire type 2018-04-19 23:02:24 +10:00
Biscuit Boy
b760f08f29 Digital Monsters? 2018-04-19 22:50:17 +10:00
Biscuit Boy
b401c951a7 I love me some style and wording fixes 2018-04-19 22:34:45 +10:00
Biscuit Boy
3db961c726 Use that Gminvis yo 2018-04-19 22:30:23 +10:00
Biscuit Boy
ab7d745e65 Added status priority and made the invis check better 2018-04-19 22:22:20 +10:00
Biscuit Boy
b89ac35227 Added a whole lot of GM Stuff 
Added Icons, Added Invis, Added Chat Types for what we have now
 2018-04-18 21:00:20 +10:00
Mordred
24399e31e4 WiP - implementing new framework 2018-03-09 00:06:44 +01:00
Mordred Admin
c2165e5f33 Cleanup of cmake files 2018-03-06 22:22:19 +01:00
Mordred
0833bdd76c Merge remote-tracking branch 'origin/master' into actor_rewrite 2018-03-06 00:10:36 +01:00
Mordred
37e7c2e51b Basic event play for directors, still buggy. Also some small fixes all around 2018-03-05 23:01:55 +01:00
Adam
0aae810e16 fix onEnterTerritory events 2018-03-05 22:10:14 +11:00
Maru
b3318f14a3 Framework; Refactors, styling, other minor stuff; 2018-03-02 07:22:25 -03:00
Mordred
f1121b52b2 Object despawning added 2018-03-01 23:17:35 +01:00
Adam
416269dc63 move eobj/player spawnindex generation to common manager 2018-03-02 02:55:02 +11:00
Adam
0ff4acf8c8 note to self 2018-02-28 23:58:11 +11:00
Adam
439eeaaaf9 fix eobj out of bounds allocation client crash 2018-02-28 23:53:20 +11:00
Mordred
2ce7d91096 Improved timing on instance starting 2018-02-24 23:53:32 +01:00
Mordred
0a177c3470 EventObjects are not properly spawned and initialized 2018-02-23 23:47:21 +01:00
Mordred
8b5d30802d More stuff moved over to actor baseclass 2018-02-22 18:12:36 +01:00
Mordred
dc1a7e4ae1 Actors are now used as base for any entity 2018-02-22 15:31:10 +01:00
Mordred
b806535f11 Fixed an issue with teleport not picking the correct target position, eventaction unlocks player now 2018-02-21 23:30:35 +01:00
Mordred
c2a95a2d7e In range restructuring 2018-02-21 18:06:52 +01:00
Mordred
b8a366fb29 Removed battlenpc for cleanup work 2018-02-21 12:48:27 +01:00
Mordred
c664c5de90 Renaming classes in preperation of actor rework 2018-02-20 22:46:44 +01:00
Mordred
6ec8601214 Revert "Changeing base access type of actors to gameobject" 
This reverts commit 4457a45
 2018-02-19 22:00:32 +01:00
Mordred
4457a45aa3 Changeing base access type of actors to gameobject 2018-02-18 23:48:51 +01:00
Mordred
a69ccd33df More cleanup of actionhandler 2018-02-18 01:50:20 +01:00
Mordred
c09ec03921 Actionhandler cleaned up a bit 2018-02-17 01:20:40 +01:00
Mordred
5d8b5786d6 removed all unused state flags, mapped more client actions 2018-02-15 23:50:28 +01:00
Mordred Admin
df61b53d1a Cleaned up generated exd stuff 2018-02-14 12:31:47 +01:00
Mordred
677c583d80 updated submodule 2018-02-13 19:37:04 +01:00