|
|
eab062450a
|
clippy helped to get rid of one level of indirection
|
2022-07-13 23:27:17 +02:00 |
|
|
|
d2aa9028ec
|
clippy is right about this flat_map
|
2022-07-13 23:17:22 +02:00 |
|
|
|
197f84a360
|
returning a vec creates much more readable code
|
2022-07-13 23:03:58 +02:00 |
|
|
|
3bdeb77268
|
Full support for modular weapon in loot table read
|
2022-07-13 22:56:52 +02:00 |
|
|
|
a0749ac9bc
|
test passes, not happy with implementation yet
|
2022-07-13 20:15:28 +02:00 |
|
|
|
5bbb73bc17
|
changelog + remove dead code, but the test still fails
|
2022-07-13 20:15:28 +02:00 |
|
|
|
5ee72f8a5e
|
fix test; add tusk, crest, pincer
|
2022-07-13 20:15:28 +02:00 |
|
|
|
8c5901516e
|
clean up
|
2022-07-13 20:15:28 +02:00 |
|
|
|
7a1218cf2f
|
make a recipe of all modular weapons
|
2022-07-13 20:15:28 +02:00 |
|
|
|
3a7835c6d0
|
replace one Owned reference by the normal Reference type
|
2022-07-13 20:15:28 +02:00 |
|
|
|
cea2550dde
|
Add Item::new_from_item_definition_id.
|
2022-07-13 20:15:28 +02:00 |
|
|
|
7e5ebada2d
|
still incomplete but looks surprisingly usable
|
2022-07-13 20:15:28 +02:00 |
|
|
|
33a01a0dab
|
fix compilation of example
|
2022-07-13 20:15:28 +02:00 |
|
|
|
2b2ac20403
|
use ItemDefintionId across trade_pricing
|
2022-07-13 20:15:27 +02:00 |
|
|
|
27d2cdeb79
|
WIP modular weapon pricing.
|
2022-07-13 20:15:27 +02:00 |
|
|
|
80d491f003
|
Merge branch 'socksonme/small_fixes' into 'master'
Small fixes
See merge request veloren/veloren!3465
|
2022-07-12 21:01:47 +00:00 |
|
|
|
3f0f1c423c
|
Small fixes
|
2022-07-12 21:01:47 +00:00 |
|
|
|
a0a00c70db
|
Merge branch 'shaderc-rs-version-bump' into 'master'
Bump shaderc version to 0.8.0
Closes #1532, #1591, and #1596
See merge request veloren/veloren!3470
|
2022-07-11 10:30:15 +00:00 |
|
|
|
6233db8682
|
Bump shaderc version to 0.8.0
|
2022-07-10 21:46:30 +02:00 |
|
|
|
e6a187ff08
|
Merge branch 'xvar/fix-mimalloc-windows' into 'master'
Re-enabled mimalloc for non msvc builds
See merge request veloren/veloren!3468
|
2022-07-10 15:01:58 +00:00 |
|
|
|
af04843a20
|
Re-enabled mimalloc for non msvc builds
|
2022-07-10 14:50:35 +01:00 |
|
|
|
7bd4686187
|
Merge branch 'DaforLynx/ambience-loop-fix' into 'master'
Fixing ambience looping issues
See merge request veloren/veloren!3463
|
2022-07-08 08:03:02 +00:00 |
|
|
|
0d1bf3efe6
|
fmt
|
2022-07-07 16:10:51 -07:00 |
|
|
|
fc80a6278c
|
Fixing looping issues
|
2022-07-07 16:09:13 -07:00 |
|
|
|
61788c2809
|
Merge branch 'DaforLynx/adventurous_soul' into 'master'
"Adventurous Soul" plays in Snowland too
See merge request veloren/veloren!3462
|
2022-07-07 21:26:13 +00:00 |
|
|
|
bcaa026bff
|
"Adventurous Soul" plays in Snowland too
|
2022-07-07 21:26:12 +00:00 |
|
|
|
91348cb608
|
Merge branch 'DaforLynx/new-music-july-2022' into 'master'
Music, reorganization, metadata, and fixes
See merge request veloren/veloren!3456
|
2022-07-07 04:14:20 +00:00 |
|
|
|
00f1e9c407
|
Music, reorganization, metadata, and fixes
|
2022-07-07 04:14:20 +00:00 |
|
|
|
c0f06dcb8a
|
Merge branch 'socksonme/fix_crushing_damage_crit' into 'master'
Group up extra damage from crushing attacks whenever they're crits
See merge request veloren/veloren!3461
|
2022-07-06 21:38:41 +00:00 |
|
|
|
7ae65f2c13
|
Merge branch 'windows-gnu-linking-fix' into 'master'
Disable mimalloc for non msvc builds
See merge request veloren/veloren!3460
|
2022-07-06 20:21:25 +00:00 |
|
|
|
317000dc48
|
Merge branch 'xMAC94x/update_hashbrown' into 'master'
update hashbrown, specs
See merge request veloren/veloren!3459
|
2022-07-06 20:18:11 +00:00 |
|
|
|
e3b1d02fce
|
Group up extra damage from crushing attacks whenever they're crits
|
2022-07-06 22:59:58 +03:00 |
|
|
|
7e18384e1c
|
Disable mimalloc for non msvc builds
|
2022-07-06 19:08:19 +02:00 |
|
|
|
e4909650e1
|
update hashbrown, specs, and tracy
|
2022-07-06 15:41:59 +02:00 |
|
|
|
58679d9900
|
Merge branch 'angel/remove-codegen-unit-restriction-dev-compiles' into 'master'
Removed codegen unit restriction for dev builds
See merge request veloren/veloren!3455
|
2022-07-06 07:46:34 +00:00 |
|
|
|
5987fc83be
|
Merge branch 'portuguese' into 'master'
Portuguese translations parity to global
See merge request veloren/veloren!3458
|
2022-07-06 07:32:44 +00:00 |
|
|
|
fd34666d03
|
Portuguese translations parity to global
|
2022-07-06 07:32:43 +00:00 |
|
|
|
b79d1aae55
|
Merge branch 'isse/weather' into 'master'
Weather
See merge request veloren/veloren!3183
|
2022-07-04 19:30:43 +00:00 |
|
|
|
a0b7fefef6
|
Removed codegen unit restriction for dev builds
|
2022-07-04 14:18:18 -04:00 |
|
|
|
5a0cdc2528
|
add rain threshold that depends on chunk moisture
|
2022-07-04 18:18:43 +02:00 |
|
|
|
6d8cbe6f0f
|
remove relative rain direction and increase FALL_RATE
|
2022-07-04 18:18:43 +02:00 |
|
|
|
6562c7076f
|
remove fluid model todo
|
2022-07-04 18:18:42 +02:00 |
|
|
|
e4dfc7729f
|
Fix rain being visible indoors by making rpos properly line up with where the rain is being drawn and suppressing any leaks of rain occlusion map via flooring the sampled output
|
2022-07-04 18:18:41 +02:00 |
|
|
|
e7208c9537
|
make iterations const
|
2022-07-04 18:18:41 +02:00 |
|
|
|
a5a082cf41
|
Also use 4 iterations for medium clouds and adjust the factor multiplied by rain_dist each iteration based on the number of iterations so that the last iteration is always the same.
|
2022-07-04 18:18:40 +02:00 |
|
|
|
b2d3759105
|
Cleanup profiling comments and commented code
|
2022-07-04 18:18:39 +02:00 |
|
|
|
b29bad015c
|
Misc notes in cloud-frag.glsl
|
2022-07-04 18:18:39 +02:00 |
|
|
|
5866e23e32
|
Pre-compute view_mat_inv * proj_mat_inv on the CPU before sending to the cloud shader
|
2022-07-04 18:18:38 +02:00 |
|
|
|
e2969dc5f9
|
turn off rain for CLOUD_MODE_NONE and adjust iterations
|
2022-07-04 18:18:38 +02:00 |
|
|
|
80e29e2c20
|
put rain_density in uniform
|
2022-07-04 18:18:37 +02:00 |
|
