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

1422 commits

This branch
This branch
All branches
Author SHA1 Message Date
Adam
5d5c1cad30 [huge brain image] 2018-02-10 17:56:03 +11:00
Adam
4022b28eb2 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
32f0e30e8e 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
f2a407c5e4 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
5b08bca9d8 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
Adam
42e0a7c09a 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
Mordred Admin
6594dd1dc4 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
Adam
61dfd16d7b 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
e635f0b184 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
goaaats
38661033fa 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
Adam
bb5c97ed2f 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
6f84e9ef41 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
Mordred
cf6d997405 Merge pull request #246 from GokuWeedLord/develop 
fix windows paths with pcb reader
 2018-02-08 11:40:51 +01:00
Adam
2347568293 fix pcb_reader ignoring windows paths in arguments 2018-02-08 20:29:39 +11:00
Adam
4f748d7d3b persist effect packet opcode 2018-02-08 19:41:27 +11:00
Mordred
aa9ca62e6b Merge pull request #245 from takhlaq/pcb_reader 
added instancecontent.csv dump to pcb_reader
 2018-02-08 07:53:25 +01:00
Tahir Akhlaq
6a32729540 added instancecontent.csv dump to pcb_reader 2018-02-07 22:13:20 +00:00
Mordred
5fdf126594 Merge pull request #244 from GokuWeedLord/develop 
update generated exd data & remove old exddata from zone
 2018-02-07 06:14:28 +01:00
Adam
f94a8ceee5 remove exddata from sapphire_zone 2018-02-07 14:27:52 +11:00
Adam
609a92fd49 update generated exd data 2018-02-07 13:33:02 +11:00
Mordred
0cb304083d More preparational director logic, state inside can be modified with !instance <instanceId> <varIdx> <value> 2018-02-07 00:00:48 +01:00
Mordred
59da08be28 Style fix 2018-02-06 00:03:08 +01:00
Mordred
0d75ba0096 Basic director handling for instances, just the bare minimum so far 2018-02-06 00:01:23 +01:00
Mordred
8cfbe7e230 Merge pull request #243 from takhlaq/pcb_reader 
added option to dump instance level.exd entries to pcb_reader
 2018-02-05 08:10:33 +01:00
Mordred
069127f901 Call onEnter event after zone init packet have been sent 2018-02-04 23:58:45 +01:00
Tahir Akhlaq
f09a5e0c27 fixed eobj export, added option to dump all instanced zones 2018-02-04 22:54:05 +00:00
Mordred
6ed0baf91f Added events to zone for inheritance handling 2018-02-04 23:35:16 +01:00
Tahir Akhlaq
1b1672a541 added option to dump all level.exd entries for all instances in pcb_reader 2018-02-04 20:09:55 +00:00
Mordred
af90b006ac Disabled betweenarea state flags until we fix it 2018-02-04 18:53:19 +01:00
Mordred
2a5a5e832f Added Director relevant types to actor control enum 2018-02-04 18:04:30 +01:00
Mordred
55525c4785 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-02-04 17:46:59 +01:00
Mordred
9cc5f9ffb3 Reconnecting during an instance now possible 2018-02-04 17:46:46 +01:00
Mordred
54d712932e Merge pull request #242 from GokuWeedLord/develop 
cf spawns instances and zones you into them
 2018-02-04 16:09:38 +01:00
Adam
7644938776 cf spawns instances and zones you into them 2018-02-05 01:55:10 +11:00
Mordred
eadc2e77b6 Npc spawn packet fixed 2018-02-04 15:39:38 +01:00
Mordred
677f2521d7 Marked GCaffiliation as outdated for the time being 2018-02-04 14:16:09 +01:00
Mordred
322d80ebf8 Merge pull request #241 from GokuWeedLord/master 
more mapped packets
 2018-02-04 11:01:59 +01:00
Adam
c750121b3b fix mistake 2018-02-04 17:21:35 +11:00
Adam
b506db2c32 Merge remote-tracking branch 'upstream/master' 2018-02-04 16:40:47 +11:00