juliancoffee
|
d4bf4bf51b
|
Remove high tier ignots and big potions from trade
|
2021-06-18 00:03:51 +03:00 |
|
juliancoffee
|
54b339862a
|
tweak item_price_calculation coefficients
|
2021-06-17 23:49:43 +03:00 |
|
juliancoffee
|
f8008afa85
|
trading.ron rebalance
- Name all section in trading.ron
- Balance post-meat materials
- Make gems more rarer and expensive
|
2021-06-17 23:46:52 +03:00 |
|
Imbris
|
f132c3fcb4
|
Merge branch 'DaforLynx/initial-hurt-sfx' into 'master'
Added npc hurt sfx
See merge request veloren/veloren!2467
|
2021-06-17 05:49:09 +00:00 |
|
DaforLynx
|
9a5b95bc16
|
Added npc hurt sfx
|
2021-06-17 05:49:09 +00:00 |
|
Justin Shipsey
|
befa91fdf9
|
Merge branch 'slipped/stretchcontent' into 'master'
buffs to stretch progression
See merge request veloren/veloren!2447
|
2021-06-17 04:05:09 +00:00 |
|
jshipsey
|
a42e6e20b8
|
basilisk tweaks
|
2021-06-16 23:28:25 -04:00 |
|
jshipsey
|
0941f03608
|
buffs to stretch progression
|
2021-06-16 20:50:46 -04:00 |
|
Forest Anderson
|
6097bf0b1d
|
Merge branch 'capucho/gpu-poll' into 'master'
cleanup gpu resources on maintain
See merge request veloren/veloren!2466
|
2021-06-16 20:30:30 +00:00 |
|
João Capucho
|
9454c34cc2
|
Submit queue when maintaining and minimized
|
2021-06-16 20:22:33 +01:00 |
|
Joshua Barretto
|
c63cf5f734
|
Merge branch 'zesterer/grunts' into 'master'
Utterances and sound optimisation
See merge request veloren/veloren!2458
|
2021-06-16 17:10:54 +00:00 |
|
Joshua Barretto
|
b8749dc219
|
Added more cow noises, prepare for merge
|
2021-06-16 17:23:54 +01:00 |
|
Joshua Barretto
|
9510869870
|
Significantly more efficient sound effect processing, more NPC sounds
|
2021-06-16 17:23:22 +01:00 |
|
Joshua Barretto
|
e3c44ba7fe
|
More voice kinds, more opportunities for sounds
|
2021-06-16 17:23:22 +01:00 |
|
Joshua Barretto
|
fb51fd3230
|
Emit sound from head
|
2021-06-16 17:23:22 +01:00 |
|
Joshua Barretto
|
0ef29a6989
|
VoiceKind for better sound effect specs
|
2021-06-16 17:23:22 +01:00 |
|
Joshua Barretto
|
559311e1b0
|
Chasing sounds
|
2021-06-16 17:23:22 +01:00 |
|
João Capucho
|
cb55676bb9
|
poll device to cleanup resources
|
2021-06-16 14:07:23 +01:00 |
|
Imbris
|
a9229e3625
|
Merge branch 'imbris/small-fixes' into 'master'
Small fixes
See merge request veloren/veloren!2461
|
2021-06-16 08:18:45 +00:00 |
|
Marcel
|
0729e487c0
|
Merge branch 'imbris/current-monitor-fix' into 'master'
Eliminate panics when .current_monitor() returns None
Closes #1199 and #811
See merge request veloren/veloren!2463
|
2021-06-16 07:34:52 +00:00 |
|
Imbris
|
1483c2be74
|
Reset the slot 1 bind group to shadows when dropping the DebugDrawer
|
2021-06-16 03:24:10 -04:00 |
|
Imbris
|
2d7b82c2f4
|
Do some checks to make sure WGPU_TRACE_DIR is useable if set and exit early if it isn't to avoid the user not being aware that they are failing to collect a trace
|
2021-06-16 03:24:10 -04:00 |
|
Imbris
|
19f741b33f
|
Show the graphics backend in the hud debug info and include the adapter info when panicking in the wgpu error handler
|
2021-06-16 03:24:10 -04:00 |
|
Imbris
|
09a914aa84
|
Log format used for the swapchain
|
2021-06-16 03:24:10 -04:00 |
|
Imbris
|
8f429d532a
|
Add note on the reasoning for the visual position interpolation rate value in voxygen
|
2021-06-16 03:24:10 -04:00 |
|
Justin Shipsey
|
dd6b5ffa38
|
Merge branch 'karmicknight/swordspin_poise_damage' into 'master'
lowered spin.ron base poise damage to 13 from 25
See merge request veloren/veloren!2462
|
2021-06-16 06:17:30 +00:00 |
|
Imbris
|
345add91db
|
Eliminate panics when .current_monitor() returns None
|
2021-06-16 01:36:59 -04:00 |
|
donovanlank
|
f26de7bbe9
|
lowered spin.ron base poise damage to 13 from 25
|
2021-06-15 22:26:45 -07:00 |
|
Imbris
|
02c974da52
|
Merge branch 'imbris/winit-0.25' into 'master'
Upgrade to winit 0.25
See merge request veloren/veloren!2449
|
2021-06-16 05:21:13 +00:00 |
|
Imbris
|
b7162ac15c
|
Upgrade to winit 0.25
|
2021-06-15 22:59:54 -04:00 |
|
Imbris
|
9d9c0a045d
|
Merge branch 'imbris/release-tweak' into 'master'
Add debug line tables and avoid building unwinding landing pads in release builds
See merge request veloren/veloren!2446
|
2021-06-16 02:17:49 +00:00 |
|
Imbris
|
3e79972061
|
Merge branch 'capucho/wgpu-format-fixes' into 'master'
Update wgpu and check for best swap chain format
See merge request veloren/veloren!2454
|
2021-06-16 01:24:05 +00:00 |
|
Imbris
|
e5f23eb41a
|
Add debug line tables and avoid building unwinding landing pads in release builds
|
2021-06-15 21:14:49 -04:00 |
|
Joshua Barretto
|
9ed788bb50
|
Merge branch 'revert-1a2f1127' into 'master'
Revert "Merge branch 'snowram/snappier-pos-interp' into 'master'"
See merge request veloren/veloren!2459
|
2021-06-15 22:51:32 +00:00 |
|
Snowram
|
b82dde2332
|
Revert "Merge branch 'snowram/snappier-pos-interp' into 'master'"
This reverts merge request !2457
|
2021-06-15 22:12:11 +00:00 |
|
Marcel
|
1a2f112729
|
Merge branch 'snowram/snappier-pos-interp' into 'master'
Double the speed factor of pos interp
See merge request veloren/veloren!2457
|
2021-06-15 20:52:22 +00:00 |
|
Snowram
|
4d3362586f
|
Double the speed factor of pos interp
|
2021-06-15 22:11:57 +02:00 |
|
Imbris
|
1ed6a04a34
|
Merge branch 'zakru/fix/1193' into 'master'
Avoid saving settings if maps are not updating
Closes #1193
See merge request veloren/veloren!2456
|
2021-06-15 19:55:14 +00:00 |
|
Imbris
|
343b35b9cd
|
Merge branch 'rodio014' into 'master'
bump rodio to 0.14
See merge request veloren/veloren!2443
|
2021-06-15 19:04:28 +00:00 |
|
Zakru
|
afc04ae22f
|
Fix settings not saving when zooming map with keys
|
2021-06-15 21:20:10 +03:00 |
|
Zakru
|
52c965fb6d
|
Avoid saving settings if maps are not updating
Fixes #1193
|
2021-06-15 21:19:52 +03:00 |
|
Marcel
|
ee26df5915
|
Merge branch 'snowram/fix-consumables-desc' into 'master'
Truncates consumables value to the first decimal place
See merge request veloren/veloren!2455
|
2021-06-15 18:13:27 +00:00 |
|
Snowram
|
84080607cd
|
Truncates consumables value to the first decimal place
|
2021-06-15 19:36:20 +02:00 |
|
Marcel
|
ad92d4deb0
|
Merge branch 'juliancoffee/i18n_tests' into 'master'
Panic in tests if can't parse i18n file
See merge request veloren/veloren!2453
|
2021-06-15 17:26:16 +00:00 |
|
Marcel
|
f1f3a625a4
|
Merge branch 'veloren/veloren/master' into 'master'
Veloren/veloren/master
See merge request veloren/veloren!2452
|
2021-06-15 16:36:41 +00:00 |
|
K. Kisa
|
fbb34b7331
|
Veloren/veloren/master
|
2021-06-15 16:36:41 +00:00 |
|
juliancoffee
|
3f176ca068
|
Panic if can't parse file
|
2021-06-15 19:15:17 +03:00 |
|
Snowram
|
8fde002189
|
Merge branch 'snowram/more-trolls' into 'master'
Add more trolls npcs, and roc npc with tornado attack
See merge request veloren/veloren!2384
|
2021-06-15 08:35:30 +00:00 |
|
Imbris
|
a41c7a9a5b
|
Merge branch 'imbris/resize-tweaks' into 'master'
Resize related tweaks
See merge request veloren/veloren!2448
|
2021-06-15 07:53:12 +00:00 |
|
Snowram
|
8351aab25d
|
Addresses comments about roc AI
|
2021-06-15 09:50:23 +02:00 |
|