Commit Graph

13129 Commits

Author SHA1 Message Date
0ba7e5a06e Added 'hud-skill-set_as_exp_bar' in italian. 2022-11-30 15:34:27 +00:00
44bca9a1b0 Merge branch 'floppy_dagon_kit' into 'master'
dagon_kit

See merge request veloren/veloren!3696
2022-11-30 15:27:21 +00:00
flo
466ed2c382 dagon_kit 2022-11-30 15:27:21 +00:00
7191ee9325 Merge branch 'alejandrohernandezcarbonero83-master-patch-19384' into 'master'
Update char_selection.ftl

See merge request veloren/veloren!3711
2022-11-30 15:18:04 +00:00
ef2c1633ed Merge branch 'isse/bridges' into 'master'
Bridges

See merge request veloren/veloren!3680
2022-11-30 15:07:03 +00:00
a813b80850 Merge branch 'xMAC94x/clippy_cleanup' into 'master'
fix leftovers from toolchain update

See merge request veloren/veloren!3713
2022-11-30 14:31:28 +00:00
4a1404cd71 fix leftovers from toolchain update 2022-11-30 15:14:47 +01:00
02eadc3002 add doc comment 2022-11-30 15:13:52 +01:00
560d5c3153 fix doc test 2022-11-30 15:13:52 +01:00
c81fbf50c4 Fix cylinder primitive and better ramp function 2022-11-30 15:13:52 +01:00
dda54bcb01 small fixes 2022-11-30 15:13:52 +01:00
dd8c429cfc changelog entry 2022-11-30 15:13:52 +01:00
17cd863605 tuning 2022-11-30 15:13:52 +01:00
179c6dab8f better flat 2022-11-30 15:13:52 +01:00
6d2b39c254 simple hang bridge 2022-11-30 15:13:52 +01:00
df8db713ea lights 2022-11-30 15:13:52 +01:00
91ed3c6a84 draw on map 2022-11-30 15:13:52 +01:00
31b56b03b5 desert skin 2022-11-30 15:13:52 +01:00
78e227d317 short bridges 2022-11-30 15:13:52 +01:00
3bb66cf2ff add hipped roof 2022-11-30 15:13:52 +01:00
7296843923 simple bridges 2022-11-30 15:13:52 +01:00
8a6e79c249 Merge branch 'xMAC94x/update_toolchain' into 'master'
xmac94x/update toolchain

See merge request veloren/veloren!3709
2022-11-30 13:40:46 +00:00
b5cb66d053 Update char_selection.ftl 2022-11-29 21:56:21 +00:00
225cbf472f update tag and fix empty maps, other bugs introduced by auto fix 2022-11-29 09:19:10 +01:00
2812729b78 cargo clippy lifetimes 2022-11-28 15:19:57 +01:00
dad73ba2a3 fix clamp clippy errors 2022-11-28 14:26:27 +01:00
0ab7a2543e fix clippy errors 2022-11-28 14:08:11 +01:00
ba3747a3f0 update toolchain 2022-11-28 14:08:11 +01:00
97903f9092 Merge branch 'DaforLynx/music-11-2022' into 'master'
More music and artist links

See merge request veloren/veloren!3704
2022-11-25 18:48:56 +00:00
d338906b19 More music and artist links 2022-11-25 18:48:56 +00:00
874c5d3401 Merge branch 'pfau/exp_bar' into 'master'
Add Exp-Bar

See merge request veloren/veloren!3703
2022-11-22 11:52:39 +00:00
3abfa4d2cc Add Exp-Bar 2022-11-22 11:52:39 +00:00
1a92bd7fe1 Merge branch 'master' into 'master'
Italian transaltion

See merge request veloren/veloren!3687
2022-11-21 16:24:06 +00:00
d127bcc5d8 Italian transaltion 2022-11-21 16:24:06 +00:00
a75b1bc21c Merge branch 'mossdrake_and_wood_fix' into 'master'
reduce mossdrake, fix woodgolem loottable

See merge request veloren/veloren!3700
2022-11-21 14:22:16 +00:00
flo
e7b802712d reduce mossdrake, fix woodgolem loottable 2022-11-21 14:22:15 +00:00
2f990fb06e Merge branch 'holychowders/store_last_known_pos' into 'master'
Store Target's Last Known Position

See merge request veloren/veloren!3698
2022-11-20 22:38:14 +00:00
dc9074ae6b Revert "[REVERT ME] Display debug information for code reviewers."
This reverts commit bae5c5b675.
2022-11-20 15:51:09 -06:00
107cc8963f Merge branch 'Halosesparta13-master-patch-90913' into 'master'
Translation for the "ability.ftl" file to the es_LA folder

See merge request veloren/veloren!3613
2022-11-20 18:16:49 +00:00
cfcf197e32 Translation for the "ability.ftl" file to the es_LA folder 2022-11-20 18:16:48 +00:00
e5979c78f8 Merge branch 'kuba1001t/update-pl_PL' into 'master'
Update polish translations

See merge request veloren/veloren!3677
2022-11-20 18:13:01 +00:00
833ae2331a Merge branch 'tygyh/Swedish-translations' into 'master'
Update swedish translations

See merge request veloren/veloren!3682
2022-11-20 18:12:59 +00:00
0312639491 Merge branch 'tormod/site-placement-refactor' into 'master'
Get rid of redundant sources of truth on site locations.

See merge request veloren/veloren!3702
2022-11-20 13:23:44 +00:00
c61503f503 Update changelog for last known position. 2022-11-20 02:43:58 -06:00
23dd1d1be3 MVP for searching target's last known position. 2022-11-20 02:36:11 -06:00
44f118c437 Get rid of redundant sources of truth on site locations. 2022-11-20 00:57:05 +01:00
863dc4e017 Merge branch 'zesterer/fix-voxygen-tod' into 'master'
Fixed TimeOfDay interpolation

See merge request veloren/veloren!3701
2022-11-19 12:10:36 +00:00
5638934a0d Fixed TimeOfDay interpolation 2022-11-18 11:27:37 +00:00
1331b046b5 Rename mouthful variable. 2022-11-17 19:21:22 -06:00
2c745bed30 Update target's last known position.
Before, it was set only upon targeting.
2022-11-16 20:54:32 -06:00