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

68 commits

Author SHA1 Message Date
NotAdam
7cf925d1c3 Add ward selection, ward info & some script cleanup 2018-11-20 22:52:57 +11:00
Mordred
5ffb8fd65e Use territoryType instead of TerritoryId, also refactor variables to reflect the change 2018-11-05 23:07:39 +01:00
NotAdam
973cfbf365 Block //gm terri <territorytype> usage for instanced territories 2018-11-05 23:04:26 +11:00
mordred
94813321b3 57 occurances of boost to go 2018-10-26 08:25:20 +02:00
NotAdam
4e3edbbcd2 remove more boost 2018-10-25 12:44:51 +11:00
NotAdam
66b6ec2b20 Merge remote-tracking branch 'upstream/develop' into develop 2018-10-14 23:36:05 +11:00
NotAdam
319e9e5050 cleanup unnecessary refs 2018-10-14 23:31:52 +11:00
Mordred
89b3b6368d
Merge pull request #396 from KBiscuit/updates/packetDefs 
GMCommand1 & 2 almost fully mapped / Fixed /playtime
 2018-10-14 09:16:14 +02:00
Biscuit
72fde12b0c Update GMCommand 1 and 2 Defs 2018-10-14 12:52:06 +11:00
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