resources: upstream

This commit is contained in:
TheRealNull
2021-01-10 11:08:44 -05:00
parent 8169d144d6
commit 9cc854c051
9 changed files with 55 additions and 2105 deletions

View File

@@ -1,57 +0,0 @@
{
"199": {
"cleaned": 249,
"level": 3
},
"201": {
"cleaned": 251,
"level": 5
},
"203": {
"cleaned": 253,
"level": 11
},
"205": {
"cleaned": 255,
"level": 20
},
"207": {
"cleaned": 257,
"level": 25
},
"3049": {
"cleaned": 2998,
"level": 30
},
"209": {
"cleaned": 259,
"level": 40
},
"211": {
"cleaned": 261,
"level": 48
},
"213": {
"cleaned": 263,
"level": 54
},
"3051": {
"cleaned": 3000,
"level": 59
},
"215": {
"cleaned": 265,
"level": 65
},
"2485": {
"level": 67
},
"217": {
"cleaned": 267,
"level": 70
},
"219": {
"cleaned": 269,
"level": 75
}
}

View File

@@ -1623,7 +1623,7 @@
11046,
20587
],
"flier": [
"flyer": [
956,
23670
],
@@ -4838,6 +4838,10 @@
23595,
25264
],
"dragon axe": [
6739,
25378
],
"darklight": [
6746,
8281
@@ -5878,6 +5882,14 @@
8315,
8508
],
"rug": [
8317,
25362
],
"opulent rug": [
8318,
25363
],
"wooden bookcase": [
8319,
24902
@@ -7470,7 +7482,8 @@
"dragon pickaxe": [
11920,
12797,
23677
23677,
25376
],
"malediction ward": [
11924,
@@ -7936,11 +7949,15 @@
],
"infernal axe": [
13241,
13242
13242,
25066,
25371
],
"infernal pickaxe": [
13243,
13244
13244,
25063,
25369
],
"abyssal dagger": [
13265,
@@ -8530,9 +8547,15 @@
21009,
21206
],
"dragon harpoon": [
21028,
25373
],
"infernal harpoon": [
21031,
21033
21033,
25059,
25367
],
"medium storage unit": [
21038,
@@ -9510,7 +9533,7 @@
25016,
25028
],
"trailblazer coat": [
"trailblazer top": [
25004,
25019,
25031
@@ -9525,17 +9548,13 @@
25025,
25037
],
"trailblazer harpoon": [
25059,
25114
"trailblazer globe": [
25093,
25361
],
"trailblazer pickaxe": [
25063,
25112
],
"trailblazer axe": [
25066,
25110
"trailblazer rug": [
25096,
25364
],
"extradimensional bag": [
25106,
@@ -9599,5 +9618,22 @@
25241,
25242,
25243
],
"gnome child icon": [
25319,
25338
],
"gnome child": [
25320,
25321
],
"soul cape": [
25344,
25346
],
"trailblazer relic hunter armour set": [
25380,
25383,
25386
]
}

File diff suppressed because one or more lines are too long

View File

@@ -30,6 +30,7 @@ uniform float brightness;
uniform float smoothBanding;
uniform vec4 fogColor;
uniform int colorBlindMode;
uniform float textureLightMode;
in vec4 Color;
noperspective centroid in float fHsl;
@@ -55,7 +56,8 @@ void main() {
// textured triangles hsl is a 7 bit lightness 2-126
float light = fHsl / 127.f;
c = textureColorBrightness * vec4(light, light, light, 1.f);
vec3 mul = (1.f - textureLightMode) * vec3(light) + textureLightMode * Color.rgb;
c = textureColorBrightness * vec4(mul, 1.f);
} else {
// pick interpolated hsl or rgb depending on smooth banding setting
vec3 rgb = hslToRgb(int(fHsl)) * smoothBanding + Color.rgb * (1.f - smoothBanding);

File diff suppressed because one or more lines are too long

View File

@@ -1,3 +0,0 @@
dsn=https://fa31d674e44247fa93966c69a903770f@sentry.io/1811856
release=@open.osrs.version@
stacktrace.app.packages=net.runelite,com.openosrs

Binary file not shown.

After

Width:  |  Height:  |  Size: 430 B

File diff suppressed because it is too large Load Diff

View File

@@ -1,56 +0,0 @@
<!--
Default stack using IP multicasting. It is similar to the "udp"
stack in stacks.xml, but doesn't use streaming state transfer and flushing
author: Bela Ban
-->
<config xmlns="urn:org:jgroups"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/jgroups.xsd"
version="5.0.0">
<UDP
bind_addr="127.0.0.1"
mcast_port="${jgroups.udp.mcast_port:45588}"
ip_ttl="4"
tos="8"
ucast_recv_buf_size="5M"
ucast_send_buf_size="5M"
mcast_recv_buf_size="5M"
mcast_send_buf_size="5M"
max_bundle_size="64K"
enable_diagnostics="true"
thread_naming_pattern="cl"
thread_pool.min_threads="0"
thread_pool.max_threads="20"
thread_pool.keep_alive_time="30000"/>
<PING/>
<MERGE3 max_interval="30000"
min_interval="10000"/>
<FD_SOCK/>
<FD_ALL/>
<VERIFY_SUSPECT timeout="1500"/>
<BARRIER/>
<pbcast.NAKACK2 xmit_interval="500"
xmit_table_num_rows="100"
xmit_table_msgs_per_row="2000"
xmit_table_max_compaction_time="30000"
use_mcast_xmit="false"
discard_delivered_msgs="true"/>
<UNICAST3 xmit_interval="500"
xmit_table_num_rows="100"
xmit_table_msgs_per_row="2000"
xmit_table_max_compaction_time="60000"
conn_expiry_timeout="0"/>
<pbcast.STABLE desired_avg_gossip="50000"
max_bytes="4M"/>
<pbcast.GMS print_local_addr="false" join_timeout="2000"/>
<UFC max_credits="2M"
min_threshold="0.4"/>
<MFC max_credits="2M"
min_threshold="0.4"/>
<FRAG2 frag_size="60K"/>
<RSVP resend_interval="2000" timeout="10000"/>
<pbcast.STATE_TRANSFER/>
</config>