Marcel
2ad53aaa36
Merge branch 'vasco/zoom' into 'master'
...
Italian translations
See merge request veloren/veloren!3813
2023-03-11 23:57:45 +00:00
Marcel
bac621e6ca
Merge branch 'Rovetown/update-de_DE' into 'master'
...
Updated the German translation for the ability.ftl
See merge request veloren/veloren!3819
2023-03-11 23:41:54 +00:00
Marcel
7c8fc7191b
Merge branch 'tygyh/Update-swedish-translations' into 'master'
...
Update swedish translations
See merge request veloren/veloren!3811
2023-03-11 22:41:39 +00:00
Jonathan Berglin
cdcc605464
Update swedish translations
2023-03-11 22:41:38 +00:00
Sam
4c79936c07
Added wrapper type to durations related to buffs and auras.
2023-03-11 16:47:11 -05:00
Sam
663db06844
Made auras no longer need to be mutably accessed every tick.
2023-03-11 16:45:12 -05:00
Sam
8a6a60d5bb
Buffs from auras no longer need to be mutably accessed every tick in aura system to prevent applying a buff every tick and ensure duration only starts after leaving aura
2023-03-11 16:45:12 -05:00
Sam
9efac9957d
Changed buff effects so they did not need to mutably change buffs every tick. Buff system now no longer mutably accesses buffs component.
2023-03-11 16:45:11 -05:00
Sam
b1b41e95f6
Queueable buffs now work with buffs without using a timer, tests too
2023-03-11 16:45:11 -05:00
Sam
e60080c293
Syncing Time from server to client now works
2023-03-11 16:45:10 -05:00
Sam
89aa934c3c
Initial work
2023-03-11 16:45:10 -05:00
Rovetown
26b88537da
Updated the German translation for the ability.ftl
2023-03-11 22:41:44 +01:00
Imbris
19b5ed3487
Appease clippy
2023-03-11 11:06:08 -05:00
Imbris
619f62cb63
Use try_set for door destruction to avoid accidentally overwriting any
...
other changes that already occured that tick.
Also get terrain/block change resources from the ecs once to avoid the
overhead of fetching them from the ecs (and aquiring/releasing runtime
borrow).
2023-03-11 10:24:45 -05:00
Imbris
3ad9297623
Ensure outcome event bus is cleared on the client since those are unused, and add a TODO about either using them or not generating them
2023-03-11 10:24:45 -05:00
Imbris
475ae65d16
Avoid extra StructureBlock clones in layer/tree.rs
2023-03-11 10:24:45 -05:00
Imbris
dd6e6ccf91
Add Vec3::one * 0.5 to sprite item drop position instead of Vec3::unit_z, this should put the new enity in the center of the voxel that the sprite occupied
2023-03-11 10:24:45 -05:00
Imbris
2d66145620
Add some documentation to pos_key/key_pos/pos_chunk methods which are easy to mix up
2023-03-11 10:24:45 -05:00
Imbris
0d8aa16d89
Avoid duplicate searches in the inventory for required items when
...
interacting with sprites and rustfmt decides to format a bunch of
stuff...
* Add PartialEq impls between ItemDefinitionId<'_> and
ItemDefinitionIdOwned.
* Remove unused Serialize and Deserialize derives from
ItemDefinitionId<'_>
* Add Inventory::get_slot_of_item_by_def_id which acts like
Inventory::get_slot_of_item but accepts a ItemDefinitionIdOwned
reference instead of an Item reference.
* Add some TODOs for some potential optimizations
* Rustfmt decided now was the time to format some random stuff I didn't
touch. Maybe I fixed something it was getting stuck on???? But some
files I didn't make any changes (although might have inadvertantly saved
them when viewing in editor (with fmt on save)).
* InvSlotId passed to SpriteInteract character state instead of
refinding the item in the inventory (if it moved we simply give up on
the state as if the requirements weren't met). (overall in this change
3 searches for the item in the inventory are reduced to a single one)
2023-03-11 10:24:30 -05:00
Imbris
93eab4791d
Remove ComponentKey TODO in Inventory::get_slot_of_item since item_definition_id contains component IDs!
2023-03-11 10:23:16 -05:00
Imbris
349d1726a6
Only emit SpriteUnlocked outcome if the sprite interaction kind is Unlock. Also rustfmt decided to make a bunch of changes.
2023-03-11 10:23:14 -05:00
Imbris
fe38b9b92b
Add documentation to bool field
2023-03-11 10:21:39 -05:00
Imbris
2eb7d366d9
Always try to remove a block if it is bonked, even if we can't reclaim an item from it!
2023-03-11 10:21:39 -05:00
Imbris
d6ca65a44c
Merge branch 'imbris/fix-common-formatting' into 'master'
...
Fix issue with rustfmt not seeing module declarations inside of macro in `common`
See merge request veloren/veloren!3818
2023-03-11 15:14:27 +00:00
Imbris
b644ff7668
fmt
2023-03-11 08:06:46 -05:00
Imbris
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
Monty Marz
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
Monty Marz
277a402781
Initial quest window work, spot fixes
2023-03-10 22:16:26 +00:00
Francesco Vasco
30e327d357
Italian translations
2023-03-08 19:00:11 +01:00
Marcel
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
Thegaming Life
5ddc55be52
replaced CHUNK_SIZE by RECT_SIZE everywhere, and change the use (and remove...
2023-03-06 21:03:35 +00:00
Isse
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
Cat Stevens
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
Monty Marz
1be69e845d
Merge branch 'camps' into 'master'
...
More spot features
See merge request veloren/veloren!3803
2023-03-03 23:21:37 +00:00
Monty Marz
9a025cfcc8
More spot features
2023-03-03 23:21:37 +00:00
Joshua Barretto
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
Joshua Barretto
6df7963a22
Updated changelog
2023-03-01 12:55:42 +00:00
Joshua Barretto
175ae0da7b
Cleaned up implementation, addressed review comments
2023-03-01 12:54:43 +00:00
Joshua Barretto
81ec1f726c
Reduced light volume bounds according to underground depth
2023-03-01 12:09:41 +00:00
Joshua Barretto
fc05638490
Fix rain in caves
2023-03-01 12:09:41 +00:00
Joshua Barretto
4699569eae
Made directed shadows take advantage of culling
2023-03-01 12:09:41 +00:00
Joshua Barretto
de1c961141
Fixed apple sprite offset
2023-03-01 12:09:41 +00:00
Joshua Barretto
0d0b7a8889
Got rid of the worst of the cull popping
2023-03-01 12:09:41 +00:00
Joshua Barretto
7fa654ae4c
Clippy fixes
2023-03-01 12:09:40 +00:00
Joshua Barretto
124c7e1496
Switch to camera position for culling
2023-03-01 12:09:40 +00:00
Joshua Barretto
661b587c9f
Added basic culling of underground terrain and sprites
2023-03-01 12:09:40 +00:00
Marcel
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
Thegaming Life
acbb7ccba9
Changed the chunk size to constant
2023-02-28 10:00:53 +00:00
Yusuf Bera Ertan
576b183e20
build(nix): update flake.nix
2023-02-25 08:54:38 +03:00
Samuel Keiffer
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
