Commit Graph

9792 Commits

Author SHA1 Message Date
7158ae1936 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
dc4574aa49 update pt_br translation 2021_08_10 2021-08-13 07:17:01 +00:00
cddb827a27 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
05df63dd79 Small fix for trade window headers 2021-08-12 21:56:38 +03:00
a82f5ca057 Add comment about fragility of solution 2021-08-12 15:28:58 +03:00
b6300bb6f7 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
94bcf5b59b Move assignment out of if-statement 2021-08-12 12:34:04 +02:00
c2498d81c7 Added feature flag for terrain persistence 2021-08-12 10:48:00 +01:00
738e59965f Added experimental terrain persistence 2021-08-12 10:26:20 +01:00
0dfc0d39dd 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
8ce679766a Fixes the issue mentioned in #1278 2021-08-12 03:23:31 +03:00
86b9e2d8e6 Make Fireballs explode EnsnaringVines 2021-08-12 01:25:55 +03:00
bd26d2ad2a alxly/update-ru_RU: updated transation after review. 2021-08-12 00:16:45 +02:00
add74cd0ea 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
b8f37f474b alxly/update-ru_RU: fix translation based on @CodeReview comments. 2021-08-11 13:37:05 +02:00
0bedfde53e 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
bc821a46cd code cleanup 2021-08-11 09:42:29 +02:00
889a8d11f5 zest prefers this over await 2021-08-11 01:23:48 +02:00
631b4747d9 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
2a093a9991 Localization for sprite overitem (currenly only crafting stations) 2021-08-10 23:17:25 +00:00
d47620959b alxly/update-ru_RU: added proper translations after review. changed indentation to spaces 2021-08-11 00:48:48 +02:00
32e58c4b17 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
18a6ff3f31 alxl/update-ru_RU: add ru_RU missed translations 2021-08-10 23:36:02 +02:00
92684b31fa 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
6114cbbcf3 Fix skybox jumping 2021-08-10 14:01:09 +02:00
5c5f172667 Use old strategy for far distances 2021-08-10 14:00:59 +02:00
06b8ad62d3 Minor tweaks to clipping, style fixes 2021-08-10 14:00:51 +02:00
ad075b55c9 Allow trees to pass between character and camera for bigger distances 2021-08-10 14:00:42 +02:00
e834711293 Fix character being too close in menu 2021-08-10 14:00:34 +02:00
a7aa37f7f6 Fix camera shaking & Style fixes 2021-08-10 14:00:13 +02:00
42dab09249 Improve camera clipping 2021-08-10 13:59:41 +02:00
9b7fe0b7e6 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
3ac74a8259 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
d5feca45c5 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
2103abbb76 Fixed sfx file after consolidation. 2021-08-09 20:24:04 -04:00
9f15062849 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
cde1283e04 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
449902a50e Use asset::load_dir to get list of all items 2021-08-10 02:03:46 +03:00
f131adaba7 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
771df2f0f1 Don't chose room kinds with dynamic_rng 2021-08-09 18:19:35 +03:00
dddb47a385 Makes dungeons start at level 1 visually 2021-08-09 16:36:37 +02:00
2bc4f364bf 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
52ee598cf1 Consolidated Use into Action as well. 2021-08-09 10:31:17 -04:00
5f37509a78 #1224 - Replace redundant StageSection: Swing, Shoot, Cast with Action 2021-08-09 10:27:53 -04:00
172f19376a 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
4069a381c5 Make Frenzied buff again 2021-08-09 13:05:00 +03:00
58cfd690c3 Complete skill preset "max" with sceptre HDuration 2021-08-09 10:09:12 +01:00
a48fa0f349 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
2fc62bfe7f 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
ebf489984c 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