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

135 commits

Author SHA1 Message Date
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
Mino
1e19a7b0ae Implement director wide bgm 
Warning: Not tested
 2018-03-15 19:57:35 +09:00
Adam
093f23c5c4 bgm is set correctly for instances 2018-03-15 20:48:35 +11:00
Adam
3f0cdfac73 style points and packet def 2018-03-15 18:06:12 +11:00
Adam
2456902467 its magic 2018-03-15 02:49:35 +11:00
Adam
f6a4edc6de magic numbers mason 2018-03-15 02:36:16 +11:00
Adam
3baa7efa30 reorganise event defs, make instance cutscene playback generic 2018-03-13 20:06:34 +11:00
Adam
28ee0fd182 proper event plays upon entering sastasha 2018-03-13 17:57:52 +11:00
Mino
a33894f70a Add a qte event command 2018-03-10 00:06:44 +09:00
Mordred Admin
250b1aef79 More framework changes, linker still unhappy 2018-03-09 10:19:38 +01:00
Mordred Admin
6ed1b274a3 Merge branch 'actor_rewrite' of https://github.com/SapphireMordred/Sapphire into actor_rewrite 2018-03-06 22:24:25 +01:00
Mordred Admin
b91e711834 Cleanup of cmake files 2018-03-06 22:22:19 +01:00
Adam
32e10ec6e8 make mordred happy 2018-03-06 18:00:57 +11:00
Adam
df4ee95cf5 if player already zoned into instance, don't teleport them back to start on zonein 2018-03-06 14:26:35 +11:00
Adam
39e379747d auto hide entrance circle 2018-03-06 13:33:10 +11:00
Mordred
ec0335b64a Merge remote-tracking branch 'origin/master' into actor_rewrite 2018-03-06 00:10:36 +01:00
Mordred
22402651e9 Basic event play for directors, still buggy. Also some small fixes all around 2018-03-05 23:01:55 +01:00
Mordred
97ae0ac742
formatting 2018-03-05 14:35:03 +01:00
Mordred
df29f674df
formatting 2018-03-05 14:34:34 +01:00
Adam
8fd1a2e3df fix onEnterTerritory events 2018-03-05 22:10:14 +11:00