Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,927 Commits 151 Branches 18 Tags 2.1 GiB
a20c563ccd
Commit Graph

12927 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
flo
466ed2c382 dagon_kit 2022-11-30 15:27:21 +00:00
Marcel
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
Isse
ef2c1633ed Merge branch 'isse/bridges' into 'master' 
Bridges

See merge request veloren/veloren!3680
 2022-11-30 15:07:03 +00:00
Marcel
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
Marcel Märtens
4a1404cd71 fix leftovers from toolchain update 2022-11-30 15:14:47 +01:00
Isse
02eadc3002 add doc comment 2022-11-30 15:13:52 +01:00
Isse
560d5c3153 fix doc test 2022-11-30 15:13:52 +01:00
Isse
c81fbf50c4 Fix cylinder primitive and better ramp function 2022-11-30 15:13:52 +01:00
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