Imbris
b05515e5bf
Merge branch 'juliancoffee/explode_vines' into 'master'
...
Make Fireballs explode EnsnaringVines
See merge request veloren/veloren!2758
2021-08-14 19:09:05 +00:00
Imbris
81cfab39cb
Merge branch 'master' into 'master'
...
Add WGPU adapter selection using WGPU_ADAPTER
See merge request veloren/veloren!2747
2021-08-14 18:09:51 +00:00
Joshua Barretto
11d08be485
Merge branch 'zesterer/better-aggro' into 'master'
...
Improved aggro system to reduce hyper-focused enemies
See merge request veloren/veloren!2767
2021-08-14 13:29:25 +00:00
Joshua Barretto
7171f74855
Merge branch 'DanTheOne/missing-volume-numbers' into 'master'
...
Add music and sfx volume numbers and a little refactoring
See merge request veloren/veloren!2768
2021-08-14 13:04:32 +00:00
DanTheOne
d1faf548de
Refactor sound settings window
2021-08-14 14:24:06 +02:00
DanTheOne
988a1ff6ed
Add music and sfx volume numbers
2021-08-14 12:25:21 +02:00
Joshua Barretto
6ad4791b11
Improved aggro system to reduce hyper-focused enemies
2021-08-14 11:09:33 +01:00
juliancoffee
565e337f76
Make is_mid_air use on_surface().is_none()
2021-08-13 23:16:38 +03:00
Daniil Nemtsev
59f92f9642
Add WGPU adapter selection using WGPU_ADAPTER
2021-08-13 12:39:44 +00:00
Joshua Barretto
5f310163ef
Merge branch 'min-persistent-world' into 'master'
...
min-persistent-world
See merge request veloren/veloren!2662
2021-08-13 12:30:28 +00:00
Marcel
f3afdc681a
Merge branch 'update_pt_BR_20210810' into 'master'
...
update pt_br translation 2021_08_10
See merge request veloren/veloren!2753
2021-08-13 07:17:01 +00:00
Nícolas Wildner
cc1e7f3804
update pt_br translation 2021_08_10
2021-08-13 07:17:01 +00:00
Marcel
b0dc7cb94c
Merge branch 'trade-window-fix' into 'master'
...
Small fix for trade window headers
See merge request veloren/veloren!2766
2021-08-12 22:50:36 +00:00
Xeriab Nabil
5de71b1982
Small fix for trade window headers
2021-08-12 21:56:38 +03:00
juliancoffee
86bf03be1c
Add comment about fragility of solution
2021-08-12 15:28:58 +03:00
Marcel
059d99b480
Merge branch 'tygyh/Move-assignment-out-of-if-statement' into 'master'
...
Move assignment out of if-statement
See merge request veloren/veloren!2764
2021-08-12 11:14:57 +00:00
Dr. Dystopia
74c34598c7
Move assignment out of if-statement
2021-08-12 12:34:04 +02:00
Joshua Barretto
432bfa91d9
Added feature flag for terrain persistence
2021-08-12 10:48:00 +01:00
Joshua Barretto
da58c3d143
Added experimental terrain persistence
2021-08-12 10:26:20 +01:00
Marcel
99d94202ea
Merge branch 'fix-1278' into 'master'
...
Fixes the issue mentioned in #1278
See merge request veloren/veloren!2760
2021-08-12 07:24:16 +00:00
Xeriab Nabil
53d1708448
Fixes the issue mentioned in #1278
2021-08-12 03:23:31 +03:00
juliancoffee
42debc32d3
Make Fireballs explode EnsnaringVines
2021-08-12 01:25:55 +03:00
AlxlY
a5cc713be0
alxly/update-ru_RU: updated transation after review.
2021-08-12 00:16:45 +02:00
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
