mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-02 08:57:44 +00:00
Code Activity
1618 commits 10 branches 14 tags 26 MiB
Commit graph

59 commits

Author SHA1 Message Date
Biscuit Boy
a045dfc5c5 welcome back to moredreds coooode review! 
today we are going to be hunting for some extra brackets in the sewer! so come along for the ride
 2018-09-21 09:28:34 +10:00
Biscuit Boy
87d099c6d8 Style for mordred 2018-09-21 03:50:38 +10:00
Biscuit Boy
31333dea49 I can already hear the screams of mordred shouting style 2018-09-21 02:06:00 +10:00
Biscuit Boy
d32cc45f0d Gm teri will now tele to the main aetheryte if there is one in the zone 2018-09-21 02:02:51 +10:00
Mordred
89a9b16555 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
34c0f74139 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-08-28 19:07:53 +02:00
Mordred
7f7588ef1f Simplified actorcontrol creation 2018-08-28 19:05:52 +02:00
Biscuit Boy
aa0857ccad forgot space 2018-08-28 15:09:03 +10:00
Biscuit Boy
cf3ad7628f Added wireframe rendering actorcontrol type and gm wireframe command 2018-08-28 15:02:59 +10:00
NotAdam
be1a5d53f3 fix db storage for classjobs, improve switching between classes 2018-08-26 16:19:05 +10:00
NotAdam
901168d810 addItem is way less retarded now, stacks are automagically filled first 2018-08-25 00:15:26 +10:00
NotAdam
8a2b472554 additem returns an itemptr, handin item container 2018-08-12 22:53:21 +10:00
NotAdam
d8afc7a83e remove a 2nd space in //gm gil output 2018-07-26 23:38:58 +10:00
Mordred Admin
e11f1b3f20 Finished removing old inventory class and moving stuff into player 2018-07-25 09:48:54 +02:00
Mordred
8555f3060f Not compilable atm, still moving stuff around 2018-07-24 23:58:08 +02:00
NotAdam
7ee20730fa style 2018-07-10 20:25:08 +10:00
NotAdam
66fd8ba7fe fixed inter-instance gm calling, fixes #341 
as a note, calling someone into an instance has been disabled
 2018-07-10 20:22:46 +10:00
NotAdam
2526ad7d90 convert more old incoming packets to structs 2018-07-06 23:36:50 +10:00
NotAdam
104b07d7fa start moving old packets to new incoming packet system 2018-07-06 22:43:54 +10:00
NotAdam
228053834a incoming packet deserialization 2018-07-06 19:47:35 +10: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 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
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
1172861d4d label now comes before getter in //gm teri 2018-07-01 21:31:26 +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
738b09d5c5 More cleanup yet 2018-06-02 15:52:35 +02:00
Mordred
911bf39af8 Some cleanup and buildfix 2018-06-02 13:38:00 +02:00
Biscuit Boy
ff6eeef68a GM Raise uses the new zoneinpacket system 2018-04-22 18:21:22 +10:00
Biscuit Boy
a9c3f67944 Added Zone GuId to gm teri_info and fixed spacing 2018-04-22 00:50:04 +10:00
Biscuit Boy
327ece8748 Gm invis is less of a hack 2018-04-19 22:47:03 +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
Adam
4f4341ac78 fix zone crash when using a normal zones instance id vs zone id 2018-03-16 20:33:28 +11:00
Mordred
efa0a81d9e Basics of instance binding system 2018-03-15 23:37:21 +01: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
6e5737f401 Actors are now used as base for any entity 2018-02-22 15:31:10 +01:00
Mordred
9a4e7533c6 Renaming classes in preperation of actor rework 2018-02-20 22:46:44 +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
ddb4247588 More zone refactoring, general style fixes 2018-02-14 21:11:23 +01:00
Adam
7528db3b83 remove exddata from sapphire_zone 2018-02-07 14:27:52 +11:00
Mordred Admin
0fc7d293ec Merge remote-tracking branch 'origin/event_rewrite' 
Conflicts:
	src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
 2018-01-30 07:53:15 +01:00
Adam
56c6b38966 createInstanceContent and some minor refactoring 2018-01-29 19:40:27 +11:00