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

70 commits

Author SHA1 Message Date
Mordred
db6a2e099b Use the right packet to update permission + cleanup + new clienttrigger 2018-11-15 22:30:59 +01:00
Mordred
c512a63b92 Use territoryType instead of TerritoryId, also refactor variables to reflect the change 2018-11-05 23:07:39 +01:00
NotAdam
0684149310 more boost gone & remove duplicated watchdog lib 2018-10-25 13:38:32 +11:00
NotAdam
42064014ac remove more boost 2018-10-25 12:44:51 +11:00
Mordred Admin
238ea28d75 Merge develop into bnpc 2018-09-17 14:04:40 +02:00
Mordred
9624d08b4c Working towards getting bnpcs back in the game 2018-09-09 23:56:22 +02:00
NotAdam
0946b0636e allow for multiple festivals to run at once 2018-09-01 20:55:28 +10: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
Mordred
56996b73f4 Added another trigger def and removed some debug prints 2018-07-03 23:25:44 +02: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 Admin
8e6cdf0eda Removed old GamePacket 2018-07-03 09:20:09 +02: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
Adam
1771ed14b4 proper festival handling (woah) 2018-03-20 20:30:05 +11:00
Mordred
fcc27defef Improved handling of actors in zones generally 2018-03-17 18:06:13 +01:00
Mordred
c92ee8b7cd Fixed an issue where players were removed from the wrong zone 2018-03-17 11:36:56 +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
Adam
0aae810e16 fix onEnterTerritory events 2018-03-05 22:10:14 +11:00
Adam
bb35edd56b fix rotation in objectspawn ipc and send it too 2018-03-04 17:41:17 +11: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
fae163eafa Fixed eobjects getting incorrect ids, fixed actors not properly removing from cells 2018-02-28 00:03:26 +01:00
Mordred
8e41e35a4e Added all barebone scripts 2018-02-26 23:43:19 +01:00
Adam
efd00c719f eobj interaction callbacks, eobj spawning fixed, sastasha instance eobjs 2018-02-27 02:13:01 +11:00
Adam
3cf0a233b1 redirect ontalk events inside instances to instancecontent ptr 2018-02-25 17:23:52 +11:00
Mordred
8504ee7e12 Simplified syntax for eobj registering, added test script for thousand maws 2018-02-25 01:23:40 +01:00
Mordred
0a177c3470 EventObjects are not properly spawned and initialized 2018-02-23 23:47:21 +01:00
Mordred
d05f523eb9 More transitional work towards actors as base 2018-02-22 22:15:32 +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
c2a95a2d7e In range restructuring 2018-02-21 18:06:52 +01:00
Mordred
b8a366fb29 Removed battlenpc for cleanup work 2018-02-21 12:48:27 +01:00
Mordred
8e38ffdb56 Build fix 2018-02-21 11:28:34 +01:00
Mordred
322dce393d Started stripping actors - readding after rewrite 2018-02-20 23:42:09 +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
7fddb75c46 Simplified in range logic 2018-02-18 22:53:12 +01:00
Mordred
50f90d960b More zone refactoring, general style fixes 2018-02-14 21:11:23 +01:00
Mordred
48162e2966 refactoring of session update loop in zone 2018-02-14 20:44:35 +01:00
Mordred Admin
df61b53d1a Cleaned up generated exd stuff 2018-02-14 12:31:47 +01:00
Mordred
8bcd5f8fe5 Fixed an issue where offline chars were not removed properly 2018-02-13 22:37:45 +01:00
Mordred
63a06dba44 Further clean up in range stuff 2018-02-11 23:52:44 +01:00
Mordred
66d7dbab4f In range containers no longer declared publicly 2018-02-11 22:57:00 +01:00
Adam
530cf8a37a move instance objects to zone from instancecontent 2018-02-10 21:53:16 +11:00
Mordred
2000d5d2f8 Majorly refactored usage of shared_ptr also added GameObject into Actor inheritance chain 2018-02-10 01:21:31 +01:00
Mordred
76dcba3f7f comment added 2018-02-08 15:29:46 +01:00