Marcel
d85fc21d3d
Merge branch 'xMAC94x/fix_1165' into 'master'
...
remove futures_executor from renderer and rather pass tokio runtime to it...
See merge request veloren/veloren!2755
2021-08-11 15:26:08 +00:00
AlxlY
b173c71840
alxly/update-ru_RU: fix translation based on @CodeReview comments.
2021-08-11 13:37:05 +02:00
Marcel
a049aa1e32
Merge branch 'trade-window-improvements' into 'master'
...
UI: Fixes and enhancements to the trading window
See merge request veloren/veloren!2738
2021-08-11 09:25:17 +00:00
Marcel Märtens
8b04770525
code cleanup
2021-08-11 09:42:29 +02:00
Marcel Märtens
a3fda18b63
zest prefers this over await
2021-08-11 01:23:48 +02:00
Marcel
67ebb0034f
Merge branch 'juliancoffee/i18n_sprites' into 'master'
...
Localization for sprite overitem (currenly only crafting stations)
See merge request veloren/veloren!2759
2021-08-10 23:17:25 +00:00
Illia Denysenko
008790fad7
Localization for sprite overitem (currenly only crafting stations)
2021-08-10 23:17:25 +00:00
AlxlY
54f6a71637
alxly/update-ru_RU: added proper translations after review. changed indentation to spaces
2021-08-11 00:48:48 +02:00
Marcel Märtens
9201b3da42
remove futures_executor from renderer and rather pass tokio runtime to it properly. therefore the runtime is now created with Voxygen rather than with the Connect attempt
2021-08-11 00:38:03 +02:00
AlxlY
743865d25e
alxl/update-ru_RU: add ru_RU missed translations
2021-08-10 23:36:02 +02:00
Marcel
71017ebfac
Merge branch 'kilpkonn/camera_clipping' into 'master'
...
Camera clipping
Closes #955
See merge request veloren/veloren!2730
2021-08-10 12:20:27 +00:00
Tavo Annus
ed9699b048
Fix skybox jumping
2021-08-10 14:01:09 +02:00
Tavo Annus
f37b9a2c76
Use old strategy for far distances
2021-08-10 14:00:59 +02:00
Tavo Annus
3d6f3eaa69
Minor tweaks to clipping, style fixes
2021-08-10 14:00:51 +02:00
Tavo Annus
d18055e650
Allow trees to pass between character and camera for bigger distances
2021-08-10 14:00:42 +02:00
Tavo Annus
27cdaed7ad
Fix character being too close in menu
2021-08-10 14:00:34 +02:00
Tavo Annus
5c788a2354
Fix camera shaking & Style fixes
2021-08-10 14:00:13 +02:00
Tavo Annus
b214e68237
Improve camera clipping
2021-08-10 13:59:41 +02:00
Marcel
786185c09c
Merge branch 'juliancoffee/kit_all' into 'master'
...
Implement `/kit all` and a bit of refactoring
See merge request veloren/veloren!2752
2021-08-10 11:26:31 +00:00
juliancoffee
a93c6931d4
Implement /kit all and a bit of refactoring
...
+ notifying about sucessful kit application
+ notifying about case with insufficient space
+ handle case where you don't have enough free slots
+ handle quantity of non-stackable items
+ add test for items in kit manifest
2021-08-10 13:28:38 +03:00
Samuel Keiffer
756249fd04
Merge branch 'pacmanmati/veloren-pacmanmati/1224-consolidate-redundant-stage-sections' into 'master'
...
Consolidate redundant stage sections
See merge request veloren/veloren!2748
2021-08-10 01:23:26 +00:00
Sam
4ecf8649c4
Fixed sfx file after consolidation.
2021-08-09 20:24:04 -04:00
Marcel
c121766f06
Merge branch 'juliancoffee/all_item_defs' into 'master'
...
Use asset::load_dir to get list of all items
See merge request veloren/veloren!2751
2021-08-09 23:42:43 +00:00
Marcel
6dd75af468
Merge branch 'juliancoffee/deterministic_dungeons' into 'master'
...
Don't chose room kinds with dynamic_rng
See merge request veloren/veloren!2750
2021-08-09 23:33:13 +00:00
juliancoffee
593393fbee
Use asset::load_dir to get list of all items
2021-08-10 02:03:46 +03:00
Samuel Keiffer
cce29cea74
Merge branch 'snowram/map-level-ux' into 'master'
...
Makes dungeons start at level 1 visually
See merge request veloren/veloren!2545
2021-08-09 15:56:27 +00:00
juliancoffee
ec80709ae5
Don't chose room kinds with dynamic_rng
2021-08-09 18:19:35 +03:00
Snowram
efbf538569
Makes dungeons start at level 1 visually
2021-08-09 16:36:37 +02:00
Samuel Keiffer
04947103e8
Merge branch 'lboklin/gliding-improvements' into 'master'
...
Minor improvements to gliding and glider-wielding
See merge request veloren/veloren!2734
2021-08-09 14:33:02 +00:00
Sam
571fe8aa0d
Consolidated Use into Action as well.
2021-08-09 10:31:17 -04:00
pacmanmati
495e604dfc
#1224 - Replace redundant StageSection: Swing, Shoot, Cast with Action
2021-08-09 10:27:53 -04:00
juliancoffee
fc0a66bae0
Tweak boss knockback abilities
...
Tweak Mindflayer vortex knockback (make it rarer)
Tweak Tidal Warrior pincer and wave knockback
Tweak claygolem rocket and shockwave knockback
Tweak Yeti shockwave and strike knockback
2021-08-09 13:05:01 +03:00
juliancoffee
8f138080a9
Make Frenzied buff again
2021-08-09 13:05:00 +03:00
juliancoffee
d054ff0162
Complete skill preset "max" with sceptre HDuration
2021-08-09 10:09:12 +01:00
Treeco
ad7b18f8f0
Buff swim thrust for humans reduce gains from skillpoints
...
This is intended to give a swim speed of 4.7 m/s when unskilled, and 7.2 when skilled
However, this turns out to be horrifically fps-dependant, both after this branch and in master. Needs further research into fixes
This commit tunes it for 60 fps
2021-08-09 10:06:16 +01:00
Treeco
a8559c61f2
Make each race's hitbox and weight scale linearly with their height
...
This causes all humanoids to handle identically when falling, gliding, or swimming
2021-08-09 10:06:16 +01:00
Ludvig Böklin
ae866ac7c6
Improve gliding
...
- make glider dimensions a factor of body height
- increase glider dimensions across the board
- remove delay from transition into glide
- enable glider control while wielding glider
- improve glide wield animation
2021-08-09 10:06:16 +01:00
Ludvig Böklin
c1df48168a
Fix mistake of pre-multiplying aerodynamic coefficients
...
Increase glider zero-lift drag
2021-08-09 10:06:15 +01:00
Xeriab Nabil
c1d7aec7f1
UI: Fixes and enhancements to trading window
2021-08-08 20:11:54 +03:00
Ben Wallis
83aea64061
Merge branch 'xvar/fixes' into 'master'
...
Fixed issue caused by Uid component being removed too soon on logout
See merge request veloren/veloren!2746
2021-08-08 14:29:14 +00:00
Ben Wallis
e3ce3f0f97
Fixed issue caused by Uid component being removed too soon on logout
2021-08-08 14:59:11 +01:00
Samuel Keiffer
e0e7d643a6
Merge branch 'ubruntu/relative-xp-curve' into 'master'
...
XP reward curve modified for faster gain at lower levels
See merge request veloren/veloren!2706
2021-08-08 03:34:57 +00:00
ubruntu
d324afe73a
XP reward curve modified for faster gain at lower levels
2021-08-08 03:34:56 +00:00
Samuel Keiffer
84addad24e
Merge branch 'juliancoffee/beam_agents' into 'master'
...
Expose beam_offsets to AI
See merge request veloren/veloren!2744
2021-08-08 03:34:53 +00:00
juliancoffee
174f0ba20d
Add FIXME about Staff flamethrower
2021-08-08 00:41:39 +03:00
juliancoffee
0ccfb8e004
Expose beam_offsets to AI
2021-08-08 00:33:43 +03:00
Samuel Keiffer
3b3bf10e4a
Merge branch 'juliancoffee/pillar_fix' into 'master'
...
Nerf pillars + Fix Beam ori
See merge request veloren/veloren!2732
2021-08-07 16:35:24 +00:00
Marcel
47295feeb1
Merge branch 'juliancoffee/gliding_debug' into 'master'
...
Gliding Debug Info
See merge request veloren/veloren!2743
2021-08-07 13:19:58 +00:00
Illia Denysenko
d304aaebe9
Gliding Debug Info
2021-08-07 13:19:58 +00:00
Ben Wallis
26d5648183
Merge branch 'juliancoffee/egui_setting' into 'master'
...
Egui toggle
See merge request veloren/veloren!2742
2021-08-06 21:13:17 +00:00
