Marcel
f170da4da6
Merge branch 'revert-441acd3e' into 'master'
...
Revert "Merge branch 'yusdacra/chore/nix' into 'master'"
See merge request veloren/veloren!3603
2022-09-08 09:05:53 +00:00
Joshua Yanovski
e55b541bcc
Revert "Merge branch 'yusdacra/chore/nix' into 'master'"
...
This reverts merge request !2951
2022-09-08 08:33:35 +00:00
Samuel Keiffer
aa7569061b
Merge branch 'juliancoffee/more-buffs' into 'master'
...
Add Golden Cheese debug potion
See merge request veloren/veloren!3597
2022-09-08 01:01:18 +00:00
Joshua Yanovski
c95c08ee54
Merge branch 'sharp/fix-full-server' into 'master'
...
Allow mods/admins to log in when server is full.
See merge request veloren/veloren!3600
2022-09-07 05:21:08 +00:00
Joshua Yanovski
f5aee1d2a7
Allow mods/admins to log in when server is full.
...
As a side effect, this moves the initial game server sync message into
the login code, since that's the first place we can check for admin
permissions and we want to avoid sending large messages to users who are
not authenticated (especially if the player cap has been reached;
previously, the player cap check limited the damage that could be done
by unauthenticated players).
Some fallout from this is that we don't synchronize the Player component
anymore, which had some minor effects on voxygen. This update also
breaks Torvus, since Client::new now expects the username and password
to be provided from the getgo--an accompanying MR will be submitted to
fix it.
2022-09-06 21:42:31 -07:00
Imbris
411aa3b0d9
Merge branch 'matheusclmb/update-pt_BR' into 'master'
...
pt_BR - Added all missing keys and formatted some old ones.
See merge request veloren/veloren!3556
2022-09-07 04:12:31 +00:00
Imbris
441acd3e48
Merge branch 'yusdacra/chore/nix' into 'master'
...
build(nix): refactor and update nix flake
See merge request veloren/veloren!2951
2022-09-07 03:42:28 +00:00
Yusuf Bera Ertan
cdfb2ae040
build(nix): fix recompilation issues and improve build overhead
2022-09-07 02:42:37 +03:00
juliancoffee
3cbfe02a8e
Add Golden Cheese debug item
2022-09-06 15:50:04 +03:00
juliancoffee
34c5e95d8a
Add Energy regen buff
...
* Fix broken i18n keys for health and energy increases
* Better handle buff descriptions
Calculate infobox lines for item stats to set correct infobox frame
dimensions
2022-09-06 15:50:04 +03:00
juliancoffee
54c48c7112
Extract buff executor into own function
2022-09-06 15:50:04 +03:00
Isse
7ea720b2ef
Merge branch 'creature_model_updates' into 'master'
...
Creature model updates
See merge request veloren/veloren!3584
2022-09-06 10:35:11 +00:00
flo
e4a3671345
Creature model updates
2022-09-06 10:35:10 +00:00
Samuel Keiffer
34fa03a425
Merge branch 'juliancoffee/bigger-kit' into 'master'
...
Make /kit use all weapons from possible modulars
See merge request veloren/veloren!3595
2022-09-06 04:45:12 +00:00
juliancoffee
2b3cfe690d
Adress review
...
* Make compatible_handndess check its own function and get back to
`match`
2022-09-06 00:59:15 +03:00
Samuel Keiffer
f04a17b907
Merge branch 'juliancoffee/fix-wallstuck' into 'master'
...
Reduce traversal_config min dist
See merge request veloren/veloren!3596
2022-09-04 23:51:44 +00:00
Dominik Broński
c39be960a0
Merge branch 'zDrag0nG/update-es_ES' into 'master'
...
Update Spanish Translation
See merge request veloren/veloren!3594
2022-09-04 23:41:15 +00:00
zDrag0nG
18e1b48006
Update Spanish Translation
2022-09-04 23:41:15 +00:00
juliancoffee
68da12ab6b
Reduce traversal_config min dist
...
* Fix LOS pillar cheesing
2022-09-05 02:17:15 +03:00
juliancoffee
54a1adea31
Assets work
...
* Remove endgame /kit, move cultist weapons to cultist, move legendaries
to tier-5
* Remove root_evil sceptre from endgame travelers
2022-09-05 00:24:59 +03:00
juliancoffee
421aa44d5f
Make kit generate all possible modulars
2022-09-05 00:24:58 +03:00
juliancoffee
0c5a33b031
Add functions to generate collection of modulars
2022-09-05 00:24:58 +03:00
Imbris
81b8521710
Merge branch 'imbris/server-arg-for-airshipper' into 'master'
...
Add `--server` argument to specify the server when launching voxygen.
See merge request veloren/veloren!3591
2022-09-04 19:02:43 +00:00
Yusuf Bera Ertan
511922baa5
build(nix): use correct linker in main derivation compile
2022-09-04 16:46:45 +03:00
Imbris
9dbff4c342
[voxygen] Disable editing server address if it is supplied via CLI and hide server list button (with an unlock button to re-enable editing)
2022-09-03 20:24:50 -04:00
Yusuf Bera Ertan
960aac307d
build(nix): refactor flake with new nci
2022-09-04 01:26:34 +03:00
Imbris
1888863915
Add CLI argument to voxygen that allows specifying a value to place into the server field in the main menu.
2022-09-03 17:26:07 -04:00
LunarEclipse
be9e0497d1
Fixed the ambience volume ui element positions
2022-09-03 21:56:25 +02:00
LunarEclipse
24c50fab3b
Updated the code to use the new hover icons
2022-09-03 21:56:25 +02:00
LunarEclipse
36167f2e3a
Renamed some files, added missing img_ids.
2022-09-03 21:56:25 +02:00
LunarEclipse
33ded63da9
Improved mute button assets (TODO merge with a5f446a7)
2022-09-03 21:56:25 +02:00
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
