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

204 commits

Author SHA1 Message Date
NotAdam
973cfbf365 Block //gm terri <territorytype> usage for instanced territories 2018-11-05 23:04:26 +11:00
Mordred
0f6ac74f15 Houseing data initializing and signs 2018-11-04 23:47:10 +01:00
Mordred
f1aa9253c8 Small refactors 2018-11-03 23:44:43 +01:00
Mordred
36f7272357 Initialize all lands to state 1 2018-11-03 11:42:09 +01:00
Mordred
458fd9b190 More refactoring and linux compile fix 2018-11-03 00:47:45 +01:00
Mordred
f012d0bd2f More housing cleanup 2018-11-02 19:21:12 +01:00
Mordred
81f247932c Housing cleanup 2018-11-01 23:56:43 +01:00
Mordred
00d86d753b Initial housing work by Vox 2018-11-01 00:18:19 +01:00
mordred
26e8552cb0 More boost or... less boost. 2018-10-26 11:38:56 +02: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
8421980b43 Various cleanups and start of spawn system 2018-09-24 23:48:42 +02:00
Mordred
f7d2bb813a Fixed !instance cr, it now takes contentfindercondition ids as input though 2018-09-19 23:04:23 +02: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
0cffd54606 cleanup old festival vars 2018-09-01 21:34:48 +10: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
d96c86853b Changed director trigger/function names 2018-07-17 22:39:04 +02:00
AriAvery
3158df44a7 less hosuing 2018-07-16 17:58:42 +02:00
AriAvery
28d6c8fe61 removed hosuing - created housing 2018-07-16 17:51:17 +02:00
AriAvery
2054a87cf7 Revert "fixed style #4" 
This reverts commit 500b194762.
 2018-07-16 16:21:01 +02:00
AriAvery
500b194762 fixed style #4 2018-07-16 16:13:39 +02:00
AriAvery
e4aeaaae8b added wardMaxNum 2018-07-16 13:54:03 +02:00
AriAvery
d5b7520e22 fixed style #3 2018-07-16 12:37:04 +02:00
AriAvery
627a816f6e fixed style #2 2018-07-16 12:05:51 +02:00
AriAvery
d31a33732c fixed style 2018-07-16 11:58:25 +02:00
AriAvery
9aeba7a0b3 init housing setup 2018-07-15 23:59:15 +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
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 Admin
50ba02ed27 Removed old GamePacket 2018-07-03 09:20:09 +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
7ee18f713f Rename m_territoryInstanceMap to m_territoryIdToInstanceGuidMap 2018-07-01 21:36:35 +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
NotAdam
766340fc2d instanceCommenceTime is set by a function that returns a uint 2018-06-11 22:26:19 +10:00
Biscuit Boy
c38ab3a445 Now erase zone from the set and removed count like talked about 2018-04-22 01:13:37 +10:00
Biscuit Boy
333ec303bd Fixed making new zones 2018-04-22 00:49:32 +10: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
Adam
15dd60534c some more initui figured out 2018-03-17 01:25:44 +11:00
Adam
39df53f7d0 make cf choose a random instance, fix territorymgr spawning event instances 2018-03-16 21:40:59 +11:00
Adam
96bf9d506a don't start instance until all bound players are present 2018-03-16 19:43:36 +11:00
Adam
00771da156 instance player binding done, minor refactoring 2018-03-16 16:56:43 +11:00
Mordred
efa0a81d9e Basics of instance binding system 2018-03-15 23:37:21 +01:00
Mordred
fa198efbb5
style fix 2018-03-15 12:24:34 +01:00