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
juliancoffee
b892e00699
Fix hud-skill-sc_wardaura_duration key
2022-08-30 00:49:40 +03:00
Marcel
f3e13ee49d
Merge branch 'sau/update-es_ES' into 'master'
...
update the Spanish translation
See merge request veloren/veloren!3575
2022-08-29 20:19:39 +00:00
Marcel
60f05f45a7
Merge branch 'juliancoffee/better-i18n-keys' into 'master'
...
Remake price-tips internationalization
See merge request veloren/veloren!3571
2022-08-29 12:18:36 +00:00
Sau
a8ff0e4e5f
update the Spanish translation
2022-08-29 11:48:54 +00:00
Samuel Keiffer
52ce12f383
Merge branch 'floppy-music-instruments' into 'master'
...
Music Instruments
See merge request veloren/veloren!3535
2022-08-28 18:48:18 +00:00
flo
9339971032
Music Instruments
2022-08-28 18:48:18 +00:00
Marcel
1a11205dbf
Merge branch 'tygyh/Swedish-translations' into 'master'
...
Update swedish translations
See merge request veloren/veloren!3561
2022-08-28 16:38:16 +00:00
Joshua Yanovski
6032dbd22a
Merge branch 'seachapel_fixes' into 'master'
...
seachapel_fixes
See merge request veloren/veloren!3572
2022-08-27 08:03:04 +00:00
flo666
eae1c5ff69
set difficulty indicator to 4
2022-08-27 08:11:35 +02:00
flo666
1876d169c8
- Dagon, SeaCrocodile hitboxes
2022-08-27 08:06:33 +02:00
flo666
87bac7c24a
- remove barriers in chapel tube & tower tube
...
- change pitfall entry
2022-08-26 17:40:46 +02:00
juliancoffee
76cd36b179
Remake price-tips internationalization
2022-08-26 17:56:32 +03:00
Imbris
bc51d4d2a7
Merge branch 'imbris/subscription-vd-fix' into 'master'
...
Fix issue with the region subscription system not updating on view distance changes and other semi related changes
See merge request veloren/veloren!3557
2022-08-26 04:12:02 +00:00
Imbris
d3c90f9078
Update changelog, update client/src/bin/* with changes in Client API
2022-08-25 23:25:58 -04:00
Imbris
7d88baef42
Move up changelog entries that were added after the latest release
2022-08-25 23:25:31 -04:00
Imbris
4126194a5c
View distances small fixes and improvement:
...
* Properly set view_distance field in Client when sending it to the
server in request_character/request_spectator.
* Removed invalid check I had included in Client::set_view_distance
* ViewDistances::clamp now clamps min to 1 for both types of view distance.
2022-08-25 23:24:43 -04:00