Commit Graph

12515 Commits

Author SHA1 Message Date
LunarEclipse
c01d32e273 Updated my entry in the mailmap file. 2022-09-03 21:56:23 +02:00
Mckol
e9ba3ffa4a Added the possibility to not assign a default keybind to a GameInput 2022-09-03 21:56:00 +02:00
Mckol
e4b213cac5 Added a keybind for muting the music [F8] 2022-09-03 20:33:08 +02:00
Mckol
6605c2657f Added mute buttons for all of the audio sliders in settings 2022-09-03 20:31:04 +02:00
Yusuf Bera Ertan
558f6be222
build(nix): remove unused stuff 2022-09-03 17:37:38 +03:00
Yusuf Bera Ertan
8014730d64
build(nix): refactor some code 2022-09-03 16:51:26 +03:00
Yusuf Bera Ertan
149763d54a
build(nix): add missing libraries for voxygen 2022-09-03 16:39:44 +03:00
Yusuf Bera Ertan
e94acbec8b
fix: use as_str to get rid of doesn't implement display 2022-09-03 16:31:52 +03:00
Yusuf Bera Ertan
2af2b34d84
build: allow common to read git version information at runtime 2022-09-03 16:26:10 +03:00
Yusuf Bera Ertan
999984d15a
build(nix): refactor, dont pass git hash and tag 2022-09-03 16:00:11 +03:00
Yusuf Bera Ertan
12fb3254de
build(nix): add missing library for voxygen 2022-09-03 15:20:27 +03:00
Yusuf Bera Ertan
8d3b8f444b
build(nix): disable check for server cli 2022-09-03 08:00:06 +03:00
Yusuf Bera Ertan
19021e6d80
build(nix): add missing library for voxygen 2022-09-03 07:25:45 +03:00
Yusuf Bera Ertan
7a2d647400
build(nix): wrap veloren-voxygen in wrapper derivation 2022-09-03 07:12:18 +03:00
Yusuf Bera Ertan
8c4c0c2021
build(nix): update flake deps 2022-09-03 07:06:56 +03:00
Yusuf Bera Ertan
1ca6ebdda0
build(nix): add missing library for voxygen 2022-09-03 03:34:10 +03:00
Yusuf Bera Ertan
d64417b41a
build(nix): wrap packages with assets in another derivation 2022-09-03 03:00:08 +03:00
Yusuf Bera Ertan
7f3100cc2c
build(nix): update flake deps 2022-09-03 02:32:38 +03:00
Isse
e35e533d88 Merge branch 'sau/update-es_ES' into 'master'
update the Spanish translation

See merge request veloren/veloren!3583
2022-09-02 23:29:40 +00:00
Sau
767041ae5c update the Spanish translation 2022-09-02 23:29:40 +00:00
Isse
01efcbf69d Merge branch 'zDrag0nG/update-es_ES' into 'master'
Update Spanish translation

See merge request veloren/veloren!3588
2022-09-02 23:20:00 +00:00
Yusuf Bera Ertan
b442b016a6
build(nix): add source filtering for server-cli, use mold for server-cli too 2022-09-03 01:57:24 +03:00
Yusuf Bera Ertan
5bf1a0267f
build(nix): add source filtering for voxygen 2022-09-02 23:12:36 +03:00
Yusuf Bera Ertan
9c307e3e23
build(nix): update deps 2022-09-02 21:39:44 +03:00
Yusuf Bera Ertan
1c7b781b9e
build(nix): dont check dependencies derivation 2022-09-02 21:32:53 +03:00
Yusuf Bera Ertan
32d0da0539
fix: append config correctly 2022-09-02 21:13:58 +03:00
Yusuf Bera Ertan
c6bac19fe4
build(nix): use clang 2022-09-02 21:13:58 +03:00
Yusuf Bera Ertan
8dba530131
build(nix): use mold linker 2022-09-02 21:13:57 +03:00
Yusuf Bera Ertan
5b901d9775
build(nix): update flake lock, fix stuff 2022-09-02 21:13:57 +03:00
Yusuf Bera Ertan
99cb326e54
chore(nix): update flake lock 2022-09-02 21:13:57 +03:00
Yusuf Bera Ertan
0ffffa8496
build(nix): fix file path for substitute 2022-09-02 21:13:57 +03:00
Yusuf Bera Ertan
2afcc7195b
build(nix): fix lib not found error 2022-09-02 21:13:57 +03:00
Yusuf Bera Ertan
1302b7da77
docs(nix): update formatting instructions 2022-09-02 21:13:57 +03:00
Yusuf Bera Ertan
a0b7446f58
build(nix): format nix files, fix git lfs error 2022-09-02 21:13:57 +03:00
Yusuf Bera Ertan
b9586673d5
build(nix): update flake to use latest nix-cargo-integration 2022-09-02 21:13:56 +03:00
Joshua Barretto
f45cb7ce3a Merge branch 'zesterer/better-stable-dt' into 'master'
Switched to median dt for stable dt

See merge request veloren/veloren!3540
2022-09-02 17:53:35 +00:00
Joshua Barretto
6a1e560906 Switched to median dt for stable dt 2022-09-02 18:21:24 +01:00
Dong
17cd06bc5e Update Spanish translation 2022-09-02 17:51:18 +02:00
Isse
6c456ac113 Merge branch 'tygyh/Swedish-translations' into 'master'
Update swedish translation

See merge request veloren/veloren!3581
2022-09-01 08:21:07 +00:00
Jonathan Berglin
cf9f2d36d0 Update swedish translation 2022-09-01 08:21:07 +00:00
Marcel
aa7cdd2864 Merge branch 'christof/econ_goods_in_ron' into 'master'
Economy: Move decay and transportation effort from hardcoded into ron

See merge request veloren/veloren!3578
2022-08-31 08:26:24 +00:00
Ben Wallis
91a4a9e187 Merge branch 'put_organ_under_toolkind_instrument' into 'master'
put Organ under Toolkind Instrument

See merge request veloren/veloren!3580
2022-08-30 16:55:03 +00:00
flo
6c89cd8fbf put Organ under Toolkind Instrument 2022-08-30 16:55:02 +00:00
Marcel
defb72d81c Merge branch 'MadirexRus/russian-translation-fix' into 'master'
Russian translation fixes

See merge request veloren/veloren!3576
2022-08-30 12:29:18 +00:00
MadirexRus
8f1c45af17 Russian translation fixes 2022-08-30 12:29:18 +00:00
Imbris
0678273a3f Merge branch 'juliancoffee/fix-i18n-keys' into 'master'
Fix hud-skill-sc_wardaura_duration key

See merge request veloren/veloren!3577
2022-08-29 23:01:46 +00:00
Christof Petig
5e2474230e oh, Potions do not decay in master 2022-08-30 00:37:38 +02:00
Christof Petig
863f9857b5 cargo fmt 2022-08-30 00:37:38 +02:00
Christof Petig
04b7090197 handle terrain more correctly 2022-08-30 00:37:38 +02:00
Christof Petig
fbe0aee40d move trading good properties (decay, transportation) from hard coded to ron file 2022-08-30 00:37:38 +02:00