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

135 commits

Author SHA1 Message Date
Mordred
e7cf9f9dbe Changed director trigger/function names 2018-07-17 22:39:04 +02:00
AriAvery
7cef56e111 less hosuing 2018-07-16 17:58:42 +02:00
AriAvery
774fa1dd7b removed hosuing - created housing 2018-07-16 17:51:17 +02:00
AriAvery
f00efb367a Revert "fixed style #4" 
This reverts commit 4aa45fd71b.
 2018-07-16 16:21:01 +02:00
AriAvery
4aa45fd71b fixed style #4 2018-07-16 16:13:39 +02:00
AriAvery
9051ce6f11 added wardMaxNum 2018-07-16 13:54:03 +02:00
AriAvery
7f3583f305 fixed style #3 2018-07-16 12:37:04 +02:00
AriAvery
7ef913ad19 fixed style #2 2018-07-16 12:05:51 +02:00
AriAvery
57e1ed8503 fixed style 2018-07-16 11:58:25 +02:00
AriAvery
3593b374ff init housing setup 2018-07-15 23:59:15 +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
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 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
Mordred Admin
8e6cdf0eda Removed old GamePacket 2018-07-03 09:20:09 +02: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
af06875e93 Rename m_territoryInstanceMap to m_territoryIdToInstanceGuidMap 2018-07-01 21:36:35 +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
NotAdam
d3871ae6ce instanceCommenceTime is set by a function that returns a uint 2018-06-11 22:26:19 +10:00
Biscuit Boy
7daba847a6 Now erase zone from the set and removed count like talked about 2018-04-22 01:13:37 +10:00
Biscuit Boy
3c65d76114 Fixed making new zones 2018-04-22 00:49:32 +10: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
Adam
9aa7656e44 some more initui figured out 2018-03-17 01:25:44 +11:00
Adam
0d3b4431e8 make cf choose a random instance, fix territorymgr spawning event instances 2018-03-16 21:40:59 +11:00
Adam
65d7bb3fef don't start instance until all bound players are present 2018-03-16 19:43:36 +11:00
Adam
801bb1b732 instance player binding done, minor refactoring 2018-03-16 16:56:43 +11:00
Mordred
f5ff43857e Basics of instance binding system 2018-03-15 23:37:21 +01:00
Mordred
919abe5162 style fix 2018-03-15 12:24:34 +01:00
Adam
6bb3c4f45c Implement director wide bgm 
Warning: Not tested
 2018-03-15 19:57:35 +09:00
Adam
108268b107 bgm is set correctly for instances 2018-03-15 20:48:35 +11:00
Adam
f0319081f2 style points and packet def 2018-03-15 18:06:12 +11:00
Adam
8bd3e871d6 its magic 2018-03-15 02:49:35 +11:00
Adam
a9087289fe magic numbers mason 2018-03-15 02:36:16 +11:00
Adam
f74c96a5d4 reorganise event defs, make instance cutscene playback generic 2018-03-13 20:06:34 +11:00
Adam
bdd438e589 proper event plays upon entering sastasha 2018-03-13 17:57:52 +11:00
Adam
0f86b5f045 Add a qte event command 2018-03-10 00:06:44 +09:00
Mordred Admin
f825eb5bdb More framework changes, linker still unhappy 2018-03-09 10:19:38 +01:00
Mordred Admin
28811277a8 Merge branch 'actor_rewrite' of https://github.com/SapphireMordred/Sapphire into actor_rewrite 2018-03-06 22:24:25 +01:00
Mordred Admin
c2165e5f33 Cleanup of cmake files 2018-03-06 22:22:19 +01:00
Adam
4bc06c95ba make mordred happy 2018-03-06 18:00:57 +11:00
Adam
5ae1a99769 if player already zoned into instance, don't teleport them back to start on zonein 2018-03-06 14:26:35 +11:00
Adam
8dd19cf815 auto hide entrance circle 2018-03-06 13:33:10 +11:00
Mordred
0833bdd76c Merge remote-tracking branch 'origin/master' into actor_rewrite 2018-03-06 00:10:36 +01:00
Mordred
37e7c2e51b Basic event play for directors, still buggy. Also some small fixes all around 2018-03-05 23:01:55 +01:00
Mordred
edd843fdd0 formatting 2018-03-05 14:35:03 +01:00
Mordred
38f018240d formatting 2018-03-05 14:34:34 +01:00
Adam
0aae810e16 fix onEnterTerritory events 2018-03-05 22:10:14 +11:00