mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-25 22:17:45 +00:00
Code Activity
1094 commits 10 branches 14 tags 26 MiB
Commit graph

1094 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mordred
42a556b487 Build fix... well ish... 2018-03-06 23:20: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
6350f1d917 Updated submodules 2018-03-06 22:45:46 +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
a7d43d7855 Merge remote-tracking branch 'origin/social_implementation' into actor_rewrite 2018-03-06 22:33:41 +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
Mordred
b32393ab42
Merge pull request #266 from NotAdam/actor_rewrite 
minor instances fixes
 2018-03-06 08:19:01 +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
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
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
Mordred
77d7e95c07
Merge pull request #264 from NotAdam/actor_rewrite 
eobj rotation ipc fix & new instance scripts
 2018-03-04 10:25:52 +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
Mordred
60661e32bd
Merge pull request #261 from itsMaru/master 
Framework class; General refactoring and styling;
 2018-03-03 00:28:15 +01:00
Mordred
dc6fab5eb6
Merge pull request #262 from takhlaq/opening_quest 
fixed limsa and uldah intro quest
 2018-03-03 00:26:54 +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
Mordred
489d254f9b
Merge pull request #260 from GokuWeedLord/actor_rewrite 
fix return for nextFreeSpawnIndex
 2018-03-02 06:10:44 +01: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
Mordred
40fccfb481
Merge pull request #259 from GokuWeedLord/actor_rewrite 
move eobj/player spawnindex generation to common manager
 2018-03-01 22:41:49 +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
Mordred
13c2dec004
Merge pull request #258 from ShelbyZ/actor_rewrite_minor_cmake_changes 
Minor updates for actor_rewrite branch
 2018-03-01 08:13:33 +01:00
Mordred
20bb4f452d
Merge pull request #257 from GokuWeedLord/actor_rewrite 
eobj crash fix, ignore cotire generated files, director branch/seq setters
 2018-03-01 08:13:17 +01:00
ShelbyZ
644d83e514 Minor updates for actor_rewrite branch 
- The libraries/external is not correctly mapped for windows cmake, had
an extra '../'
- add build flag for msvc for building with multiple processors /MP
 2018-02-28 20:51:47 -08:00