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
Filip Bengtsson
f2dd0d0297
Missed strings
2021-06-06 17:48:09 +02: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
Filip Bengtsson
52fa777b12
Strings in various files
2021-06-06 01:05:08 +02:00
Filip Bengtsson
b17a54558f
Translate trade.ron
2021-06-06 00:42:50 +02:00
Filip Bengtsson
de7269c6cc
Translate social.ron
2021-06-06 00:42:07 +02:00
Filip Bengtsson
ebdb750b9a
Translate sct.ron
2021-06-06 00:40:30 +02:00
Filip Bengtsson
68c44055c6
Translate misc.ron
2021-06-06 00:39:55 +02:00
Filip Bengtsson
f8dee5d03e
Translate hud/map.ron
2021-06-06 00:34:06 +02:00
Filip Bengtsson
353160619e
Translate hud/hud_setting.ron
2021-06-06 00:32:16 +02: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
Filip Bengtsson
83561f78be
Translate hud/group.ron
2021-06-06 00:07:53 +02:00
Filip Bengtsson
5a43080d5b
Translate hud/crafting.ron
2021-06-06 00:07:03 +02:00
Filip Bengtsson
0e82ea1299
Translate hud/chat.ron
2021-06-06 00:06:05 +02:00
Filip Bengtsson
9c3f6c5c9a
Translate hud/char_window.ron
2021-06-06 00:00:51 +02:00
Filip Bengtsson
8006f0033c
Translate hud/bag.ron
2021-06-05 23:39:24 +02:00
Filip Bengtsson
7f6c95805c
template.ron boilerplate
2021-06-05 23:33:54 +02:00
Filip Bengtsson
e8c20d2cff
Start translating skills.ron
2021-06-05 23:25:11 +02:00
Filip Bengtsson
5e09ba7ec7
Translate main.ron
2021-06-05 23:13:42 +02:00
Filip Bengtsson
57ee1ec2dd
Translate most of gameinput.ron
2021-06-05 23:08:59 +02:00
Filip Bengtsson
c0925c8c0d
Translate esc_menu.ron
2021-06-05 23:04:55 +02:00
Filip Bengtsson
acf02ad8cc
Translate most of common.ron
2021-06-05 23:03:48 +02: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
Filip Bengtsson
2a4787bccf
Translate char_selection.ron
2021-06-05 22:45:55 +02:00
Filip Bengtsson
7928569c44
Translate buff.ron
2021-06-05 22:28:01 +02: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
Filip Bengtsson
cf3cfb41df
Translate _manifest.ron
2021-06-05 14:26:00 +02:00
Filip Bengtsson
7101d0576e
Copy files from English
2021-06-05 13:26:41 +02: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
