Filip Bengtsson
35f7c206e5
Translate most of common.ron
2021-06-05 23:03:48 +02:00
Ben Wallis
8c825305e9
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
Filip Bengtsson
8db65e0554
Translate char_selection.ron
2021-06-05 22:45:55 +02:00
Filip Bengtsson
d663d05f4f
Translate buff.ron
2021-06-05 22:28:01 +02:00
João Capucho
a148d4d01a
Fix scissor panics when window height is 1
2021-06-05 20:36:27 +01:00
Sam
74b7039219
Yeti AI
2021-06-05 13:25:47 -05:00
Ben Wallis
7b8a398234
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
1a93e3d84f
Added 60 FPS framerate cap for title/menu screens
2021-06-05 14:13:53 +01:00
Ben Wallis
cc19e70ae6
Tidied up egui windows
2021-06-05 13:33:53 +01:00
Filip Bengtsson
d0bb260057
Translate _manifest.ron
2021-06-05 14:26:00 +02:00
Filip Bengtsson
6df35564c2
Copy files from English
2021-06-05 13:26:41 +02:00
Marcel
01e2b69fda
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
e9a5fe1b4d
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
93f90d514c
Particles for ice spikes
2021-06-04 18:17:15 -05:00
Sam
81f7e690fd
Snowball attack.
2021-06-04 18:17:15 -05:00
Sam
a82984b925
Added base ability set
2021-06-04 18:17:14 -05:00
João Capucho
b647cd35f1
Don't draw when window size is minimized
2021-06-04 23:37:33 +01:00
Ben Wallis
059dfd2602
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
36c28af46d
Regenerate the swapchain if the frame is outdated
2021-06-04 20:37:39 +01:00
Ben Wallis
0b10752a7d
Added egui Inspection, Settings and Memory windows. Refactored selected entity window.
2021-06-04 20:20:09 +01:00
Ben Wallis
0296bbe696
Addressed MR comments
2021-06-04 20:19:52 +01:00
Ben Wallis
24134af4a7
Pulled library hot-reloading code into a separate crate and removed duplicated code from anim and egui crates
2021-06-04 20:19:49 +01:00
Ben Wallis
6163ddbb68
Pulled library hot-reloading code into a separate crate and removed duplicated code from anim and egui crates
2021-06-04 20:19:25 +01:00
Ben Wallis
d87cc5104d
x
2021-06-04 20:18:24 +01:00
Ben Wallis
e6eaba038e
fixup after rebase
2021-06-04 20:18:22 +01:00
Ben Wallis
1c80ab705f
Added debug cylinder for selected entity. Added frame time graph.
2021-06-04 20:16:55 +01:00
Ben Wallis
483711ba67
Initial entity viewer implementation
2021-06-04 20:16:53 +01:00
Ben Wallis
0654d78260
Implemented hot reloading for EGUI (needs duplicated code from anim crate refactoring out)
2021-06-04 20:16:15 +01:00
Ben Wallis
63b8fe1a5f
changed runner tags
2021-06-04 20:15:52 +01:00
Ben Wallis
ebcf59fb8c
cleanup
2021-06-04 20:12:08 +01:00
Ben Wallis
8c57091401
Moved egui state to own struct, cleaned up a bunch of stuff
2021-06-04 20:11:43 +01:00
Ben Wallis
4d1da112c1
wip
2021-06-04 20:06:27 +01:00
Samuel Keiffer
f574015c39
Merge branch 'juliancoffee/bow_tweaks' into 'master'
...
Bow Tweaks
See merge request veloren/veloren!2375
2021-06-04 18:33:35 +00:00
juliancoffee
554828e1a1
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
1015af13d4
update dependencies
2021-06-04 09:44:30 +02:00
Imbris
3dbfe57b04
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
aa127a9df6
Make docker-nightly job depend on the nightly air-linux job
2021-06-04 03:24:57 -04:00
Imbris
f2efdc97ae
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
bf3ee86425
Update docker cache for CI
2021-06-04 02:27:07 -04:00
Samuel Keiffer
e984ebc446
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
eaf87a53bb
Final tweaks.
2021-06-03 21:39:47 -05:00
Sam
f066f844b6
Fmt and clippy from toolchain rebase.
2021-06-03 21:39:18 -05:00
Sam
e835cb1392
Added kits for tiers 1 and 2
2021-06-03 21:39:17 -05:00
jshipsey
ca43a0058a
some animation
2021-06-03 21:39:17 -05:00
Sam
35876411cd
Fixed tests
2021-06-03 21:39:16 -05:00
Sam
5bf99eac11
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
ac2f097d80
Tidal warrior AI.
2021-06-03 21:39:14 -05:00
Sam
c81e1534f7
First 3 abilities for tidal warrior functional. Added bubble particles.
2021-06-03 21:39:13 -05:00
Avi Weinstock
05c699878f
Add Basilisk and Cyclops models by Gemu, and AirBalloon model by SarraKitty.
2021-06-03 19:24:34 -04:00
Marcel
59ae5ec573
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
