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

1458 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
521c62013c ignore cotire generated files 2018-02-28 22:25:34 +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
Mordred
fa3039e769
Merge pull request #256 from GokuWeedLord/actor_rewrite 
restructure instance script folder
 2018-02-27 17:41:48 +01:00
Adam
4f4af97b26 Merge remote-tracking branch 'upstream/actor_rewrite' into actor_rewrite 2018-02-27 23:05:52 +11:00
Adam
6d6c3c0f90 eobj state cmd and some ontalk fixes 2018-02-27 23:05:42 +11:00
Mordred Admin
2d45e32b08 Build fix by excluding pcb_reader and event_object_dumper for now 2018-02-27 09:32:50 +01:00
Adam
7a7674b943 restructure instance script folder 2018-02-27 17:08:38 +11:00
Mordred
a7bef9e244 Added instance script dumper 2018-02-26 23:50:50 +01:00
Mordred
b9da9eed66 Added all barebone scripts 2018-02-26 23:43:19 +01:00
Mordred
c4cbf256e3
Merge pull request #255 from GokuWeedLord/actor_rewrite 
fix possible null pointer access & eobj state update
 2018-02-26 22:06:31 +01:00
Mordred
0e64bf76d2
Update Sastasha.cpp 2018-02-26 19:33:31 +01:00
Adam
4afc9e91b7 eobj interaction callbacks, eobj spawning fixed, sastasha instance eobjs 2018-02-27 02:13:01 +11:00
Adam
4137379853 fix possible null pointer access & eobj state update 2018-02-25 21:46:34 +11:00
Mordred
3257522d31
Merge pull request #254 from GokuWeedLord/actor_rewrite 
opcodes, ontalk handling in instances, build fix (maybe)
 2018-02-25 09:41:27 +01:00
Adam
c210b5ebef cmake test 2018-02-25 17:24:00 +11:00
Adam
8a3ed93fbc redirect ontalk events inside instances to instancecontent ptr 2018-02-25 17:23:52 +11:00
Adam
b6cfa339d6 more opcodes 2018-02-25 15:16:42 +11:00
Mordred
e548e148e5 Simplified syntax for eobj registering, added test script for thousand maws 2018-02-25 01:23:40 +01:00
Mordred
67c2cb7971 Improved timing on instance starting 2018-02-24 23:53:32 +01:00
Mordred
8cf15061d0 Fixed eventObject not using correct object id 2018-02-24 15:21:18 +01:00
Mordred
65242d2dee Added onEnterTerritory for IC, also changed the way IC is called 2018-02-24 15:19:32 +01:00
Mordred
c7e15bf52a Use make shared in instance scripts for eobjs 2018-02-24 09:40:44 +01:00
Mordred
acee4d4b51 EObjects are now given a name and can be retrieved using it 2018-02-24 00:07:07 +01:00
Mordred
f9722b5e2e EventObjects are not properly spawned and initialized 2018-02-23 23:47:21 +01:00
Mordred
c53642bf7d Warrior of light in init ui 2018-02-22 23:13:31 +01:00
Mordred
99520f4923 More transitional work towards actors as base 2018-02-22 22:15:32 +01:00
Mordred
692ca9d56e More stuff moved over to actor baseclass 2018-02-22 18:12:36 +01:00
Mordred
cb9a93db6c Added type checks for possibly object kinds 2018-02-22 17:06:30 +01:00
Mordred
6e5737f401 Actors are now used as base for any entity 2018-02-22 15:31:10 +01:00
Mordred
29918f5807 Fixed an issue with teleport not picking the correct target position, eventaction unlocks player now 2018-02-21 23:30:35 +01:00