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

799 commits

Author SHA1 Message Date
Shelby Hagman
2160e6b1a8
Merge 347f87590e into e15c46500c 2018-03-07 07:27:24 +00:00
Mordred Admin
e15c46500c Moved scripts out of server_zone scope 2018-03-07 08:14:42 +01:00
ShelbyZ
347f87590e Fix some weirdness with cotire 
- cotire having unresolved externals with sapphire_zone/scripts build
- /MP was already enabled, so remove the duplicate
- still need to figure out what about pch causes unresolved symbol __
 2018-03-06 21:49:01 -08:00
Mordred
88cf5de3b4 Update submodules 2018-03-06 23:38:21 +01:00
Mordred
42a556b487 Build fix... well ish... 2018-03-06 23:20:07 +01:00
Mordred Admin
6350f1d917 Updated submodules 2018-03-06 22:45:46 +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
dcd0d6b0cd remove double eventStart call 2018-03-06 13:34:02 +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
0de9fb05cf better handling of EventStart IPC for instances 2018-03-05 22:40:11 +11:00
Adam
8fd1a2e3df fix onEnterTerritory events 2018-03-05 22:10:14 +11:00
Adam
b26a6f3317 add zone opcode 2018-03-05 17:01:37 +11:00
Mordred
be46ec837d Fixed boundByDuty state so duty menu works in instance 2018-03-04 17:53:40 +01:00
Adam
2f126e8dec build fix? 2018-03-04 18:13:05 +11:00
Adam
2c6253e37c new instance scripts with eobj rotation 2018-03-04 17:51:32 +11:00
Adam
628f01e2eb use subfolders for instancecontenttype and export eobj rotation 2018-03-04 17:49:18 +11:00
Adam
6255df16f2 fix rotation in objectspawn ipc and send it too 2018-03-04 17:41:17 +11:00
Mordred
0e9e155e53 Instance parser updated to map sgb content to EObjects 2018-03-04 00:16:44 +01:00
Mordred
619d39e6f8 Fixed an inventory bug to to invalid size 2018-03-04 00:12:33 +01:00
Tahir Akhlaq
ad082ae176 fixed limsa and uldah intro quest 2018-03-02 16:27:04 +00:00
Maru
6d65274d13 Qualifiers 2018-03-02 10:18:54 -03:00
Maru
e31b3c35ef Ｂｕｉｌｄ ｓｕｃｃｅｅｄｅｄ. 2018-03-02 10:11:03 -03:00
Maru
c93c6e24f1 Fix Travis Build 2018-03-02 09:55:03 -03:00
Maru
52468262f3 More style stuff; 2018-03-02 08:25:48 -03:00
Maru
b7f2ed462e 🗣 💩 2018-03-02 08:13:45 -03:00
Maru
2c67263135 🚮 2018-03-02 07:39:38 -03:00
Maru
a61aef2c1e Framework; Refactors, styling, other minor stuff; 2018-03-02 07:22:25 -03:00
Adam
8437ff3cbc set weatheroverride debug command and assert fix in spawnindexallocator 2018-03-02 15:29:48 +11:00
Adam
4e597d8acd fix stupid return type mistake 2018-03-02 11:39:52 +11:00
Mordred
78d660a1ce Object despawning added 2018-03-01 23:17:35 +01:00
Adam
a086593eb5 Merge remote-tracking branch 'upstream/actor_rewrite' into actor_rewrite 2018-03-02 02:55:08 +11:00
Adam
810d71f262 move eobj/player spawnindex generation to common manager 2018-03-02 02:55:02 +11:00
Mordred
783057723e Merge branch 'actor_rewrite' of https://github.com/SapphireMordred/Sapphire into actor_rewrite 2018-03-01 16:32:28 +01:00
Mordred
220ebfd763 More include stuff 2018-03-01 16:31:58 +01:00
Adam
af8cfeeb58 note to self 2018-02-28 23:58:11 +11:00
Adam
d024f0a396 fix eobj out of bounds allocation client crash 2018-02-28 23:53:20 +11:00
Adam
416366c144 director sequence/branch setters & debug command 2018-02-28 22:25:18 +11:00
Mordred Admin
b49cbc0644 Use precompiled headers for scripts and some libraries 2018-02-28 11:51:44 +01:00
Mordred Admin
aca7508d00 More include improvements 2018-02-28 11:14:25 +01: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
Adam
6d6c3c0f90 eobj state cmd and some ontalk fixes 2018-02-27 23:05:42 +11:00
Adam
7a7674b943 restructure instance script folder 2018-02-27 17:08:38 +11:00