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

69 commits

Author SHA1 Message Date
Mordred
5ffb8fd65e Use territoryType instead of TerritoryId, also refactor variables to reflect the change 2018-11-05 23:07:39 +01:00
NotAdam
daf8fbfdb6 more boost gone & remove duplicated watchdog lib 2018-10-25 13:38:32 +11:00
NotAdam
4e3edbbcd2 remove more boost 2018-10-25 12:44:51 +11:00
Mordred Admin
150ce725bc Merge develop into bnpc 2018-09-17 14:04:40 +02:00
Mordred
0d767e4986 Working towards getting bnpcs back in the game 2018-09-09 23:56:22 +02:00
NotAdam
d88efbf30d allow for multiple festivals to run at once 2018-09-01 20:55:28 +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
7f7588ef1f Simplified actorcontrol creation 2018-08-28 19:05:52 +02:00
Mordred
5e280c9d05 Added another trigger def and removed some debug prints 2018-07-03 23:25:44 +02: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 Admin
50ba02ed27 Removed old GamePacket 2018-07-03 09:20:09 +02: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
Adam
d7006574ac proper festival handling (woah) 2018-03-20 20:30:05 +11:00
Mordred
c4ec162f0f Improved handling of actors in zones generally 2018-03-17 18:06:13 +01:00
Mordred
2d4d6c6579 Fixed an issue where players were removed from the wrong zone 2018-03-17 11:36:56 +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
Adam
8fd1a2e3df fix onEnterTerritory events 2018-03-05 22:10:14 +11:00
Adam
6255df16f2 fix rotation in objectspawn ipc and send it too 2018-03-04 17:41:17 +11: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
e4d6711ad4 Fixed eobjects getting incorrect ids, fixed actors not properly removing from cells 2018-02-28 00:03:26 +01:00
Mordred
b9da9eed66 Added all barebone scripts 2018-02-26 23:43:19 +01:00
Adam
4afc9e91b7 eobj interaction callbacks, eobj spawning fixed, sastasha instance eobjs 2018-02-27 02:13:01 +11:00
Adam
8a3ed93fbc redirect ontalk events inside instances to instancecontent ptr 2018-02-25 17:23:52 +11:00
Mordred
e548e148e5 Simplified syntax for eobj registering, added test script for thousand maws 2018-02-25 01:23:40 +01:00
Mordred
f9722b5e2e EventObjects are not properly spawned and initialized 2018-02-23 23:47:21 +01:00
Mordred
99520f4923 More transitional work towards actors as base 2018-02-22 22:15:32 +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
c1fb728a05 In range restructuring 2018-02-21 18:06:52 +01:00
Mordred
f12c431173 Removed battlenpc for cleanup work 2018-02-21 12:48:27 +01:00
Mordred
684735ee55 Build fix 2018-02-21 11:28:34 +01:00
Mordred
7073211411 Started stripping actors - readding after rewrite 2018-02-20 23:42:09 +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
c4206ee9bc Simplified in range logic 2018-02-18 22:53:12 +01:00
Mordred
ddb4247588 More zone refactoring, general style fixes 2018-02-14 21:11:23 +01:00
Mordred
e8ab570502 refactoring of session update loop in zone 2018-02-14 20:44:35 +01:00
Mordred Admin
c54ebbe53c Cleaned up generated exd stuff 2018-02-14 12:31:47 +01:00
Mordred
0d4b846e79 Fixed an issue where offline chars were not removed properly 2018-02-13 22:37:45 +01:00
Mordred
649bd7d8e6 Further clean up in range stuff 2018-02-11 23:52:44 +01:00
Mordred
cee84cd9ff In range containers no longer declared publicly 2018-02-11 22:57:00 +01:00
Adam
31a9ed45a6 move instance objects to zone from instancecontent 2018-02-10 21:53:16 +11:00
Mordred
1f415a0d05 Majorly refactored usage of shared_ptr also added GameObject into Actor inheritance chain 2018-02-10 01:21:31 +01:00
Mordred
abf1194a7a
comment added 2018-02-08 15:29:46 +01:00
goaaats
cb787b44f5 Handle via inRangeSet 2018-02-08 15:25:59 +01:00