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

6109 commits

This branch
This branch
All branches
Author SHA1 Message Date
Maru
b7f2ed462e 🗣 💩 2018-03-02 08:13:45 -03:00
Maru
92bb6187cd 🚮 2018-03-02 07:39:38 -03:00
Maru
2c67263135 🚮 2018-03-02 07:39:38 -03:00
Maru
b3318f14a3 Framework; Refactors, styling, other minor stuff; 2018-03-02 07:22:25 -03:00
Maru
a61aef2c1e 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
Mordred
489d254f9b
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
8437ff3cbc 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
Adam
4e597d8acd 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
78d660a1ce 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
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
edebe804f1 Merge remote-tracking branch 'upstream/actor_rewrite' into actor_rewrite 2018-03-02 02:55:08 +11:00
Adam
a086593eb5 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
Adam
810d71f262 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
783057723e 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
220ebfd763 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
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
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
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
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
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
Adam
0ff4acf8c8 note to self 2018-02-28 23:58:11 +11:00
Adam
af8cfeeb58 note to self 2018-02-28 23:58:11 +11:00
Adam
439eeaaaf9 fix eobj out of bounds allocation client crash 2018-02-28 23:53:20 +11:00
Adam
d024f0a396 fix eobj out of bounds allocation client crash 2018-02-28 23:53:20 +11:00
Adam
56af490008 ignore cotire generated files 2018-02-28 22:25:34 +11:00
Adam
521c62013c ignore cotire generated files 2018-02-28 22:25:34 +11:00
Adam
841e292e9b director sequence/branch setters & debug command 2018-02-28 22:25:18 +11:00
Adam
416366c144 director sequence/branch setters & debug command 2018-02-28 22:25:18 +11:00
Mordred Admin
e0f0414a75 Use precompiled headers for scripts and some libraries 2018-02-28 11:51:44 +01:00
Mordred Admin
b49cbc0644 Use precompiled headers for scripts and some libraries 2018-02-28 11:51:44 +01:00
Mordred Admin
6934df80f2 More include improvements 2018-02-28 11:14:25 +01:00
Mordred Admin
aca7508d00 More include improvements 2018-02-28 11:14:25 +01:00
Mordred Admin
72e8fa36e8 Rearranged includes for potential speed increases 2018-02-28 10:26:03 +01:00
Mordred Admin
083a3aa239 Rearranged includes for potential speed increases 2018-02-28 10:26:03 +01:00
Mordred
fae163eafa Fixed eobjects getting incorrect ids, fixed actors not properly removing from cells 2018-02-28 00:03:26 +01:00
Mordred
e4d6711ad4 Fixed eobjects getting incorrect ids, fixed actors not properly removing from cells 2018-02-28 00:03:26 +01:00
Mordred
40797f425e Merge pull request #256 from GokuWeedLord/actor_rewrite 
restructure instance script folder
 2018-02-27 17:41:48 +01:00
Mordred
fa3039e769
Merge pull request #256 from GokuWeedLord/actor_rewrite 
restructure instance script folder
 2018-02-27 17:41:48 +01:00
Adam
a299b9f7e6 Merge remote-tracking branch 'upstream/actor_rewrite' into actor_rewrite 2018-02-27 23:05:52 +11:00
Adam
4f4af97b26 Merge remote-tracking branch 'upstream/actor_rewrite' into actor_rewrite 2018-02-27 23:05:52 +11:00
Adam
d4c3250ab0 eobj state cmd and some ontalk fixes 2018-02-27 23:05:42 +11:00