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

1809 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Adam
0ff4acf8c8 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
56af490008 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
Mordred Admin
e0f0414a75 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
72e8fa36e8 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
40797f425e 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
d4c3250ab0 eobj state cmd and some ontalk fixes 2018-02-27 23:05:42 +11:00
Mordred Admin
d068e24476 Build fix by excluding pcb_reader and event_object_dumper for now 2018-02-27 09:32:50 +01:00
Adam
737a3a12f9 restructure instance script folder 2018-02-27 17:08:38 +11:00
Mordred
e15c34a74d Added instance script dumper 2018-02-26 23:50:50 +01:00
Mordred
8e41e35a4e Added all barebone scripts 2018-02-26 23:43:19 +01:00
Mordred
cc1614c04b 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
699a9fac8f Update Sastasha.cpp 2018-02-26 19:33:31 +01:00
Adam
efd00c719f eobj interaction callbacks, eobj spawning fixed, sastasha instance eobjs 2018-02-27 02:13:01 +11:00
Adam
60def9134d fix possible null pointer access & eobj state update 2018-02-25 21:46:34 +11:00
Mordred
d98ad3b315 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
6b089af4af cmake test 2018-02-25 17:24:00 +11:00
Adam
3cf0a233b1 redirect ontalk events inside instances to instancecontent ptr 2018-02-25 17:23:52 +11:00
Adam
1235ce264b more opcodes 2018-02-25 15:16:42 +11:00
Mordred
8504ee7e12 Simplified syntax for eobj registering, added test script for thousand maws 2018-02-25 01:23:40 +01:00
Mordred
2ce7d91096 Improved timing on instance starting 2018-02-24 23:53:32 +01:00
Mordred
2b3512ad64 Fixed eventObject not using correct object id 2018-02-24 15:21:18 +01:00
Mordred
c6c2210471 Added onEnterTerritory for IC, also changed the way IC is called 2018-02-24 15:19:32 +01:00
Mordred
1a1349b33c Use make shared in instance scripts for eobjs 2018-02-24 09:40:44 +01:00
Mordred
7bf58b315a EObjects are now given a name and can be retrieved using it 2018-02-24 00:07:07 +01:00
Mordred
0a177c3470 EventObjects are not properly spawned and initialized 2018-02-23 23:47:21 +01:00
Mordred
20f87d7236 Warrior of light in init ui 2018-02-22 23:13:31 +01:00
Mordred
d05f523eb9 More transitional work towards actors as base 2018-02-22 22:15:32 +01:00
Mordred
8b5d30802d More stuff moved over to actor baseclass 2018-02-22 18:12:36 +01:00
Mordred
9fd3d59488 Added type checks for possibly object kinds 2018-02-22 17:06:30 +01:00
Mordred
dc1a7e4ae1 Actors are now used as base for any entity 2018-02-22 15:31:10 +01:00