Imbris
|
22f4a73fa8
|
Bump to fresh CI image with the new toolchain
|
2021-09-25 14:58:34 -04:00 |
|
Marcel Märtens
|
96bd27db62
|
apply some clippy fixes that comes with the new toolchain version
|
2021-09-24 23:18:18 +02:00 |
|
Marcel Märtens
|
8c0c86b192
|
update toolchain to nightly-2021-09-24
|
2021-09-24 23:18:07 +02:00 |
|
Marcel Märtens
|
43a946bb08
|
update toolchain to nightly-2021-09-24
|
2021-09-24 23:17:54 +02:00 |
|
Snowram
|
e9a9f0a278
|
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
|
f5c90911ec
|
Add setting to disable hotkey hints
|
2021-09-24 16:03:05 +00:00 |
|
Samuel Keiffer
|
4d67f88cea
|
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
|
faf0a47d31
|
Don't drop quad_low loot from quad_small fur
|
2021-09-24 18:03:26 +03:00 |
|
Imbris
|
bf9ad043ae
|
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
|
40432b5c83
|
Fix dir is empty check when setting WGPU_TRACE_DIR
|
2021-09-24 15:07:12 +01:00 |
|
Imbris
|
c0e0d2080d
|
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
|
1c7b84040e
|
Remove old textures that aren't reused when calling replace_graphic
|
2021-09-23 21:50:37 -04:00 |
|
Samuel Keiffer
|
9118206dc1
|
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
|
7087ffde7c
|
Fixes #1339 - Allow attacks and abilities to interrupt sprite interaction
|
2021-09-23 10:05:12 -05:00 |
|
Joshua Barretto
|
6b198044fe
|
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
|
2417a40afd
|
Fixed crash caused by invalid health, stated current <= maximum invariant more clearly
|
2021-09-23 12:36:03 +01:00 |
|
Joshua Barretto
|
8db22ecfd9
|
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
|
51bda3f52b
|
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
|
1d38cd733a
|
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
|
4c74899143
|
Removes flame wyvern from RTsim pool until proper introduction
|
2021-09-22 20:59:04 +02:00 |
|
Marcel
|
cde6126fb7
|
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
|
e2f8468016
|
Add crafting station icon to crafting menu sidebar
|
2021-09-22 13:54:32 +00:00 |
|
Joshua Barretto
|
8a0f607d9c
|
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
|
34380bd686
|
Revert "Merge branch 'ubruntu/trade-fix-part3' into 'master'"
This reverts merge request !2866
|
2021-09-22 11:45:54 +00:00 |
|
Samuel Keiffer
|
5b6deacd06
|
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
|
b444a74d8f
|
Consolidates projectile offsets into utils
|
2021-09-22 03:05:57 +02:00 |
|
Joshua Barretto
|
a56d6b1a04
|
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
|
5c01595bda
|
Trade Fix III: Revolutions
|
2021-09-21 23:16:00 +00:00 |
|
Snowram
|
15b6f947c9
|
Set projectile offsets in states instead of globally
|
2021-09-22 01:07:09 +02:00 |
|
Samuel Keiffer
|
8e62fcd440
|
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
|
33a1474419
|
Merge branch 'snowram/wyvern' into 'master'
Snowram/wyvern
See merge request veloren/veloren!2847
|
2021-09-21 14:20:33 +00:00 |
|
Marcel
|
d3f55b9975
|
Merge branch 'juliancoffee/aim_bombs' into 'master'
Aimed bombs
See merge request veloren/veloren!2865
|
2021-09-21 14:18:31 +00:00 |
|
Marcel
|
3c72722e48
|
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
|
8d88a29a4b
|
Adds Xtilt to BirdLarge skeleton
|
2021-09-21 15:31:46 +02:00 |
|
Snowram
|
5574554eda
|
Set beam offset depending on body dimensions
|
2021-09-21 15:31:46 +02:00 |
|
Snowram
|
46021c31bd
|
Bird large beam offset hack
|
2021-09-21 15:31:43 +02:00 |
|
jshipsey
|
7978b16820
|
animation tweaks
|
2021-09-21 15:30:43 +02:00 |
|
Snowram
|
cfdcf59844
|
Split wyvern anims from the other birdlarge anims
|
2021-09-21 15:30:43 +02:00 |
|
jshipsey
|
be53c407cb
|
wyvern walk
|
2021-09-21 15:30:43 +02:00 |
|
Snowram
|
298c1fbccb
|
More wyvern anim work
|
2021-09-21 15:30:42 +02:00 |
|
Snowram
|
7384868c57
|
Adds flame wyvern npc
|
2021-09-21 15:30:42 +02:00 |
|
juliancoffee
|
2341a426f0
|
Allow aiming bombs
|
2021-09-20 22:29:25 +03:00 |
|
Marcel
|
c8b210c893
|
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
|
636838f510
|
update crates
|
2021-09-20 14:39:01 +02:00 |
|
Joshua Barretto
|
717690b883
|
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
|
d7fafbfdfd
|
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ı
|
0efa41a04d
|
Update buff.ron
|
2021-09-19 16:05:04 +00:00 |
|
Mehmet Mallı
|
c1d5e3b0d2
|
added main Turkish translations
|
2021-09-19 17:36:31 +03:00 |
|
Mehmet Mallı
|
c8c02fe838
|
added common Turkish translations
|
2021-09-19 17:36:05 +03:00 |
|
Mehmet Mallı
|
964c412a7c
|
changed Turkish translations for uncanny valley in char_selection
|
2021-09-19 17:35:41 +03:00 |
|