1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-28 15:17:46 +00:00
Commit graph

36 commits

Author SHA1 Message Date
Mordred
5bd6e94a16 Walking displays correctly 2018-07-08 00:43:03 +02:00
Mordred
ac9845f827 Some movement improvements, still not perfect.. baby steps... 2018-07-07 00:10:16 +02:00
Mordred Admin
a3d5dc8c26 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
b28a4e6776
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
464bcec7d9
Merge pull request #327 from AcedArmy/actor_rewrite
Fixed Tell and add research I found for u3b in tell struct
2018-07-03 12:13:19 +02:00
Mordred Admin
b2aeed0f8a 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
Biscuit Boy
e852e73865 Tell works again and add research I found for u3b 2018-07-02 23:16:55 +10:00
Mordred
d4133f19d9
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
3daeffbb11 change [GM] chat to isActingAsGm instead of directly checking Status 2018-07-01 21:33:37 +10:00
Mordred
671576b861 Packet rework of server_zone 2018-06-28 00:07:07 +02:00
goaaats
3b9811ef17 Streamline ActorControlTypes, refactor ActionHandler/ClientTrigger to ClientActorControl 2018-06-23 21:38:04 +02:00
Mordred
4b3d356a70 Emancipation from the GamePacket class, step 1 2018-06-18 23:03:39 +02:00
Mordred
04671e2e24 Cleanup cleanup cleanup 2018-06-03 19:31:03 +02:00
Mordred
738b09d5c5 More cleanup yet 2018-06-02 15:52:35 +02:00
goaaats
b2621bd5d6 Added SQL field for EquipDisplayFlags, fixed Legacy Mark 2018-05-17 20:46:11 +02:00
Biscuit Boy
990a8e231f [GM] chat now looks for the onlinestatus instead 2018-04-22 18:22:45 +10:00
Biscuit Boy
22abaf9d23 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 Admin
250b1aef79 More framework changes, linker still unhappy 2018-03-09 10:19:38 +01:00
Mordred Admin
b91e711834 Cleanup of cmake files 2018-03-06 22:22:19 +01:00
Mordred
ec0335b64a Merge remote-tracking branch 'origin/master' into actor_rewrite 2018-03-06 00:10:36 +01:00
Maru
a61aef2c1e Framework; Refactors, styling, other minor stuff; 2018-03-02 07:22:25 -03:00
Mordred Admin
083a3aa239 Rearranged includes for potential speed increases 2018-02-28 10:26:03 +01:00
Mordred
692ca9d56e More stuff moved over to actor baseclass 2018-02-22 18:12:36 +01:00
Mordred
ba511a23e2 Revert "Changeing base access type of actors to gameobject"
This reverts commit 7d916f7
2018-02-19 22:00:32 +01:00
Mordred
7d916f7d86 Changeing base access type of actors to gameobject 2018-02-18 23:48:51 +01:00
Mordred
b8cbdf3fa5 removed all unused state flags, mapped more client actions 2018-02-15 23:50:28 +01:00
Mordred
cee84cd9ff In range containers no longer declared publicly 2018-02-11 22:57:00 +01:00
Mordred
1f415a0d05 Majorly refactored usage of shared_ptr also added GameObject into Actor inheritance chain 2018-02-10 01:21:31 +01:00
Adam
7528db3b83 remove exddata from sapphire_zone 2018-02-07 14:27:52 +11:00
Mordred
4e1c82c2be More preparational director logic, state inside can be modified with !instance <instanceId> <varIdx> <value> 2018-02-07 00:00:48 +01:00
Mordred
21a39a09eb Disabled betweenarea state flags until we fix it 2018-02-04 18:53:19 +01:00
Mordred
725ca11c60 Revert "Merge pull request #225 from GokuWeedLord/event_rewrite"
This reverts commit 4e2319130f, reversing
changes made to 695fea7812.
2018-01-28 11:16:34 +01:00
Adam
fb06cd4930 switch debugcommandhandler for scripted implementation 2018-01-28 18:52:53 +11:00
Adam
2ea7f776ba shouts now have correct behaviour 2018-01-28 18:48:56 +11:00
Mordred
35a2c6db09 Replacement of old ZoneMgr 2018-01-27 23:52:49 +01:00
Mordred Admin
0f3f51c304 #182 - Renamed targets to be less ambigious 2017-12-19 09:27:22 +01:00
Renamed from src/servers/Server_Zone/Network/Handlers/PacketHandlers.cpp (Browse further)