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
8,521 Commits 151 Branches 18 Tags
Commit Graph

8521 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Filip Bengtsson
f2dd0d0297 Missed strings 2021-06-06 17:48:09 +02: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
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
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
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
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
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