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

6588 commits

This branch
This branch
All branches
Author SHA1 Message Date
Adam
d51c5924c5 rename objectcontrol -> objectspawn 2018-02-10 21:51:02 +11:00
Adam
3d1555209e rename objectcontrol -> objectspawn 2018-02-10 21:51:02 +11:00
Adam
5d5c1cad30 [huge brain image] 2018-02-10 17:56:03 +11:00
Adam
69a0af66e5 [huge brain image] 2018-02-10 17:56:03 +11:00
Adam
4022b28eb2 fix indentation 2018-02-10 15:45:06 +11:00
Adam
cc3ceeebd5 fix indentation 2018-02-10 15:45:06 +11:00
Adam
bc5004598d Merge remote-tracking branch 'upstream/develop' into instancescripting 2018-02-10 14:05:12 +11:00
Adam
727207ec08 Merge remote-tracking branch 'upstream/develop' into instancescripting 2018-02-10 14:05:12 +11:00
Adam
32f0e30e8e instane obj spawning 2018-02-10 14:03:59 +11:00
Adam
2f6bc9e1eb instane obj spawning 2018-02-10 14:03:59 +11:00
Mordred
2000d5d2f8 Majorly refactored usage of shared_ptr also added GameObject into Actor inheritance chain 2018-02-10 01:21:31 +01:00
Mordred
1f415a0d05 Majorly refactored usage of shared_ptr also added GameObject into Actor inheritance chain 2018-02-10 01:21:31 +01:00
Mordred
f2a407c5e4 Merge pull request #250 from GokuWeedLord/instancescripting 
instance scripting + object creation
 2018-02-09 17:40:31 +01:00
Mordred
ac8e0eb7e4
Merge pull request #250 from GokuWeedLord/instancescripting 
instance scripting + object creation
 2018-02-09 17:40:31 +01:00
Adam
0c54d41304 instance objects, gameobj implementation 2018-02-10 02:47:32 +11:00
Adam
01e22b679d instance objects, gameobj implementation 2018-02-10 02:47:32 +11:00
Adam
5b08bca9d8 Merge branch 'develop' into instancescripting 2018-02-09 23:50:26 +11:00
Adam
23d958e768 Merge branch 'develop' into instancescripting 2018-02-09 23:50:26 +11:00
Mordred
f209f97492 Merge pull request #249 from GokuWeedLord/feature/wsl 
fix script builds and logging issues on WSL
 2018-02-09 12:31:18 +01:00
Mordred
8573bfa7db
Merge pull request #249 from GokuWeedLord/feature/wsl 
fix script builds and logging issues on WSL
 2018-02-09 12:31:18 +01:00
Adam
42e0a7c09a builds should work now... probably 2018-02-09 20:25:18 +11:00
Adam
ca42ed228d builds should work now... probably 2018-02-09 20:25:18 +11:00
Adam
99eb4c7d17 fix script builds and logging issues on WSL 2018-02-09 20:11:30 +11:00
Adam
9d8f3648a0 fix script builds and logging issues on WSL 2018-02-09 20:11:30 +11:00
Mordred Admin
6594dd1dc4 Missing virtual destructor implementation 2018-02-09 08:32:28 +01:00
Mordred Admin
3ef490693b Missing virtual destructor implementation 2018-02-09 08:32:28 +01:00
Mordred
e7b8c2cb22 New base class for anything actor related, not being used yet 2018-02-09 00:55:44 +01:00
Mordred
e1dafd3d5e New base class for anything actor related, not being used yet 2018-02-09 00:55:44 +01:00
Adam
61dfd16d7b instance scripting stuff 2018-02-09 02:34:43 +11:00
Adam
d3bdd8856a instance scripting stuff 2018-02-09 02:34:43 +11:00
Mordred
1f40bcf91b Merge pull request #247 from GokuWeedLord/develop 
hierachyId dump + scripts structure cleanup
 2018-02-08 15:30:28 +01:00
Mordred
6cc95cc73e
Merge pull request #247 from GokuWeedLord/develop 
hierachyId dump + scripts structure cleanup
 2018-02-08 15:30:28 +01:00
Mordred
e635f0b184 Merge pull request #248 from goaaats/develop 
Implement correct handling for private areas
 2018-02-08 15:30:18 +01:00
Mordred
e115b0bc16
Merge pull request #248 from goaaats/develop 
Implement correct handling for private areas
 2018-02-08 15:30:18 +01:00
Mordred
76dcba3f7f comment added 2018-02-08 15:29:46 +01:00
Mordred
abf1194a7a
comment added 2018-02-08 15:29:46 +01:00
goaaats
38661033fa Handle via inRangeSet 2018-02-08 15:25:59 +01:00
goaaats
cb787b44f5 Handle via inRangeSet 2018-02-08 15:25:59 +01:00
goaaats
2383fb4321 Implement correct handling for private areas 2018-02-08 15:05:29 +01:00
goaaats
9790594016 Implement correct handling for private areas 2018-02-08 15:05:29 +01:00
Adam
bb5c97ed2f fix instance expire time 2018-02-09 00:04:46 +11:00
Adam
1e7c2adefb fix instance expire time 2018-02-09 00:04:46 +11:00
Adam
4ccc2cfc26 Merge remote-tracking branch 'upstream/develop' into develop 2018-02-08 23:58:30 +11:00
Adam
7205e9f82c Merge remote-tracking branch 'upstream/develop' into develop 2018-02-08 23:58:30 +11:00
Adam
6f84e9ef41 restructure script folder hierachy to remove unnecessary build targets 2018-02-08 23:28:52 +11:00
Adam
bf404f7371 restructure script folder hierachy to remove unnecessary build targets 2018-02-08 23:28:52 +11:00
Adam
06bf24a606 pcb_reader dumps hierachyId now 
spawning objects has never been more fun!
 2018-02-08 23:28:30 +11:00
Adam
89f995376e pcb_reader dumps hierachyId now 
spawning objects has never been more fun!
 2018-02-08 23:28:30 +11:00
Mordred
cf6d997405 Merge pull request #246 from GokuWeedLord/develop 
fix windows paths with pcb reader
 2018-02-08 11:40:51 +01:00
Mordred
dae8d74fc3
Merge pull request #246 from GokuWeedLord/develop 
fix windows paths with pcb reader
 2018-02-08 11:40:51 +01:00