b644ff7668
fmt
2023-03-11 08:06:46 -05:00
e8a5de4e65
Switch from custom macro for grouping cfgs to cfg_if since rustfmt can't see through macros but is hardcoded to parse cfg_if and follow the module names inside it.
2023-03-11 08:06:46 -05:00
5f85668b19
Merge branch 'camps_fixes_0' into 'master'
...
Initial quest window work, spot fixes
See merge request veloren/veloren!3815
2023-03-10 22:16:27 +00:00
277a402781
Initial quest window work, spot fixes
2023-03-10 22:16:26 +00:00
30e327d357
Italian translations
2023-03-08 19:00:11 +01:00
9396fa9741
Merge branch 'Thegaming_Life/replacing_all_map2_with_RECT_SIZE_with_cpos_to_wpos_and_wpos_to_cpos' into 'master'
...
replaced CHUNK_SIZE by RECT_SIZE everywhere, and change the use (and remove...
See merge request veloren/veloren!3807
2023-03-06 21:03:35 +00:00
5ddc55be52
replaced CHUNK_SIZE by RECT_SIZE everywhere, and change the use (and remove...
2023-03-06 21:03:35 +00:00
a25edef40e
Merge branch 'catb0t/1528-camera-zoom-lock-toggle' into 'master'
...
Allow locking camera zoom
Closes #1528
See merge request veloren/veloren!3802
2023-03-06 18:17:06 +00:00
83e4cdfe76
Allow locking camera zoom
...
Allow the camera's zoom to be locked by a keybind
or a Gameplay setting. The zoom lock
behavior can be changed between Toggle
and Auto, where Auto only locks the camera
zoom while specific movement/combat inputs
are being pressed. (closes !1528 )
A temporary fading notification is shown at the
top of the screen, informing the player of
the setting change (when the keybind is
used) or that the zoom is locked (when
the player might have forgotten the zoom
is locked, and is trying to zoom).
i18n strings are added for English and German,
but no other languages.
To implement the simplistic fading text, the
behavior was extracted into an impl
called `ChangeNotification`, where
reasons are quantified by `NotificationReason`.
2023-03-05 11:30:27 -05:00
1be69e845d
Merge branch 'camps' into 'master'
...
More spot features
See merge request veloren/veloren!3803
2023-03-03 23:21:37 +00:00
9a025cfcc8
More spot features
2023-03-03 23:21:37 +00:00
2fb20782e5
Merge branch 'zesterer/culling' into 'master'
...
Added basic culling of underground terrain and sprites
See merge request veloren/veloren!3794
2023-03-01 14:40:52 +00:00
6df7963a22
Updated changelog
2023-03-01 12:55:42 +00:00
175ae0da7b
Cleaned up implementation, addressed review comments
2023-03-01 12:54:43 +00:00
81ec1f726c
Reduced light volume bounds according to underground depth
2023-03-01 12:09:41 +00:00
fc05638490
Fix rain in caves
2023-03-01 12:09:41 +00:00
4699569eae
Made directed shadows take advantage of culling
2023-03-01 12:09:41 +00:00
de1c961141
Fixed apple sprite offset
2023-03-01 12:09:41 +00:00
0d0b7a8889
Got rid of the worst of the cull popping
2023-03-01 12:09:41 +00:00
7fa654ae4c
Clippy fixes
2023-03-01 12:09:40 +00:00
124c7e1496
Switch to camera position for culling
2023-03-01 12:09:40 +00:00
661b587c9f
Added basic culling of underground terrain and sprites
2023-03-01 12:09:40 +00:00
589fddab4e
Merge branch 'Thegaming_Life/replace_chunk_size_with_constant_in_swarm' into 'master'
...
Changed the chunk size to constant
See merge request veloren/veloren!3805
2023-02-28 10:00:54 +00:00
acbb7ccba9
Changed the chunk size to constant
2023-02-28 10:00:53 +00:00
576b183e20
build(nix): update flake.nix
2023-02-25 08:54:38 +03:00
01da8b6a82
Merge branch 'tursus_werewolf_anim&spawn_loot_tweaks' into 'master'
...
spawn and loot tweaks, tursus and werewolf anims
See merge request veloren/veloren!3790
2023-02-22 01:32:05 +00:00
98e93d1a1c
spawn and loot tweaks, tursus and werewolf anims
2023-02-22 01:32:05 +00:00
475bc5c6ff
Merge branch 'tormod/proximity-spec' into 'master'
...
Make castles appear close to towns
See merge request veloren/veloren!3801
2023-02-21 16:58:43 +00:00
7164391c40
Refactor the site enemy functions to return iterators.
2023-02-21 17:14:04 +01:00
5e506a02ef
Change warning level for failing to find site placement to debug.
2023-02-21 17:03:23 +01:00
0fbe6a67f2
Make castles appear close to towns.
2023-02-21 17:03:22 +01:00
a0dd527a1d
Refactor proximity checking to be more flexible.
2023-02-21 16:58:54 +01:00
9b6dd6198b
Merge branch 'tormod/castles-avoid-trees' into 'master'
...
Make castles avoid trees.
See merge request veloren/veloren!3799
2023-02-21 13:05:16 +00:00
90b945e18b
Make castles avoid trees.
2023-02-20 23:24:03 +01:00
63c8baffe1
Merge branch 'tygyh/Update-swedish-translations' into 'master'
...
Remove unused 'hud-chat-mod' entry
See merge request veloren/veloren!3793
2023-02-17 10:04:09 +00:00
d4274402c1
Merge branch 'frost_gigas_revived_2' into 'master'
...
frost_gigas
See merge request veloren/veloren!3769
2023-02-15 00:10:38 +00:00
bf81ffc029
frost_gigas
2023-02-15 00:10:37 +00:00
968e4b721c
Merge branch 'floppy-bird_medium_2' into 'master'
...
bird_medium_2
See merge request veloren/veloren!3706
2023-02-14 23:17:20 +00:00
0531b40fae
bird_medium_2
2023-02-14 23:17:20 +00:00
5ca04365d5
Merge branch 'catb0t/climb_no_min_energy' into 'master'
...
Don't require 10 energy for climbing
See merge request veloren/veloren!3798
2023-02-14 03:21:49 +00:00
e19a497989
Don't require 10 energy for climbing
...
The infinite climb bug should be fixed by !3792
(Refactor energy and poise regen), so we
can safely remove the need for the
character to have at least 10 energy to
climb.
The minimum energy needed to start climbing is
now 1 energy.
This was suggested by James M#8698.
2023-02-13 21:23:25 -05:00
fb5d25d268
Merge branch 'walpo/update_license_file' into 'master'
...
Update LICENSE
See merge request veloren/veloren!3796
2023-02-13 11:12:20 +00:00
d6b9a6149c
Update LICENSE
2023-02-13 11:12:20 +00:00
6b12da92af
Merge branch 'restart-watchtower' into 'master'
...
docker-compose.yml: ensure watchtower restarts too
See merge request veloren/veloren!3795
2023-02-11 19:48:40 +00:00
ca9455c37c
docker-compose.yml: ensure watchtower restarts too
2023-02-09 19:41:59 +00:00
85d01a990c
Remove unused 'hud-chat-mod' entry
2023-02-08 20:58:43 +01:00
ea15cdcfe3
Merge branch 'james/sitting-stamina-regen' into 'master'
...
Refactor energy and poise regen
See merge request veloren/veloren!3792
2023-02-07 18:02:27 +00:00
21a2a4ac46
Refactor energy and poise regen
2023-02-07 18:02:26 +00:00
aa005caff5
Merge branch 'james/fix-sword-sfx' into 'master'
...
Fix sword sfx
See merge request veloren/veloren!3791
2023-02-07 16:57:22 +00:00
87f5a3345d
Fix sword sfx
2023-02-07 16:57:22 +00:00
