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
9,075 Commits 151 Branches 18 Tags 2.1 GiB
1c8e47b9b1
Commit Graph

9075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Filip Bengtsson
28c44b6bb9 Translate hud/hud_setting.ron 2021-06-06 00:32:16 +02:00
Snowram
864f230a3c Yeti combat anims 2021-06-06 00:17:23 +02:00
Sam
acf7ad27f1 Balance tweaks. 2021-06-05 17:15:04 -05:00
Filip Bengtsson
12ba5e1848 Translate hud/group.ron 2021-06-06 00:07:53 +02:00
Filip Bengtsson
1841923795 Translate hud/crafting.ron 2021-06-06 00:07:03 +02:00
Filip Bengtsson
f9e42f4107 Translate hud/chat.ron 2021-06-06 00:06:05 +02:00
Filip Bengtsson
10ac6b3d4c Translate hud/char_window.ron 2021-06-06 00:00:51 +02:00
Filip Bengtsson
fd608ccb6f Translate hud/bag.ron 2021-06-05 23:39:24 +02:00
Filip Bengtsson
f111b87fe5 template.ron boilerplate 2021-06-05 23:33:54 +02:00
Filip Bengtsson
6277106e78 Start translating skills.ron 2021-06-05 23:25:11 +02:00
Filip Bengtsson
cf051fd9fb Translate main.ron 2021-06-05 23:13:42 +02:00
Filip Bengtsson
37c12977c1 Translate most of gameinput.ron 2021-06-05 23:08:59 +02:00
Filip Bengtsson
cb0f00d447 Translate esc_menu.ron 2021-06-05 23:04:55 +02:00
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
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
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
Marcel
55d04969a4 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