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

50 commits

Author SHA1 Message Date
Biscuit Boy
b19a4ea35d style 2018-09-25 01:24:50 +10:00
Biscuit Boy
7b701781ad Examine works correctly again / Handles errors for GM's and diff zones 2018-09-25 01:11:14 +10:00
Mordred Admin
238ea28d75 Merge develop into bnpc 2018-09-17 14:04:40 +02:00
Tahir Akhlaq
bffebd0bc7 added basic examine functionality 
- todo: fix gear models not displaying
 2018-09-10 14:34:24 +01:00
Mordred
9624d08b4c Working towards getting bnpcs back in the game 2018-09-09 23:56:22 +02:00
Mordred
e745bd0329 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
eb5a567730 Simplified actorcontrol creation 2018-08-28 19:05:52 +02:00
NotAdam
ae895ccfc0 Merge remote-tracking branch 'upstream/develop' into develop 2018-07-08 19:45:37 +10:00
Mordred
406b69b88d Walking displays correctly 2018-07-08 00:43:03 +02:00
NotAdam
69624b5053 add tell and chat ipc structures 2018-07-07 22:27:35 +10:00
NotAdam
2e0fec5a10 cleanup 2018-07-07 17:14:30 +10:00
NotAdam
25b6359736 fix searchinfo update, add searchinfo ipc struct 2018-07-07 16:50:11 +10:00
NotAdam
801774e596 Merge remote-tracking branch 'upstream/develop' into develop 2018-07-07 13:41:35 +10:00
Mordred
814d9e995c Some movement improvements, still not perfect.. baby steps... 2018-07-07 00:10:16 +02:00
NotAdam
44eeda832b const correctness 2018-07-06 23:38:40 +10:00
NotAdam
833f4f1431 convert more old incoming packets to structs 2018-07-06 23:36:50 +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
3448218ff6 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
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
Biscuit Boy
c01cf130a4 Tell works again and add research I found for u3b 2018-07-02 23:16:55 +10: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
569445632c change [GM] chat to isActingAsGm instead of directly checking Status 2018-07-01 21:33:37 +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
10a39b2625 Cleanup cleanup cleanup 2018-06-03 19:31:03 +02:00
Mordred
86b2a9cded More cleanup yet 2018-06-02 15:52:35 +02:00
goaaats
251ecf6d28 Added SQL field for EquipDisplayFlags, fixed Legacy Mark 2018-05-17 20:46:11 +02:00
Biscuit Boy
9fd6a48ca3 [GM] chat now looks for the onlinestatus instead 2018-04-22 18:22:45 +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
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
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
5d8b5786d6 removed all unused state flags, mapped more client actions 2018-02-15 23:50:28 +01:00
Mordred
66d7dbab4f In range containers no longer declared publicly 2018-02-11 22:57:00 +01:00
Mordred
2000d5d2f8 Majorly refactored usage of shared_ptr also added GameObject into Actor inheritance chain 2018-02-10 01:21:31 +01:00
Adam
f94a8ceee5 remove exddata from sapphire_zone 2018-02-07 14:27:52 +11:00
Mordred
0cb304083d More preparational director logic, state inside can be modified with !instance <instanceId> <varIdx> <value> 2018-02-07 00:00:48 +01:00
Mordred
af90b006ac Disabled betweenarea state flags until we fix it 2018-02-04 18:53:19 +01: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
Adam
afd439c64f shouts now have correct behaviour 2018-01-28 18:48:56 +11:00
Mordred
aabcdf6e74 Replacement of old ZoneMgr 2018-01-27 23:52:49 +01: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/PacketHandlers.cpp (Browse further)