gitlab.com/veloren/veloren commits | Ecosyste.ms: OpenCollective

Address review on 3817

94dd8c2b706f50336aba7cdd7638ac9dca5eb317 authored almost 2 years ago

Merge branch 'christof/ron_based_spots' into 'master'

enable spot addition via ron file

See merge request veloren/veloren!3824

a66888c3de99d090ce8d33941c12a06103c9ee35 authored almost 2 years ago

significant code simplification proposed by zesterer

0e73bd23ed6828c51df5b6c4ee50ccd312d89faa authored almost 2 years ago

prefer imbris syntax proposal, documentation and changelog

b555d619fb120db1f4797705e4595ea461e43460 authored almost 2 years ago

follow clippy's advice

1f976f9f1ca1700e5eaf68d6695fd4afab9bd1f7 authored almost 2 years ago

enable spot addition via ron file

28da420c828a380b29647146f4512e56647ce9ec authored almost 2 years ago

Merge branch 'fix_husk_brute_singlestrike' into 'master'

fix_husk_brute_singlestrike

See merge request veloren/veloren!3832

1e9364808163b28569670942b259a0ad883da0ee authored almost 2 years ago

fix_husk_brute_singlestrike

472ef6b8238149bdbc51644c79aaa222054b13bd authored almost 2 years ago

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/velor...

4a72979de10fe184eefbdbc06255b30036c09199 authored almost 2 years ago

Add "You" selector for hud-loot-pickup-msg

04398dba493f8ba65741808ca0879d986da1f46d authored almost 2 years ago

Merge branch 'imbris/time-local-event-handling' into 'master'

Add metrics for timing subsections of State::tick

See merge request veloren/veloren!3825

9e212935e5b2c3c79245c71b2b5db64c44cc9ff6 authored almost 2 years ago

Add metrics for timing subsections of State::tick

87bf44241b7cebac2b52a2503590c27576fc3edf authored almost 2 years ago

Merge branch 'catb0t/zoom-defaultbind' into 'master'

Remove default binding for Camera Zoom Lock

See merge request veloren/veloren!3823

ebffe9317ce4cf2675659f6b55a37feafdc638d0 authored almost 2 years ago

Remove default binding for Camera Zoom Lock

e99d2e7ca38f6a6e650025d070f1a5bdc09c41c2 authored almost 2 years ago

Merge branch 'move-models-to-voxel' into 'master'

Move key and lockpick models to voxel folder

See merge request veloren/veloren!3826

452d4b2121793a35763e92cc0c0e1819886d7adf authored almost 2 years ago

move key and lockpick models to voxel folder

29d9c9dcaef32477861b78836bc31ed7515cb1eb authored almost 2 years ago

Merge branch 'xvar/queue-char-deletes' into 'master'

Changed character deletion to go via batch update

See merge request veloren/veloren!3562

45c8934b7980156d2e18c4856ba2ef5e29f9977d authored almost 2 years ago

Changed character deletion to go via batch update

6eedc02286315945fc0b9104b7c82d60c2e5bf38 authored almost 2 years ago

Merge branch 'sam/buffs' into 'master'

Auras and buffs no longer need to tick every tick

See merge request veloren/veloren!3814

8febcf6b3d47dc04af05f2c8019512cca48ebd0d authored almost 2 years ago

Fixed issue with max health change over time buff being reset if re-applied. Addressed review comments.

42388976d746f3859e05251939dd44e96fe111d9 authored almost 2 years ago

Merge branch 'floppy_bird_medium_scale' into 'master'

bird_medium_scale

See merge request veloren/veloren!3820

fd34e48d15c6a1969fba3ac4f2d469b96487b2e0 authored almost 2 years ago

bird_medium_scale

704af5ef7b58bd66c03595ef5266a8f87f2452c3 authored almost 2 years ago

Merge branch 'DuckLuck/translations_updates_pt-BR' into 'master'

Update translation for pt_BR

See merge request veloren/veloren!3821

607220b3d7bb3f88e84d53e2a62958827b7dbe1c authored almost 2 years ago

Improvements and fixes for interacting/collecting

* Inert entities like arrows no longer block interactions like picking
up items! Logic looking...

6b8e22d6cc55a303559fba0eed5f3729ee35c699 authored almost 2 years ago

Update translation

Add new translations;
Remove 1 unused translation;
Create quest.ftl and they translations.

1d9eb08a9539c648309f22193623dcd55da20345 authored almost 2 years ago

Merge branch 'vasco/zoom' into 'master'

Italian translations

See merge request veloren/veloren!3813

2ad53aaa36715e47e92b392bd36cb10d125c74e0 authored almost 2 years ago

Merge branch 'Rovetown/update-de_DE' into 'master'

Updated the German translation for the ability.ftl

See merge request veloren/veloren!3819

bac621e6ca78ddabc3bc92c0c84e84a5b5edcb75 authored almost 2 years ago

Merge branch 'tygyh/Update-swedish-translations' into 'master'

Update swedish translations

See merge request veloren/veloren!3811

7c8fc7191bc62c2f15cd7e1f0896f6f41ff37ac5 authored almost 2 years ago

Update swedish translations

cdcc605464c470ab872a635f78d32e04ce260d00 authored almost 2 years ago

Added wrapper type to durations related to buffs and auras.

4c79936c071a6a607b0b0bb933a645acd856480e authored almost 2 years ago

Made auras no longer need to be mutably accessed every tick.

663db0684460bd4c0b6f5f15c1cf6fba73ac2a74 authored almost 2 years ago

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

8a6a60d5bb9ba25a372ad9968b51e4d1bad733f7 authored almost 2 years ago

Changed buff effects so they did not need to mutably change buffs every tick. Buff system now no longer mutably accesses buffs component.

9efac9957d7b845a27c02776383e60da1245044b authored almost 2 years ago

Queueable buffs now work with buffs without using a timer, tests too

b1b41e95f69ae73966d416ff90bc23caeb0eaac3 authored almost 2 years ago

Syncing Time from server to client now works

e60080c2937d163110e777bb3586fb9ec5a0a7e4 authored almost 2 years ago

Initial work

89aa934c3c863ba35aa9b5b092080f0334b8e03c authored almost 2 years ago

Updated the German translation for the ability.ftl

26b88537da6bb00413db23e72c24522d1ea464f3 authored almost 2 years ago

Appease clippy

19b5ed348746bd55cc54f6defdaada65cd8e5bf9 authored almost 2 years ago

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

3ad929762385f1a277321488f4a3c450aabf7b70 authored almost 2 years ago

Avoid extra StructureBlock clones in layer/tree.rs

475ae65d16f40ee2af569bdad683812cee365513 authored almost 2 years ago

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

dd6e6ccf919d8f1ffeba4657f01936e982926707 authored almost 2 years ago

Add some documentation to pos_key/key_pos/pos_chunk methods which are easy to mix up

2d66145620c1d4ea95a26f96d9316f72bbe372ab authored almost 2 years ago

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 e...

619f62cb638c52ec92f5fcbc0beafcf8ca0f6dfb authored almost 2 years ago

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...

0d8aa16d89cfcc3844d9906d78552b4a827e9de4 authored almost 2 years ago

Remove ComponentKey TODO in Inventory::get_slot_of_item since item_definition_id contains component IDs!

93eab4791d5f255312e6e624795da5147f467b89 authored almost 2 years ago

Only emit SpriteUnlocked outcome if the sprite interaction kind is Unlock. Also rustfmt decided to make a bunch of changes.

349d1726a69fc70a112833e9c70f34da2ebead59 authored almost 2 years ago

Always try to remove a block if it is bonked, even if we can't reclaim an item from it!

2eb7d366d973f9636327cb7b65d27244deb1d445 authored almost 2 years ago

Add documentation to bool field

fe38b9b92b1af5c4c95e28490cdeab025d78e703 authored almost 2 years ago

Merge branch 'imbris/fix-common-formatting' into 'master'

Fix issue with rustfmt not seeing module declarations inside of macro in `common`

See merge req...

d6ca65a44cd1ae6c42645e3b7dfe7d6aa510a36f authored almost 2 years ago

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.

e8a5de4e65e8f9ea738b79900310bccf3e0d4503 authored almost 2 years ago

fmt

b644ff766876beb6540e126d8521748c2128281d authored almost 2 years ago

Merge branch 'camps_fixes_0' into 'master'

Initial quest window work, spot fixes

See merge request veloren/veloren!3815

5f85668b19c3727ed2dc8b5503708971b3d590f6 authored almost 2 years ago

Initial quest window work, spot fixes

277a40278122f3dda3ee71ae14724ff0d0b24d85 authored almost 2 years ago

Italian translations

30e327d357d63046fd913e535adde0654c581796 authored almost 2 years ago

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 reques...

9396fa97412adf8cd490d36633ff1fd09bdd7be4 authored almost 2 years ago

replaced CHUNK_SIZE by RECT_SIZE everywhere, and change the use (and remove...

5ddc55be528bb55d74e361429831ee3dbcfdddd1 authored almost 2 years ago

Merge branch 'catb0t/1528-camera-zoom-lock-toggle' into 'master'

Allow locking camera zoom

Closes #1528

See merge request veloren/veloren!3802

a25edef40e60295e8ae120164493360b29b46d05 authored almost 2 years ago

Allow locking camera zoom

Allow the camera's zoom to be locked by a keybind
or a Gameplay setting. The zoom lock
behavio...

83e4cdfe768d0badbe1746f3479e33fa9aff292a authored almost 2 years ago

More spot features

9a025cfcc8aa0fd01ee4862c04093ab51a26e2fe authored almost 2 years ago

Merge branch 'camps' into 'master'

More spot features

See merge request veloren/veloren!3803

1be69e845d931d1730bdf9805a4840763d913fb6 authored almost 2 years ago

Merge branch 'zesterer/culling' into 'master'

Added basic culling of underground terrain and sprites

See merge request veloren/veloren!3794

2fb20782e5ea2c524f92455054d86da34b1463ec authored almost 2 years ago

Updated changelog

6df7963a22b9e53f1f8de6a90a0cf9599a9ff0ef authored almost 2 years ago

Cleaned up implementation, addressed review comments

175ae0da7b0cc5de19dc16a111569ec6b47b00af authored almost 2 years ago

Reduced light volume bounds according to underground depth

81ec1f726ca9ba7af38a9b984997f3d2cc0fe895 authored almost 2 years ago

Got rid of the worst of the cull popping

0d0b7a88896dd8c553ed996b2c81cf5410f58e03 authored almost 2 years ago

Fix rain in caves

fc0563849024ab9113440a7ba8469bab55abe38a authored almost 2 years ago

Made directed shadows take advantage of culling

4699569eaef77eb0101905c616f0fa0c7e7b7db7 authored almost 2 years ago

Fixed apple sprite offset

de1c961141b8b10db7eba7eeaad3831e7ca56086 authored almost 2 years ago

Switch to camera position for culling

124c7e1496eda6d0789f95f8e6273efdcec37f30 authored almost 2 years ago

Clippy fixes

7fa654ae4c1ed4e0ffb6f1bbb9d7b15a98c4d74f authored almost 2 years ago

Added basic culling of underground terrain and sprites

661b587c9f32bdc6dad278f65ae3ac8fa96e7eb8 authored almost 2 years ago

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

589fddab4e9408fffb74e09b56d25f6004b19a5b authored almost 2 years ago

Changed the chunk size to constant

acbb7ccba9d5ff736a6a63321207e7269a3b51ee authored almost 2 years ago

build(nix): update flake.nix

576b183e200caa2afe0c16f5b5fbacea773ab44d authored almost 2 years ago

spawn and loot tweaks, tursus and werewolf anims

98e93d1a1c61be034166173cef050cb721d4d285 authored almost 2 years ago

Merge branch 'tursus_werewolf_anim&spawn_loot_tweaks' into 'master'

spawn and loot tweaks, tursus and werewolf anims

See merge request veloren/veloren!3790

01da8b6a82589db8605d347110259c038e28e522 authored almost 2 years ago

Merge branch 'tormod/proximity-spec' into 'master'

Make castles appear close to towns

See merge request veloren/veloren!3801

475bc5c6ffe71f11b39d45686015199e68e7ea3a authored almost 2 years ago

Refactor the site enemy functions to return iterators.

7164391c40c456f5a300ceaabe1587afeb014943 authored almost 2 years ago

Change warning level for failing to find site placement to debug.

5e506a02ef6fab6cbbe0240ccad5ef877abe985d authored almost 2 years ago

Make castles appear close to towns.

0fbe6a67f2fb0f9219e80ddd248c34513a45cca4 authored almost 2 years ago

Refactor proximity checking to be more flexible.

a0dd527a1d663761e3c5dc253157966ce30ba843 authored almost 2 years ago

Merge branch 'tormod/castles-avoid-trees' into 'master'

Make castles avoid trees.

See merge request veloren/veloren!3799

9b6dd6198b0cfb6716318dc780a5f398d7f06e48 authored almost 2 years ago

Make castles avoid trees.

90b945e18b771551fdad6761320c92acf9f56ad0 authored almost 2 years ago

Merge branch 'tygyh/Update-swedish-translations' into 'master'

Remove unused 'hud-chat-mod' entry

See merge request veloren/veloren!3793

63c8baffe181f17846ac9e7b86ba548c8ecbf599 authored almost 2 years ago

Merge branch 'frost_gigas_revived_2' into 'master'

frost_gigas

See merge request veloren/veloren!3769

d4274402c1d5dbb7f9c38a48438b3aa4876efe17 authored almost 2 years ago

frost_gigas

bf81ffc029885b1ea8f6f952b4090153dccf4b87 authored almost 2 years ago

Merge branch 'floppy-bird_medium_2' into 'master'

bird_medium_2

See merge request veloren/veloren!3706

968e4b721ccf22c2c4af19fcae2aa08fe5981193 authored almost 2 years ago

bird_medium_2

0531b40fae67076a64d0399e91ef3156f3725d3c authored almost 2 years ago

Merge branch 'catb0t/climb_no_min_energy' into 'master'

Don't require 10 energy for climbing

See merge request veloren/veloren!3798

5ca04365d54dedb8cfcbfc6c6a3cc4f7b31d6899 authored almost 2 years ago

Don't require 10 energy for climbing

The infinite climb bug should be fixed by !3792
(Refactor energy and poise regen), so we
can s...

e19a49798958f56fbbedfdaad53b91da178365a5 authored almost 2 years ago

Merge branch 'walpo/update_license_file' into 'master'

Update LICENSE

See merge request veloren/veloren!3796

fb5d25d268505d5db82914516a1e47b910c8037e authored almost 2 years ago

Update LICENSE

d6b9a6149cc3fa9219bb34ef34b4a3dc586ad3f3 authored almost 2 years ago

Merge branch 'restart-watchtower' into 'master'

docker-compose.yml: ensure watchtower restarts too

See merge request veloren/veloren!3795

6b12da92affacf0d52f2addf5bfd5ca1229cbd20 authored almost 2 years ago

docker-compose.yml: ensure watchtower restarts too

ca9455c37cccc7334626853450a9b2c4c7094d12 authored almost 2 years ago

Remove unused 'hud-chat-mod' entry

85d01a990cd90024454136398ccc7f38a259e8e3 authored almost 2 years ago

Merge branch 'james/sitting-stamina-regen' into 'master'

Refactor energy and poise regen

See merge request veloren/veloren!3792

ea15cdcfe3231d82044edddeb2c1a4fe0ab57c01 authored almost 2 years ago

Refactor energy and poise regen

21a2a4ac4620c13ed1bd7c4a251afc55659840f1 authored almost 2 years ago

Merge branch 'james/fix-sword-sfx' into 'master'

Fix sword sfx

See merge request veloren/veloren!3791

aa005caff56b63f442df57a74ed3a7ea7a1048b7 authored almost 2 years ago

Fix sword sfx

87f5a3345d0e901b996410ed9a495f52385759cb authored almost 2 years ago

Merge branch 'nerf-nonpotion-drinks' into 'master'

Nerf non-potion drinks.

See merge request veloren/veloren!3788

5fb74ea1d2dc440cf87932452b7534c859e743db authored about 2 years ago