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

6588 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mordred Admin
ee836e5548 Disableing cotire for zone 2018-03-07 09:01:53 +01:00
Mordred Admin
5a6835c7f1 Disableing cotire for zone 2018-03-07 09:01:53 +01:00
Mordred Admin
01cd6e17ec forgot to remove old files 2018-03-07 08:48:16 +01:00
Mordred Admin
8accf4cacf forgot to remove old files 2018-03-07 08:48:16 +01:00
Mordred Admin
638ba45dd9 Moved scripts out of server_zone scope 2018-03-07 08:14:42 +01:00
Mordred Admin
e15c46500c Moved scripts out of server_zone scope 2018-03-07 08:14:42 +01:00
Mordred
fd7489d5c0 Update submodules 2018-03-06 23:38:21 +01:00
Mordred
88cf5de3b4 Update submodules 2018-03-06 23:38:21 +01:00
Mordred
7ea3bc2523 Build fix... well ish... 2018-03-06 23:20:07 +01:00
Mordred
42a556b487 Build fix... well ish... 2018-03-06 23:20:07 +01:00
Mordred Admin
a5008e744c Merge branch 'actor_rewrite' of https://github.com/SapphireMordred/Sapphire into actor_rewrite 2018-03-06 22:46:07 +01:00
Mordred Admin
a489e9f576 Merge branch 'actor_rewrite' of https://github.com/SapphireMordred/Sapphire into actor_rewrite 2018-03-06 22:46:07 +01:00
Mordred Admin
2062bb14a5 Updated submodules 2018-03-06 22:45:46 +01:00
Mordred Admin
6350f1d917 Updated submodules 2018-03-06 22:45:46 +01:00
Mordred
a2e27ddb9a Merge branch 'actor_rewrite' of https://github.com/SapphireMordred/Sapphire into actor_rewrite 2018-03-06 22:34:12 +01:00
Mordred
ef39c72bc8 Merge branch 'actor_rewrite' of https://github.com/SapphireMordred/Sapphire into actor_rewrite 2018-03-06 22:34:12 +01:00
Mordred
552179c4e4 Merge remote-tracking branch 'origin/social_implementation' into actor_rewrite 2018-03-06 22:33:41 +01:00
Mordred
a7d43d7855 Merge remote-tracking branch 'origin/social_implementation' into actor_rewrite 2018-03-06 22:33:41 +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
6ed1b274a3 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
Mordred Admin
b91e711834 Cleanup of cmake files 2018-03-06 22:22:19 +01:00
Mordred
2b3c41c1f2 Merge pull request #266 from NotAdam/actor_rewrite 
minor instances fixes
 2018-03-06 08:19:01 +01:00
Mordred
b32393ab42
Merge pull request #266 from NotAdam/actor_rewrite 
minor instances fixes
 2018-03-06 08:19:01 +01:00
Adam
4bc06c95ba make mordred happy 2018-03-06 18:00:57 +11:00
Adam
32e10ec6e8 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
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
0adb47e4a5 remove double eventStart call 2018-03-06 13:34:02 +11:00
Adam
dcd0d6b0cd remove double eventStart call 2018-03-06 13:34:02 +11:00
Adam
8dd19cf815 auto hide entrance circle 2018-03-06 13:33:10 +11:00
Adam
39e379747d 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
ec0335b64a 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
22402651e9 Basic event play for directors, still buggy. Also some small fixes all around 2018-03-05 23:01:55 +01:00
Mordred
b3497ee06f Merge pull request #265 from NotAdam/actor_rewrite 
fix onEnterTerritory events, eventstart handling for instances
 2018-03-05 21:07:46 +01:00
Mordred
5781232516
Merge pull request #265 from NotAdam/actor_rewrite 
fix onEnterTerritory events, eventstart handling for instances
 2018-03-05 21:07:46 +01:00
Mordred
edd843fdd0 formatting 2018-03-05 14:35:03 +01:00
Mordred
97ae0ac742
formatting 2018-03-05 14:35:03 +01:00
Mordred
38f018240d formatting 2018-03-05 14:34:34 +01:00
Mordred
df29f674df
formatting 2018-03-05 14:34:34 +01:00
Adam
33429a0284 better handling of EventStart IPC for instances 2018-03-05 22:40:11 +11:00
Adam
0de9fb05cf better handling of EventStart IPC for instances 2018-03-05 22:40:11 +11:00
Adam
0aae810e16 fix onEnterTerritory events 2018-03-05 22:10:14 +11:00
Adam
8fd1a2e3df fix onEnterTerritory events 2018-03-05 22:10:14 +11:00
Adam
4496f8c144 add zone opcode 2018-03-05 17:01:37 +11:00
Adam
b26a6f3317 add zone opcode 2018-03-05 17:01:37 +11:00
Mordred
3be616eddb Fixed boundByDuty state so duty menu works in instance 2018-03-04 17:53:40 +01:00
Mordred
be46ec837d Fixed boundByDuty state so duty menu works in instance 2018-03-04 17:53:40 +01:00