Commit Graph

13019 Commits

Author SHA1 Message Date
Isse
dda54bcb01 small fixes 2022-11-30 15:13:52 +01:00
IsseW
dd8c429cfc changelog entry 2022-11-30 15:13:52 +01:00
IsseW
17cd863605 tuning 2022-11-30 15:13:52 +01:00
IsseW
179c6dab8f better flat 2022-11-30 15:13:52 +01:00
IsseW
6d2b39c254 simple hang bridge 2022-11-30 15:13:52 +01:00
IsseW
df8db713ea lights 2022-11-30 15:13:52 +01:00
IsseW
91ed3c6a84 draw on map 2022-11-30 15:13:52 +01:00
IsseW
31b56b03b5 desert skin 2022-11-30 15:13:52 +01:00
IsseW
78e227d317 short bridges 2022-11-30 15:13:52 +01:00
IsseW
3bb66cf2ff add hipped roof 2022-11-30 15:13:52 +01:00
IsseW
7296843923 simple bridges 2022-11-30 15:13:52 +01:00
Marcel
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
electro79
b5cb66d053 Update char_selection.ftl 2022-11-29 21:56:21 +00:00
Marcel Märtens
225cbf472f update tag and fix empty maps, other bugs introduced by auto fix 2022-11-29 09:19:10 +01:00
Marcel Märtens
2812729b78 cargo clippy lifetimes 2022-11-28 15:19:57 +01:00
Marcel Märtens
dad73ba2a3 fix clamp clippy errors 2022-11-28 14:26:27 +01:00
Marcel Märtens
0ab7a2543e fix clippy errors 2022-11-28 14:08:11 +01:00
Marcel Märtens
ba3747a3f0 update toolchain 2022-11-28 14:08:11 +01:00
Isse
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
DaforLynx
d338906b19 More music and artist links 2022-11-25 18:48:56 +00:00
Monty Marz
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
Monty Marz
3abfa4d2cc Add Exp-Bar 2022-11-22 11:52:39 +00:00
Marcel
1a92bd7fe1 Merge branch 'master' into 'master'
Italian transaltion

See merge request veloren/veloren!3687
2022-11-21 16:24:06 +00:00
Francesco Vasco
d127bcc5d8 Italian transaltion 2022-11-21 16:24:06 +00:00
Justin Shipsey
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
Marcel
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
holychowders
dc9074ae6b Revert "[REVERT ME] Display debug information for code reviewers."
This reverts commit bae5c5b675.
2022-11-20 15:51:09 -06:00
Marcel
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
Halosesparta
cfcf197e32 Translation for the "ability.ftl" file to the es_LA folder 2022-11-20 18:16:48 +00:00
Marcel
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
Marcel
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
Marcel
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
holychowders
c61503f503 Update changelog for last known position. 2022-11-20 02:43:58 -06:00
holychowders
23dd1d1be3 MVP for searching target's last known position. 2022-11-20 02:36:11 -06:00
Tormod G. Hellen
44f118c437
Get rid of redundant sources of truth on site locations. 2022-11-20 00:57:05 +01:00
Joshua Barretto
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
Joshua Barretto
5638934a0d Fixed TimeOfDay interpolation 2022-11-18 11:27:37 +00:00
holychowders
1331b046b5 Rename mouthful variable. 2022-11-17 19:21:22 -06:00
holychowders
2c745bed30 Update target's last known position.
Before, it was set only upon targeting.
2022-11-16 20:54:32 -06:00
holychowders
bae5c5b675 [REVERT ME] Display debug information for code reviewers. 2022-11-16 20:12:14 -06:00
holychowders
61aa49fa66 Add last_known_pos to Target struct. 2022-11-16 18:26:07 -06:00
Samuel Keiffer
5709427e63 Merge branch 'sam/small-fixes' into 'master'
Small fixes for sword

See merge request veloren/veloren!3694
2022-11-16 23:33:12 +00:00
Sam
b2b8ea1772 Made calculation of prim count more accurate 2022-11-15 19:54:08 -05:00
Imbris
dfbb8fa1a9 Merge branch 'hjalle2000/snappy_ui' into 'master'
snappy ui scaling by having a addtional dropdown menu

See merge request veloren/veloren!3695
2022-11-15 13:56:28 +00:00
Marcel
997c5a4e61 Merge branch 'ythern/more_unique_abilities' into 'master'
Ythern/roshwalr kit

See merge request veloren/veloren!3692
2022-11-15 09:58:06 +00:00
Marcel Märtens
e10df6ec58 snappy ui scaling by having a addtional dropdown menu 2022-11-15 10:28:57 +01:00
Eternalisime
7c66c94fa2 fix loot table 2022-11-13 22:49:29 +01:00
Eternalisime
48e23dba49 combat: reverted tweak on shockwave and changed loot table 2022-11-13 22:45:05 +01:00
Eternalisime
6e18683d98 combat: tweak on shockwave 2022-11-13 22:24:01 +01:00