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,565 Commits 151 Branches 18 Tags 2.1 GiB
3dd3e5d5ea
Commit Graph

9565 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Wallis
3dd3e5d5ea Added cargo cmd-doc-gen to auto-generate the table of commands in the new players/commands.md page in the book 2021-08-21 13:36:55 +01:00
Marcel
da40cb0c6e Merge branch 'xvar/ci-runner-tags' into 'master' 
Added veloren-publish tags and veloren-build tags to CI configuration

See merge request veloren/veloren!2537
 2021-08-19 08:29:25 +00:00
Marcel Märtens
9ad423488f implement a new tag system for all veloren runners, including 
- project tag:
   - `veloren/veloren`: for the veloren repo only
   - `veloren/*`: for projects thats are in the veloren namespace, e.g. usefull for smaller projects that dont have their own tag
   - `*/*` for projects by 3rd parties, e.g. personal projects
 - trusted tag:
   - `owned`:  The runner is hosted on veloren hardware
   - `trusted`: The runner is hosted by a private person, trusted by the veloren devs
   - NONE: if no special trust is given in a runner
 - check/build tag:
   - `check`: a job only performs a check and NO executable is build for users
   - `build`: the job contains atleast 1 executable that can be run by users
   - NONE: neither a check nor a executable is build, e.g. usefull for pages or meta jobs
 - publish tag:
   - `publish`: this job produces a artifact that is automatically pushed to users
   - NONE: no artifact is pushed automatically to users
 - pin tags:
   - `benchmark`: pin a runner to a specific job for the cause of benchmarks
   - `veloren/*:macos`: runs on a native macos runner ONLY, this needs to be a modified project tag, as otherwise also normal checks would run on this runner.
   - NONE: no runner is pinned
 2021-08-19 09:23:31 +02:00
Ben Wallis
6935d0f6cd Added veloren-publish tags and veloren-build tags to CI configuration 2021-08-19 09:08:49 +02:00
Marcel
8777d12afd Merge branch 'alxly/update-ru_RU' into 'master' 
alxly/update-ru_RU: add ru_RU missed translations

See merge request veloren/veloren!2757
 2021-08-17 12:18:33 +00:00
AlxlY
73fdd0c5ec alxly/update-ru_RU: update translation for GPU profiler and mouse sensevity 2021-08-16 22:04:17 +02:00
Samuel Keiffer
142918b37e Merge branch 'juliancoffee/balance_update' into 'master' 
Abilitiy tweaks and /make_npc command

See merge request veloren/veloren!2769
 2021-08-16 16:06:59 +00:00
juliancoffee
b26228bec0 Remove giants 2021-08-16 18:15:01 +03:00
juliancoffee
3b332b9213 Add ori_modifier for DashMelee and nerf it 
* 0.6 -> 0.3 ori modifier during charge in DashMelee
 2021-08-16 17:27:59 +03:00
juliancoffee
dc69716cd0 Implement /make_npc 2021-08-16 17:27:59 +03:00
juliancoffee
0c2df96371 Refactor supplement evaluation to use NpcData 2021-08-16 17:27:59 +03:00
juliancoffee
d93c6e2470 Add MakeNPC admin command 2021-08-16 16:45:36 +03:00
juliancoffee
1baef392e6 Abilitiy tweaks 
Buff axe double_strike damage (90 -> 110 for first stage)
Decrease initial poise damage for hammer charged (20 -> 5)
 2021-08-15 23:20:21 +03:00
Imbris
b05515e5bf Merge branch 'juliancoffee/explode_vines' into 'master' 
Make Fireballs explode EnsnaringVines

See merge request veloren/veloren!2758
 2021-08-14 19:09:05 +00:00
Imbris
81cfab39cb Merge branch 'master' into 'master' 
Add WGPU adapter selection using WGPU_ADAPTER

See merge request veloren/veloren!2747
 2021-08-14 18:09:51 +00:00
Joshua Barretto
11d08be485 Merge branch 'zesterer/better-aggro' into 'master' 
Improved aggro system to reduce hyper-focused enemies

See merge request veloren/veloren!2767
 2021-08-14 13:29:25 +00:00
Joshua Barretto
7171f74855 Merge branch 'DanTheOne/missing-volume-numbers' into 'master' 
Add music and sfx volume numbers and a little refactoring

See merge request veloren/veloren!2768
 2021-08-14 13:04:32 +00:00
DanTheOne
d1faf548de Refactor sound settings window 2021-08-14 14:24:06 +02:00
DanTheOne
988a1ff6ed Add music and sfx volume numbers 2021-08-14 12:25:21 +02:00
Joshua Barretto
6ad4791b11 Improved aggro system to reduce hyper-focused enemies 2021-08-14 11:09:33 +01:00
juliancoffee
565e337f76 Make is_mid_air use on_surface().is_none() 2021-08-13 23:16:38 +03:00
Daniil Nemtsev
59f92f9642 Add WGPU adapter selection using WGPU_ADAPTER 2021-08-13 12:39:44 +00:00
Joshua Barretto
5f310163ef Merge branch 'min-persistent-world' into 'master' 
min-persistent-world

See merge request veloren/veloren!2662
 2021-08-13 12:30:28 +00:00
Marcel
f3afdc681a Merge branch 'update_pt_BR_20210810' into 'master' 
update pt_br translation 2021_08_10

See merge request veloren/veloren!2753
 2021-08-13 07:17:01 +00:00
Nícolas Wildner
cc1e7f3804 update pt_br translation 2021_08_10 2021-08-13 07:17:01 +00:00
Marcel
b0dc7cb94c Merge branch 'trade-window-fix' into 'master' 
Small fix for trade window headers

See merge request veloren/veloren!2766
 2021-08-12 22:50:36 +00:00
Xeriab Nabil
5de71b1982 Small fix for trade window headers 2021-08-12 21:56:38 +03:00
juliancoffee
86bf03be1c Add comment about fragility of solution 2021-08-12 15:28:58 +03:00
Marcel
059d99b480 Merge branch 'tygyh/Move-assignment-out-of-if-statement' into 'master' 
Move assignment out of if-statement

See merge request veloren/veloren!2764
 2021-08-12 11:14:57 +00:00
Dr. Dystopia
74c34598c7 Move assignment out of if-statement 2021-08-12 12:34:04 +02:00
Joshua Barretto
432bfa91d9 Added feature flag for terrain persistence 2021-08-12 10:48:00 +01:00
Joshua Barretto
da58c3d143 Added experimental terrain persistence 2021-08-12 10:26:20 +01:00
Marcel
99d94202ea Merge branch 'fix-1278' into 'master' 
Fixes the issue mentioned in #1278

See merge request veloren/veloren!2760
 2021-08-12 07:24:16 +00:00
Xeriab Nabil
53d1708448 Fixes the issue mentioned in #1278 2021-08-12 03:23:31 +03:00
juliancoffee
42debc32d3 Make Fireballs explode EnsnaringVines 2021-08-12 01:25:55 +03:00
AlxlY
a5cc713be0 alxly/update-ru_RU: updated transation after review. 2021-08-12 00:16:45 +02:00
Marcel
d85fc21d3d Merge branch 'xMAC94x/fix_1165' into 'master' 
remove futures_executor from renderer and rather pass tokio runtime to it...

See merge request veloren/veloren!2755
 2021-08-11 15:26:08 +00:00
AlxlY
b173c71840 alxly/update-ru_RU: fix translation based on @CodeReview comments. 2021-08-11 13:37:05 +02:00
Marcel
a049aa1e32 Merge branch 'trade-window-improvements' into 'master' 
UI: Fixes and enhancements to the trading window

See merge request veloren/veloren!2738
 2021-08-11 09:25:17 +00:00
Marcel Märtens
8b04770525 code cleanup 2021-08-11 09:42:29 +02:00
Marcel Märtens
a3fda18b63 zest prefers this over await 2021-08-11 01:23:48 +02:00
Marcel
67ebb0034f Merge branch 'juliancoffee/i18n_sprites' into 'master' 
Localization for sprite overitem (currenly only crafting stations)

See merge request veloren/veloren!2759
 2021-08-10 23:17:25 +00:00
Illia Denysenko
008790fad7 Localization for sprite overitem (currenly only crafting stations) 2021-08-10 23:17:25 +00:00
AlxlY
54f6a71637 alxly/update-ru_RU: added proper translations after review. changed indentation to spaces 2021-08-11 00:48:48 +02:00
Marcel Märtens
9201b3da42 remove futures_executor from renderer and rather pass tokio runtime to it properly. therefore the runtime is now created with Voxygen rather than with the Connect attempt 2021-08-11 00:38:03 +02:00
AlxlY
743865d25e alxl/update-ru_RU: add ru_RU missed translations 2021-08-10 23:36:02 +02:00
Marcel
71017ebfac Merge branch 'kilpkonn/camera_clipping' into 'master' 
Camera clipping

Closes #955

See merge request veloren/veloren!2730
 2021-08-10 12:20:27 +00:00
Tavo Annus
ed9699b048 Fix skybox jumping 2021-08-10 14:01:09 +02:00
Tavo Annus
f37b9a2c76 Use old strategy for far distances 2021-08-10 14:00:59 +02:00
Tavo Annus
3d6f3eaa69 Minor tweaks to clipping, style fixes 2021-08-10 14:00:51 +02:00