Imbris
96b7f027e3
Make handling of shortcut keywords for commands clearer and revise a TODO related to how chat messages are stored and renamed with alias changes
2021-06-06 23:45:51 -04:00
Marcel
a3cc752bbf
Merge branch 'pfau/loading_screen_bgs' into 'master'
...
Add 0.10 login background and new loading screens
See merge request veloren/veloren!2386
2021-06-06 18:17:42 +00:00
Monty
82440de48f
new bgs
2021-06-06 19:30:37 +02:00
Marcel
3182724b66
Merge branch 'aweinstock/add-models-20210603' into 'master'
...
Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty.
See merge request veloren/veloren!2371
2021-06-06 16:56:21 +00:00
Marcel
3b73986af2
Merge branch 'hqurve/crafting-sorting2' into 'master'
...
Widened recipe list in crafting menu and added quality indicators to names in the list
See merge request veloren/veloren!2378
2021-06-06 15:55:11 +00:00
hqurve
8da6cbe414
Widened recipe list in crafting menu and added quality indicators to names in the list
2021-06-06 15:55:11 +00:00
Ben Wallis
15a9df880f
Merge branch 'Extract-unlock-skill-from-diary-update' into 'master'
...
Extract 'unlock_skill' function from 'update'
See merge request veloren/veloren!2383
2021-06-06 14:14:53 +00:00
Jonathan Berglin
9b064e289d
Extract 'create_unlock_skill_button' function from 'update' in diary.rs
2021-06-06 14:14:53 +00:00
Snowram
b1a2d0b698
Cyclops, basilisk, air balloon offsets
2021-06-06 14:12:08 +02:00
Samuel Keiffer
a57a8de23a
Merge branch 'sam/yeti' into 'master'
...
Yeti Rework
See merge request veloren/veloren!2359
2021-06-05 23:15:20 +00:00
Snowram
29d1d127d3
Yeti combat anims
2021-06-06 00:17:23 +02:00
Sam
a73e7c78e0
Balance tweaks.
2021-06-05 17:15:04 -05:00
Ben Wallis
a6a340af69
Merge branch 'capucho/scissor-panic' into 'master'
...
Fix scissor panics when window height is 1
See merge request veloren/veloren!2379
2021-06-05 20:46:43 +00:00
João Capucho
b150a2ab3b
Fix scissor panics when window height is 1
2021-06-05 20:36:27 +01:00
Sam
6d342537d6
Yeti AI
2021-06-05 13:25:47 -05:00
Ben Wallis
4f2e60487d
Merge branch 'xvar/title-screen-fps-cap' into 'master'
...
Added 60 FPS framerate cap for title/menu screens
See merge request veloren/veloren!2377
2021-06-05 14:00:57 +00:00
Ben Wallis
619a190566
Added 60 FPS framerate cap for title/menu screens
2021-06-05 14:13:53 +01:00
Marcel
a083305d21
Merge branch 'xMAC94x/update_deps' into 'master'
...
update dependencies
See merge request veloren/veloren!2374
2021-06-05 11:10:22 +00:00
Ben Wallis
caa546cc45
Merge branch 'capucho/wgpu-outdated-swapchain' into 'master'
...
Rebuild swapchain on Outdate error
See merge request veloren/veloren!2376
2021-06-05 10:27:32 +00:00
Sam
d5b25bd36b
Particles for ice spikes
2021-06-04 18:17:15 -05:00
Sam
6add5510a7
Snowball attack.
2021-06-04 18:17:15 -05:00
Sam
9c5ca3bba5
Added base ability set
2021-06-04 18:17:14 -05:00
João Capucho
a65650389e
Don't draw when window size is minimized
2021-06-04 23:37:33 +01:00
Ben Wallis
033f275a56
Merge branch 'hqurve/fix-lootscrller' into 'master'
...
Fixed loot scroller collisions and cleaned up previous changes
See merge request veloren/veloren!2358
2021-06-04 20:00:18 +00:00
João Capucho
70f3b1a9a2
Regenerate the swapchain if the frame is outdated
2021-06-04 20:37:39 +01:00
Samuel Keiffer
42115bae3b
Merge branch 'juliancoffee/bow_tweaks' into 'master'
...
Bow Tweaks
See merge request veloren/veloren!2375
2021-06-04 18:33:35 +00:00
juliancoffee
267409ef4a
Bow Tweaks
...
- M1 (charged) got faster charge, but lesser damage and energy regen
- M2 (repeater) got faster charge, but lesser damage and max speed
- S1 (shotgun) got less energy cost
2021-06-04 20:58:08 +03:00
Marcel Märtens
e33bd39f34
update dependencies
2021-06-04 09:44:30 +02:00
Imbris
eb179fb90c
Merge branch 'imbris/fix-publish' into 'master'
...
Make docker-nightly job depend on the nightly air-linux job
See merge request veloren/veloren!2373
2021-06-04 07:29:20 +00:00
Imbris
2ffeaab2fe
Make docker-nightly job depend on the nightly air-linux job
2021-06-04 03:24:57 -04:00
Imbris
f466c807b2
Merge branch 'imbris/update-ci-cache' into 'master'
...
Imbris/update ci cache
See merge request veloren/veloren!2372
2021-06-04 07:02:06 +00:00
Imbris
4a1218ecdd
Update docker cache for CI
2021-06-04 02:27:07 -04:00
Samuel Keiffer
66d72df5b6
Merge branch 'sam/tidal-warrior' into 'master'
...
Tidal Warrior Rework
See merge request veloren/veloren!2340
2021-06-04 03:52:49 +00:00
Sam
0658510ba6
Final tweaks.
2021-06-03 21:39:47 -05:00
Sam
75f5c0543b
Fmt and clippy from toolchain rebase.
2021-06-03 21:39:18 -05:00
Sam
7f942864de
Added kits for tiers 1 and 2
2021-06-03 21:39:17 -05:00
jshipsey
a4d95fdd13
some animation
2021-06-03 21:39:17 -05:00
Sam
571599ff63
Fixed tests
2021-06-03 21:39:16 -05:00
Sam
1ebe6461d4
Added totem ability, totem ai, totem ability set, particles for totem abilities, and totem voxel model.
2021-06-03 21:39:15 -05:00
Sam
47d5ea69eb
Tidal warrior AI.
2021-06-03 21:39:14 -05:00
Sam
d0bfcabd1c
First 3 abilities for tidal warrior functional. Added bubble particles.
2021-06-03 21:39:13 -05:00
Avi Weinstock
07829fffab
Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty.
2021-06-03 19:24:34 -04:00
Marcel
acf0094504
Merge branch 'xMAC94x/cleanupbenches' into 'master'
...
use criterion groups and fix tracing to much on wgpu
See merge request veloren/veloren!2369
2021-06-03 21:43:46 +00:00
Marcel
30e6b2e0d0
Merge branch 'yusdacra/chore/nix' into 'master'
...
Update Nix deps, add new build and runtime deps to make it work with wgpu
See merge request veloren/veloren!2370
2021-06-03 21:12:19 +00:00
Yusuf Bera Ertan
18c05cddfc
build(nix): add new dependencies to nix build and dev env for wgpu
2021-06-04 00:08:02 +03:00
Imbris
03a89bbfcf
Merge branch 'imbris/nightly-ci-improvement' into 'master'
...
Avoid extra jobs on nightly builds
See merge request veloren/veloren!2367
2021-06-03 20:54:16 +00:00
Marcel Märtens
5a517977df
use criterion groups and fix tracing to much on wgpu
2021-06-03 22:37:17 +02:00
Yusuf Bera Ertan
de4320c9b0
chore(deps): update nix flake deps
2021-06-03 23:33:13 +03:00
Imbris
57637f3f0a
Merge branch 'imbris/wgpu-master-rebased' into 'master'
...
wgpu
See merge request veloren/veloren!1947
2021-06-03 19:58:48 +00:00
Imbris
22199a9980
Switch to using block_on directly from futures-executor instead of the umbrella crate
2021-06-03 14:28:28 -04:00
