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

64 commits

Author SHA1 Message Date
mordred
a7bc521ebc Cleanup of housing definitions 2018-11-14 10:00:16 +01:00
AriAvery
762f01366d name fixes 2018-11-12 09:32:20 +01:00
AriAvery
ac2dcaec93 rename trigger (working) + build preset (starting) 2018-11-12 08:32:30 +01:00
AriAvery
d46d4fe068 fixes 2018-11-11 14:34:56 +01:00
AriAvery
aa9e1e2450 Signs + rename 2018-11-11 14:27:39 +01:00
AriAvery
dadc8184e9 House fixes 2018-11-10 19:00:13 +01:00
Mordred
a72f3b122c Sending quest info on loading finish, fixes housing login crash 2018-11-06 23:36:34 +01:00
Mordred
5ffb8fd65e Use territoryType instead of TerritoryId, also refactor variables to reflect the change 2018-11-05 23:07:39 +01: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
f6cf3b076b
Merge pull request #389 from KBiscuit/develop 
Lobby now shows correct info (fixes #328), Gm teri improvements, Discov ref is debug text
 2018-09-24 22:20:19 +02:00
Biscuit Boy
30a47d3494 style 2018-09-25 01:24:50 +10:00
Biscuit Boy
ef87b9b36d Examine works correctly again / Handles errors for GM's and diff zones 2018-09-25 01:11:14 +10:00
Biscuit Boy
ff186c7d0e Discov ref should be a debug, not notice 2018-09-21 02:03:10 +10:00
Mordred Admin
150ce725bc Merge develop into bnpc 2018-09-17 14:04:40 +02:00
Tahir Akhlaq
afc4d89d22 added basic examine functionality 
- todo: fix gear models not displaying
 2018-09-10 14:34:24 +01:00
Mordred
0d767e4986 Working towards getting bnpcs back in the game 2018-09-09 23:56:22 +02: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
7f7588ef1f Simplified actorcontrol creation 2018-08-28 19:05:52 +02:00
NotAdam
7b1281fba4 Merge remote-tracking branch 'upstream/develop' into develop 2018-07-08 19:45:37 +10:00
Mordred
5bd6e94a16 Walking displays correctly 2018-07-08 00:43:03 +02:00
NotAdam
6da1af4fb5 add tell and chat ipc structures 2018-07-07 22:27:35 +10:00
NotAdam
961621a903 cleanup 2018-07-07 17:14:30 +10:00
NotAdam
0fa55e3d9a fix searchinfo update, add searchinfo ipc struct 2018-07-07 16:50:11 +10:00
NotAdam
7607f42a67 Merge remote-tracking branch 'upstream/develop' into develop 2018-07-07 13:41:35 +10:00
Mordred
ac9845f827 Some movement improvements, still not perfect.. baby steps... 2018-07-07 00:10:16 +02:00
NotAdam
5d8836e993 const correctness 2018-07-06 23:38:40 +10:00
NotAdam
2526ad7d90 convert more old incoming packets to structs 2018-07-06 23:36:50 +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
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