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

41 commits

Author SHA1 Message Date
NotAdam
09d00b8a7f start moving old packets to new incoming packet system 2018-07-06 22:43:54 +10:00
NotAdam
98bb3eb436 incoming packet deserialization 2018-07-06 19:47:35 +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
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
2b3de5f5e6 label now comes before getter in //gm teri 2018-07-01 21:31:26 +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
Mordred
972cd05e48 Emancipation from the GamePacket class, step 1 2018-06-18 23:03:39 +02:00
Mordred
86b2a9cded More cleanup yet 2018-06-02 15:52:35 +02:00
Mordred
d34598d295 Some cleanup and buildfix 2018-06-02 13:38:00 +02:00
Biscuit Boy
06a517938b GM Raise uses the new zoneinpacket system 2018-04-22 18:21:22 +10:00
Biscuit Boy
eb0996ee78 Added Zone GuId to gm teri_info and fixed spacing 2018-04-22 00:50:04 +10:00
Biscuit Boy
3310ee0fe6 Gm invis is less of a hack 2018-04-19 22:47:03 +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
Adam
5d198c7743 fix zone crash when using a normal zones instance id vs zone id 2018-03-16 20:33:28 +11:00
Mordred
f5ff43857e Basics of instance binding system 2018-03-15 23:37:21 +01:00
Mordred Admin
f825eb5bdb More framework changes, linker still unhappy 2018-03-09 10:19:38 +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
Maru
b3318f14a3 Framework; Refactors, styling, other minor stuff; 2018-03-02 07:22:25 -03:00
Mordred Admin
72e8fa36e8 Rearranged includes for potential speed increases 2018-02-28 10:26:03 +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
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
50f90d960b More zone refactoring, general style fixes 2018-02-14 21:11:23 +01:00
Adam
f94a8ceee5 remove exddata from sapphire_zone 2018-02-07 14:27:52 +11:00
Mordred Admin
2a6c505f9f Merge remote-tracking branch 'origin/event_rewrite' 
Conflicts:
	src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
 2018-01-30 07:53:15 +01:00
Adam
e9d0e5cbb8 createInstanceContent and some minor refactoring 2018-01-29 19:40:27 +11:00
Adam
7de0885b54 instance zoning and returning implemented 
instancecontent uses instancecontent class instead of zone too
 2018-01-29 13:05:33 +11:00
Adam
339a089d47 gm teri accepts instance id 2018-01-29 00:40:34 +11:00
Adam
b05a05341c base implementation of instance creation 2018-01-28 23:53:58 +11:00
Mordred
babb58fa21 Revert "Merge pull request #225 from GokuWeedLord/event_rewrite" 
This reverts commit 6a128b1912, reversing
changes made to a104b5a928.
 2018-01-28 11:16:34 +01:00
Adam
dde0a30fa3 switch debugcommandhandler for scripted implementation 2018-01-28 18:52:53 +11:00
Mordred
aabcdf6e74 Replacement of old ZoneMgr 2018-01-27 23:52:49 +01:00
Biscuit Boy
f80a2fd0a5 Added GM1 Back since its needed 2018-01-20 02:04:38 +11:00
Biscuit Boy
8f2f827427 Fixed GM Call 
GM Call was placed in GM1 instead of GM2 for some reason /shrug
 2018-01-20 01:56:00 +11:00
Mordred Admin
2382f72184 #182 - Renamed targets to be less ambigious 2017-12-19 09:27:22 +01:00
Renamed from src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp (Browse further)