1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-26 14:37:44 +00:00
Commit graph

1115 commits

Author SHA1 Message Date
Adam
23d958e768 Merge branch 'develop' into instancescripting 2018-02-09 23:50:26 +11: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
ca42ed228d builds should work now... probably 2018-02-09 20:25:18 +11:00
Adam
9d8f3648a0 fix script builds and logging issues on WSL 2018-02-09 20:11:30 +11:00
Mordred Admin
3ef490693b Missing virtual destructor implementation 2018-02-09 08:32:28 +01:00
Mordred
e1dafd3d5e New base class for anything actor related, not being used yet 2018-02-09 00:55:44 +01:00
Adam
d3bdd8856a instance scripting stuff 2018-02-09 02:34:43 +11:00
Mordred
6cc95cc73e
Merge pull request #247 from GokuWeedLord/develop
hierachyId dump + scripts structure cleanup
2018-02-08 15:30:28 +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
abf1194a7a
comment added 2018-02-08 15:29:46 +01:00
goaaats
cb787b44f5 Handle via inRangeSet 2018-02-08 15:25:59 +01:00
goaaats
9790594016 Implement correct handling for private areas 2018-02-08 15:05:29 +01:00
Adam
1e7c2adefb fix instance expire time 2018-02-09 00:04:46 +11:00
Adam
7205e9f82c Merge remote-tracking branch 'upstream/develop' into develop 2018-02-08 23:58:30 +11:00
Adam
bf404f7371 restructure script folder hierachy to remove unnecessary build targets 2018-02-08 23:28:52 +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
dae8d74fc3
Merge pull request #246 from GokuWeedLord/develop
fix windows paths with pcb reader
2018-02-08 11:40:51 +01:00
Adam
10f6e43148 fix pcb_reader ignoring windows paths in arguments 2018-02-08 20:29:39 +11:00
Adam
c4991c8c52 persist effect packet opcode 2018-02-08 19:41:27 +11:00
Mordred
145a421f62
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
bb97e1160b added instancecontent.csv dump to pcb_reader 2018-02-07 22:13:20 +00:00
Mordred
4dc5d107a8
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
7528db3b83 remove exddata from sapphire_zone 2018-02-07 14:27:52 +11:00
Adam
b74083c06c update generated exd data 2018-02-07 13:33:02 +11:00
Mordred
4e1c82c2be More preparational director logic, state inside can be modified with !instance <instanceId> <varIdx> <value> 2018-02-07 00:00:48 +01:00
Mordred
c5692bbe05 Style fix 2018-02-06 00:03:08 +01:00
Mordred
78606873ae Basic director handling for instances, just the bare minimum so far 2018-02-06 00:01:23 +01:00
Mordred
7a4e72969a
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
9b1940d0a5 Call onEnter event after zone init packet have been sent 2018-02-04 23:58:45 +01:00
Tahir Akhlaq
38448f6ddd fixed eobj export, added option to dump all instanced zones 2018-02-04 22:54:05 +00:00
Mordred
7a75b40ce6 Added events to zone for inheritance handling 2018-02-04 23:35:16 +01:00
Tahir Akhlaq
01ba6ad858 added option to dump all level.exd entries for all instances in pcb_reader 2018-02-04 20:09:55 +00:00
Mordred
21a39a09eb Disabled betweenarea state flags until we fix it 2018-02-04 18:53:19 +01:00
Mordred
48c4f681f1 Added Director relevant types to actor control enum 2018-02-04 18:04:30 +01:00
Mordred
b11cdecbf0 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop 2018-02-04 17:46:59 +01:00
Mordred
c36dec91d5 Reconnecting during an instance now possible 2018-02-04 17:46:46 +01:00
Mordred
7d594dbacc
Merge pull request #242 from GokuWeedLord/develop
cf spawns instances and zones you into them
2018-02-04 16:09:38 +01:00
Adam
46ce423466 cf spawns instances and zones you into them 2018-02-05 01:55:10 +11:00
Mordred
ed30225c19 Npc spawn packet fixed 2018-02-04 15:39:38 +01:00
Mordred
f017389ad1 Marked GCaffiliation as outdated for the time being 2018-02-04 14:16:09 +01:00
Mordred
dde6c4cf3b
Merge pull request #241 from GokuWeedLord/master
more mapped packets
2018-02-04 11:01:59 +01:00
Adam
c22e970ff8 fix mistake 2018-02-04 17:21:35 +11:00
Adam
42dac4f104 Merge remote-tracking branch 'upstream/master' 2018-02-04 16:40:47 +11:00
Adam
07838abe6a more mapped packets 2018-02-04 16:40:29 +11:00
Mordred
9dfca22e10 Adjusted wrong casttime for eventactions, needs fixing in ex.json 2018-02-04 02:26:02 +01:00
Mordred
6f461ab1bc Fixed state flags 2018-02-04 00:43:36 +01:00
Mordred
2421690a13
Merge pull request #240 from GokuWeedLord/master
fix exd_struct_gen and teleporting
2018-02-03 16:31:00 +01:00
Adam
d196795545 fix exd_struct_gen and teleporting 2018-02-04 01:39:05 +11:00
Mordred
b1761dcb57
Merge pull request #239 from GokuWeedLord/master
opcode update, cleanup and maybe disconnect issue fixed?
2018-02-03 10:07:18 +01:00
Adam
8ba99e2211 opcode update, cleanup and maybe disconnect issue fixed?
it works on my machine™️
2018-02-03 19:42:42 +11:00