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
10,450 Commits 151 Branches 18 Tags 2.1 GiB
a314afdf04
Commit Graph

10450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam
942376f88c Made poise a float at interface of module. 2021-09-25 14:07:47 -04:00
Samuel Keiffer
0af6969d19 Merge branch 'sam/energy-float' into 'master' 
Changed energy to a float

See merge request veloren/veloren!2838
 2021-09-25 06:51:21 +00:00
Marcel Märtens
e36eef99c8 apply some clippy fixes that comes with the new toolchain version 2021-09-24 23:18:18 +02:00
Marcel Märtens
2a82405df2 update toolchain to nightly-2021-09-24 2021-09-24 23:18:07 +02:00
Marcel Märtens
42eadb715b update toolchain to nightly-2021-09-24 2021-09-24 23:17:54 +02:00
Snowram
0b26f456f9 Merge branch 'bafon/toggle-hotkey-hints-setting' into 'master' 
Add setting to disable hotkey hints

See merge request veloren/veloren!2849
 2021-09-24 16:03:06 +00:00
Bafon
d53d2300a6 Add setting to disable hotkey hints 2021-09-24 16:03:05 +00:00
Samuel Keiffer
e7ca19b614 Merge branch 'juliancoffee/loot_table_fix' into 'master' 
Don't drop quad_low loot from quad_small fur

See merge request veloren/veloren!2874
 2021-09-24 15:59:26 +00:00
juliancoffee
f82a26e9c5 Don't drop quad_low loot from quad_small fur 2021-09-24 18:03:26 +03:00
Imbris
d3acb9a654 Merge branch 'capucho/wgpu-trace' into 'master' 
Fix dir is empty check when setting WGPU_TRACE_DIR

See merge request veloren/veloren!2873
 2021-09-24 14:38:41 +00:00
João Capucho
34eb58cded
Fix dir is empty check when setting WGPU_TRACE_DIR 2021-09-24 15:07:12 +01:00
Imbris
83fed7a2bc Merge branch 'imbris/tex-cleanup' into 'master' 
Remove old textures that aren't reused when calling replace_graphic

See merge request veloren/veloren!2869
 2021-09-24 02:38:27 +00:00
Imbris
f1c44e1f1d Remove old textures that aren't reused when calling replace_graphic 2021-09-23 21:50:37 -04:00
Sam
0e5e2b46f2 Changed energy to internally use an integer with a high resolution, and externally to use a float. 2021-09-23 14:11:09 -04:00
Samuel Keiffer
3091c970f3 Merge branch 'heydabop/1339-attack-cancel-interaction' into 'master' 
Fixes #1339 - Allow attacks and abilities to interrupt sprite interaction

Closes #1339

See merge request veloren/veloren!2864
 2021-09-23 16:28:49 +00:00
heydabop
e2f9237f05
Fixes #1339 - Allow attacks and abilities to interrupt sprite interaction 2021-09-23 10:05:12 -05:00
Joshua Barretto
bb0b5defec Merge branch 'zesterer-master-patch-65668' into 'master' 
Fixed crash caused by invalid health, stated current <= maximum invariant more clearly

See merge request veloren/veloren!2871
 2021-09-23 12:18:36 +00:00
Joshua Barretto
bee5b232e6 Fixed crash caused by invalid health, stated current <= maximum invariant more clearly 2021-09-23 12:36:03 +01:00
Joshua Barretto
785ba500c6 Merge branch 'imbris/bloom-suppress-nans' into 'master' 
Avoided black hexagons when bloom is enabled by suppressing NaN/Inf pixels

See merge request veloren/veloren!2870
 2021-09-23 10:47:03 +00:00
Imbris
5217b5090c Avoided black hexagons when bloom is enabled by suppressing NaN/Inf pixels during the first bloom blur pass 2021-09-22 21:58:36 -04:00
Joshua Barretto
0332902349 Merge branch 'snowram/omit-rtsim-wyvern' into 'master' 
Removes flame wyvern from RTsim pool until proper introduction

See merge request veloren/veloren!2868
 2021-09-22 19:50:22 +00:00
Snowram
76d41aa340 Removes flame wyvern from RTsim pool until proper introduction 2021-09-22 20:59:04 +02:00
Marcel
d5b4c5549b Merge branch 'bafon/crafting-station-icons' into 'master' 
Add crafting station icon to crafting menu sidebar

See merge request veloren/veloren!2848
 2021-09-22 13:54:33 +00:00
Bafon
0375b973db Add crafting station icon to crafting menu sidebar 2021-09-22 13:54:32 +00:00
Joshua Barretto
a74a40854e Merge branch 'revert-f27a0df8' into 'master' 
Revert "Merge branch 'ubruntu/trade-fix-part3' into 'master'"

See merge request veloren/veloren!2867
 2021-09-22 12:31:49 +00:00
Joshua Barretto
4e61e5a04f Revert "Merge branch 'ubruntu/trade-fix-part3' into 'master'" 
This reverts merge request !2866
 2021-09-22 11:45:54 +00:00
Samuel Keiffer
0b477ec9af Merge branch 'snowram/projectile-offsets' into 'master' 
Set projectile offsets in states instead of globally

See merge request veloren/veloren!2855
 2021-09-22 01:55:39 +00:00
Snowram
5838a84568 Consolidates projectile offsets into utils 2021-09-22 03:05:57 +02:00
Joshua Barretto
f27a0df884 Merge branch 'ubruntu/trade-fix-part3' into 'master' 
Trade Fix III: Revolutions

See merge request veloren/veloren!2866
 2021-09-21 23:16:01 +00:00
ubruntu
33526afe5a Trade Fix III: Revolutions 2021-09-21 23:16:00 +00:00
Snowram
9c2ce83430 Set projectile offsets in states instead of globally 2021-09-22 01:07:09 +02:00
Samuel Keiffer
576f2a6e9f Merge branch 'wolfshaman/fixing_1328_set_waypoint_when_on_ground_and_not_going_down' into 'master' 
fixing_1328_set_waypoint_when_on_ground_and_not_going_down

See merge request veloren/veloren!2832
 2021-09-21 22:16:08 +00:00
Justin Shipsey
2c3640b527 Merge branch 'snowram/wyvern' into 'master' 
Snowram/wyvern

See merge request veloren/veloren!2847
 2021-09-21 14:20:33 +00:00
Marcel
daa93a6d16 Merge branch 'juliancoffee/aim_bombs' into 'master' 
Aimed bombs

See merge request veloren/veloren!2865
 2021-09-21 14:18:31 +00:00
Marcel
a3452af599 Merge branch 'kimtinh/add-vietnamese' into 'master' 
Add Vietnamese translation

See merge request veloren/veloren!2856
 2021-09-21 14:10:40 +00:00
Snowram
3c2de422db Adds Xtilt to BirdLarge skeleton 2021-09-21 15:31:46 +02:00
Snowram
cf6bf74f7a Set beam offset depending on body dimensions 2021-09-21 15:31:46 +02:00
Snowram
7a73e4240b Bird large beam offset hack 2021-09-21 15:31:43 +02:00
jshipsey
1ad107f4a7 animation tweaks 2021-09-21 15:30:43 +02:00
Snowram
299ca581ea Split wyvern anims from the other birdlarge anims 2021-09-21 15:30:43 +02:00
jshipsey
aedb2e9d2b wyvern walk 2021-09-21 15:30:43 +02:00
Snowram
9acae9fca0 More wyvern anim work 2021-09-21 15:30:42 +02:00
Snowram
834749353a Adds flame wyvern npc 2021-09-21 15:30:42 +02:00
juliancoffee
6e2f9be13f Allow aiming bombs 2021-09-20 22:29:25 +03:00
Marcel
e472075b6a Merge branch 'xMAC94x/update_crates' into 'master' 
update crates

See merge request veloren/veloren!2863
 2021-09-20 13:31:14 +00:00
Marcel Märtens
88685cc016 update crates 2021-09-20 14:39:01 +02:00
Joshua Barretto
e098a38d8e Merge branch 'james/rrt-pathfinding' into 'master' 
Initial RRT flight pathfinding

See merge request veloren/veloren!2773
 2021-09-19 19:30:31 +00:00
Justin Shipsey
16d9959cb4 Merge branch 'mehmetmalli/turkish-translations' into 'master' 
Turkish translations

See merge request veloren/veloren!2861
 2021-09-19 17:49:19 +00:00
Mehmet Mallı
9745e7db6c Update buff.ron 2021-09-19 16:05:04 +00:00
Mehmet Mallı
bfb859fff1 added main Turkish translations 2021-09-19 17:36:31 +03:00