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

1194 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mordred
7ea3bc2523 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
2062bb14a5 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
552179c4e4 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
c2165e5f33 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
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
0adb47e4a5 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
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
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
edd843fdd0 formatting 2018-03-05 14:35:03 +01:00
Mordred
38f018240d 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
0aae810e16 fix onEnterTerritory events 2018-03-05 22:10:14 +11:00
Adam
4496f8c144 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
8963f560c8 Merge pull request #264 from NotAdam/actor_rewrite 
eobj rotation ipc fix & new instance scripts
 2018-03-04 10:25:52 +01:00
Adam
4d4a1e3515 build fix? 2018-03-04 18:13:05 +11:00
Adam
0e5528077e new instance scripts with eobj rotation 2018-03-04 17:51:32 +11:00
Adam
9dcb271a63 use subfolders for instancecontenttype and export eobj rotation 2018-03-04 17:49:18 +11:00
Adam
bb35edd56b fix rotation in objectspawn ipc and send it too 2018-03-04 17:41:17 +11:00
Mordred
7659521233 Instance parser updated to map sgb content to EObjects 2018-03-04 00:16:44 +01:00
Mordred
3747b89b67 Fixed an inventory bug to to invalid size 2018-03-04 00:12:33 +01:00
Mordred
15ec99fc7a Merge pull request #261 from itsMaru/master 
Framework class; General refactoring and styling;
 2018-03-03 00:28:15 +01:00
Mordred
76967fe990 Merge pull request #262 from takhlaq/opening_quest 
fixed limsa and uldah intro quest
 2018-03-03 00:26:54 +01:00
Tahir Akhlaq
c0acf3aad8 fixed limsa and uldah intro quest 2018-03-02 16:27:04 +00:00
Maru
c9a41a148f Qualifiers 2018-03-02 10:18:54 -03:00
Maru
7d1c77b8b3 Ｂｕｉｌｄ ｓｕｃｃｅｅｄｅｄ. 2018-03-02 10:11:03 -03:00
Maru
834978ad7f Fix Travis Build 2018-03-02 09:55:03 -03:00
Maru
2856353dd6 More style stuff; 2018-03-02 08:25:48 -03:00
Maru
77c044cd9d 🗣 💩 2018-03-02 08:13:45 -03:00
Maru
92bb6187cd 🚮 2018-03-02 07:39:38 -03:00
Maru
b3318f14a3 Framework; Refactors, styling, other minor stuff; 2018-03-02 07:22:25 -03:00
Mordred
a164e7d3ce Merge pull request #260 from GokuWeedLord/actor_rewrite 
fix return for nextFreeSpawnIndex
 2018-03-02 06:10:44 +01:00
Adam
9a0041e093 set weatheroverride debug command and assert fix in spawnindexallocator 2018-03-02 15:29:48 +11:00
Adam
facba12fed fix stupid return type mistake 2018-03-02 11:39:52 +11:00
Mordred
f1121b52b2 Object despawning added 2018-03-01 23:17:35 +01:00
Mordred
1392e7e411 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
edebe804f1 Merge remote-tracking branch 'upstream/actor_rewrite' into actor_rewrite 2018-03-02 02:55:08 +11:00
Adam
416269dc63 move eobj/player spawnindex generation to common manager 2018-03-02 02:55:02 +11:00
Mordred
78b5ed525d Merge branch 'actor_rewrite' of https://github.com/SapphireMordred/Sapphire into actor_rewrite 2018-03-01 16:32:28 +01:00
Mordred
99bbfa0eb3 More include stuff 2018-03-01 16:31:58 +01:00
Mordred
979c321572 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
38913e7649 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
8e2859d038 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