b555d619fb
prefer imbris syntax proposal, documentation and changelog
2023-03-17 22:35:47 +01:00
1f976f9f1c
follow clippy's advice
2023-03-17 22:35:47 +01:00
28da420c82
enable spot addition via ron file
2023-03-17 22:35:47 +01:00
1e93648081
Merge branch 'fix_husk_brute_singlestrike' into 'master'
...
fix_husk_brute_singlestrike
See merge request veloren/veloren!3832
2023-03-15 23:02:18 +00:00
472ef6b823
fix_husk_brute_singlestrike
2023-03-15 20:32:22 +01:00
4a72979de1
Merge branch 'DuckLuck/update-hud-pickup-msg_for_pt-BR' into 'master'
...
Add "You" selector for hud-loot-pickup-msg in pt-BR translation
See merge request veloren/veloren!3831
2023-03-15 11:48:02 +00:00
04398dba49
Add "You" selector for hud-loot-pickup-msg
2023-03-14 21:22:07 -04:00
9e212935e5
Merge branch 'imbris/time-local-event-handling' into 'master'
...
Add metrics for timing subsections of State::tick
See merge request veloren/veloren!3825
2023-03-14 14:52:57 +00:00
87bf44241b
Add metrics for timing subsections of State::tick
2023-03-14 01:03:05 -04:00
ebffe9317c
Merge branch 'catb0t/zoom-defaultbind' into 'master'
...
Remove default binding for Camera Zoom Lock
See merge request veloren/veloren!3823
2023-03-13 06:15:49 +00:00
e99d2e7ca3
Remove default binding for Camera Zoom Lock
2023-03-13 06:15:49 +00:00
452d4b2121
Merge branch 'move-models-to-voxel' into 'master'
...
Move key and lockpick models to voxel folder
See merge request veloren/veloren!3826
2023-03-13 00:36:15 +00:00
29d9c9dcae
move key and lockpick models to voxel folder
2023-03-13 00:54:29 +01:00
45c8934b79
Merge branch 'xvar/queue-char-deletes' into 'master'
...
Changed character deletion to go via batch update
See merge request veloren/veloren!3562
2023-03-12 23:21:54 +00:00
6eedc02286
Changed character deletion to go via batch update
2023-03-12 23:21:53 +00:00
8febcf6b3d
Merge branch 'sam/buffs' into 'master'
...
Auras and buffs no longer need to tick every tick
See merge request veloren/veloren!3814
2023-03-12 22:06:48 +00:00
42388976d7
Fixed issue with max health change over time buff being reset if re-applied. Addressed review comments.
2023-03-12 16:37:02 -04:00
fd34e48d15
Merge branch 'floppy_bird_medium_scale' into 'master'
...
bird_medium_scale
See merge request veloren/veloren!3820
2023-03-12 18:08:21 +00:00
704af5ef7b
bird_medium_scale
2023-03-12 18:08:21 +00:00
607220b3d7
Merge branch 'DuckLuck/translations_updates_pt-BR' into 'master'
...
Update translation for pt_BR
See merge request veloren/veloren!3821
2023-03-12 07:52:22 +00:00
6b8e22d6cc
Improvements and fixes for interacting/collecting
...
* Inert entities like arrows no longer block interactions like picking
up items! Logic looking for the closest entity will skip them.
* When pickaxe is not equipped and wielded we now show "Needs Pickaxe"
as the hint text for mineable blocks.
* Mineable blocks that aren't pointed at now show the mining text hint
instead of the text hint used for regular collectible blocks.
* Fixed recent bug where all interactables were showing the open text hint.
* Split `BlockInteraction` out of the `Interaction` enum in voxygen
since we were using this enum for two different things.
2023-03-11 21:17:27 -05:00
1d9eb08a95
Update translation
...
Add new translations;
Remove 1 unused translation;
Create quest.ftl and they translations.
2023-03-11 20:08:32 -04:00
2ad53aaa36
Merge branch 'vasco/zoom' into 'master'
...
Italian translations
See merge request veloren/veloren!3813
2023-03-11 23:57:45 +00:00
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
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
cdcc605464
Update swedish translations
2023-03-11 22:41:38 +00:00
4c79936c07
Added wrapper type to durations related to buffs and auras.
2023-03-11 16:47:11 -05:00
663db06844
Made auras no longer need to be mutably accessed every tick.
2023-03-11 16:45:12 -05:00
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
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
b1b41e95f6
Queueable buffs now work with buffs without using a timer, tests too
2023-03-11 16:45:11 -05:00
e60080c293
Syncing Time from server to client now works
2023-03-11 16:45:10 -05:00
89aa934c3c
Initial work
2023-03-11 16:45:10 -05:00
26b88537da
Updated the German translation for the ability.ftl
2023-03-11 22:41:44 +01:00
19b5ed3487
Appease clippy
2023-03-11 11:06:08 -05:00
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
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
475ae65d16
Avoid extra StructureBlock clones in layer/tree.rs
2023-03-11 10:24:45 -05:00
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
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
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
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
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
fe38b9b92b
Add documentation to bool field
2023-03-11 10:21:39 -05:00
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
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
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
