Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,483 Commits 151 Branches 18 Tags 2.1 GiB
2e047f6723
Commit Graph

4169 Commits

Author SHA1 Message Date
Sam
c3026d388a Defensive stance required abilities 2023-03-21 19:58:11 -04:00
Sam
a3d655970e Heavy stance required abilities 2023-03-21 19:56:32 -04:00
Sam
e0a7449a99 Crescent slash 2023-03-21 19:39:40 -04:00
Sam
fce9211d49 Secondaries for all stances 2023-03-21 19:39:39 -04:00
Sam
596fe715b8 Cleaving stance skill abilities. 2023-03-21 19:39:39 -04:00
Sam
c23139d501 Agile stance skill abilities. 2023-03-21 19:39:37 -04:00
Sam
ed0de15a5a Heavy stance skill abilities. 2023-03-21 19:39:35 -04:00
Sam
57806d7be9 Sword M1 abilities 2023-03-21 19:39:22 -04:00
Sam
61f0b424b9 Old sword mostly torn out, new sword framework in place 2023-03-21 19:39:22 -04:00
Sam
5f126bb5c6 Queued inputs are now culled after a period of time if they are not actively held 2023-03-21 19:39:19 -04:00
Sam
7ec9a7677f Stances change secondary abilities now. Contextual abilities try to fallback to no context if skill not owned for contextual ability. 2023-03-21 19:38:18 -04:00
Sam
b376228d45 Primary and secondary abilities can now be contextual. BasicStance character state added. 2023-03-21 19:38:15 -04:00
Sam
9875008efa Added stance component that persists even after sheathing weapon (does not yet work with M1 replacement). 2023-03-21 19:29:34 -04:00
Sam
d0a46ed82b Inputs now remain queued even when the input is released, until the input is used. 2023-03-21 19:26:06 -04:00
Imbris
61cb0ad39b Merge branch 'imbris/small-tweaks' into 'master' 
Various small tweaks / fixes

Closes #1475

See merge request veloren/veloren!3817
 2023-03-18 00:52:20 +00:00
Imbris
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
Imbris
87bf44241b Add metrics for timing subsections of State::tick 2023-03-14 01:03:05 -04:00
Ben Wallis
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
Ben Wallis
6eedc02286 Changed character deletion to go via batch update 2023-03-12 23:21:53 +00:00
Samuel Keiffer
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
Sam
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
flo
704af5ef7b bird_medium_scale 2023-03-12 18:08:21 +00:00
Imbris
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
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
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
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
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
277a402781 Initial quest window work, spot fixes 2023-03-10 22:16:26 +00: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
Monty Marz
9a025cfcc8 More spot features 2023-03-03 23:21:37 +00:00
Thegaming Life
acbb7ccba9 Changed the chunk size to constant 2023-02-28 10:00:53 +00:00
flo
98e93d1a1c spawn and loot tweaks, tursus and werewolf anims 2023-02-22 01:32:05 +00:00
flo
bf81ffc029 frost_gigas 2023-02-15 00:10:37 +00:00
Christof Petig
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
flo
0531b40fae bird_medium_2 2023-02-14 23:17:20 +00:00
Cat Stevens
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
Marcel
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
James Melkonian
21a2a4ac46 Refactor energy and poise regen 2023-02-07 18:02:26 +00:00
James Melkonian
87f5a3345d Fix sword sfx 2023-02-07 16:57:22 +00:00
flo666
d219cdd97c spawns & hitboxes 2023-01-31 20:34:41 +01:00
flo666
9c09000256 - change bristlemane to bristleback 
- axebeak tweaks
 2023-01-31 20:34:41 +01:00
flo666
e109f5c377 axebeak, tursus 2023-01-31 20:34:40 +01:00
flo666
75bfbff2c3 bristlemane 2023-01-31 20:34:40 +01:00
flo666
271b80b832 seal 2023-01-31 20:34:40 +01:00
Marcel
c165d28e7d Merge branch 'wyvern_wings' into 'master' 
wyverns

See merge request veloren/veloren!3720
 2023-01-28 21:25:17 +00:00
flo
5e1fd02095 wyverns 2023-01-28 21:25:17 +00:00
Ellen Sun
d774319cf0 cleanup and fixes + added change to CHANGELOG.md 2023-01-27 20:32:41 -05:00
Ellen Sun
74cb514094 move client commands to voxygen + add Admin to be shared with client for permissions + unit test for alphabetical server command 2023-01-27 20:31:56 -05:00
Ellen Sun
361e5204e3 added levenshtein for most similar string and words starting with what user entered + check permissions + added clientside commands to /help 2023-01-27 20:31:56 -05:00
poggly
75ccd65ec6 initial commit, todo comment and realphabetized ServerChatCommand enum 2023-01-27 20:31:56 -05:00
Corvella
dcd3fb2077 Correctly apply LoD distance setting and improve documentation on projectile fixes 2023-01-26 14:27:59 +00:00
Joshua Barretto
88ac238121 Merge branch 'joedonofry/dropped_lantern_glow' into 'master' 
Add glow to dropped lanterns

See merge request veloren/veloren!3772
 2023-01-23 16:13:43 +00:00
Joseph Donofry
74ee861dde Add glow to dropped lanterns 2023-01-23 16:13:43 +00:00
Isse
4fdcbeeb71 Update dot_vox dependency 2023-01-22 18:00:39 +01:00
Avi Weinstock
aba6f6654e Add a new particle mode for potion sickness. 2023-01-19 15:06:14 -05:00
Avi Weinstock
dc6e61983c Make potion sickness's healing multiplier only affect potions. 2023-01-19 15:06:13 -05:00
Avi Weinstock
adaf8ef6f4 Add a background to make the buff multiplicities more visible, and show the shortest timer for stackable buffs. 2023-01-19 15:06:13 -05:00
Avi Weinstock
1b00b18a7b Show buff multiplicities as a number instead of duplicate icons. Add particle effects for the beginning of potion sickness. 2023-01-19 15:06:13 -05:00
Avi Weinstock
a871d3880b Address MR 3756 review comments. 2023-01-19 15:06:13 -05:00
Avi Weinstock
78845a0d73 Implement potion sickness, which causes diminishing returns on healing from potions. 2023-01-19 15:06:12 -05:00
Joshua Barretto
da9cd79973 Merge branch 'zesterer/canary' into 'master' 
Added canary asset

See merge request veloren/veloren!3770
 2023-01-18 23:02:07 +00:00
Joshua Barretto
63d0c937f0 Removed existing LFS check 2023-01-18 22:31:33 +00:00
Joshua Barretto
44f4dcc6f7 Added canary asset 2023-01-18 22:01:00 +00:00
Nils Ascheuer
21f417dbef Added Changelog 2023-01-18 14:40:21 +01:00
Nils Ascheuer
f9e1aca045 #1694 Faster Energy Regeneration-acceleration while sitting 2023-01-18 10:44:09 +01:00
Marcel
a537d52f48 Merge branch 'james/fix-bats' into 'master' 
Make bats easier to combat and fix hitbox scaling bug

See merge request veloren/veloren!3759
 2023-01-16 11:34:09 +00:00
Corvella
ef5737360b Improve Projectile/Entity Hit Detection 2023-01-16 05:58:28 +00:00
James Melkonian
9d31baf500 Make bats easier to combat and fix hitbox scaling bug 2023-01-15 16:25:43 -08:00
Joshua Barretto
295e3c4109 Merge branch 'floppy-autodelete_of_summoned_sprites' into 'master' 
autodelete of summoned sprites

See merge request veloren/veloren!3735
 2023-01-15 18:28:38 +00:00
flo
650ef9a5e2 autodelete of summoned sprites 2023-01-15 18:28:38 +00:00
flo
98c1e68209 Fix wall cheese 2023-01-14 15:41:07 +00:00
Marcel
2ff24259be Merge branch 'zesterer/lod-models' into 'master' 
New LoD model, wind sway pays attention to wind velocity

See merge request veloren/veloren!3739
 2023-01-02 14:51:00 +00:00
Matas Minelga
3850d3e86e
Inventory sorting MR fixes and slight improvements 2023-01-01 02:36:03 +02:00
Joshua Barretto
f48e1ca951 Make wind sway change according to weather wind velocity 2022-12-31 17:40:40 +00:00
Joshua Barretto
873d3fb7a4 Added dead trees to LoD 2022-12-31 15:32:56 +00:00
Matas Minelga
040c9fe6ee
Inventory: Implemented dynamic and better ordering by Category 2022-12-31 02:32:41 +02:00
Benoît du Garreau
4fbb0b9a0b Update to `assets_manager 0.9 2022-12-14 00:54:34 +01:00
Isse
ef2c1633ed Merge branch 'isse/bridges' into 'master' 
Bridges

See merge request veloren/veloren!3680
 2022-11-30 15:07:03 +00:00
Marcel Märtens
4a1404cd71 fix leftovers from toolchain update 2022-11-30 15:14:47 +01:00
IsseW
7296843923 simple bridges 2022-11-30 15:13:52 +01:00
Marcel Märtens
225cbf472f update tag and fix empty maps, other bugs introduced by auto fix 2022-11-29 09:19:10 +01:00
Marcel Märtens
2812729b78 cargo clippy lifetimes 2022-11-28 15:19:57 +01:00
Marcel Märtens
dad73ba2a3 fix clamp clippy errors 2022-11-28 14:26:27 +01:00
Marcel Märtens
0ab7a2543e fix clippy errors 2022-11-28 14:08:11 +01:00
Marcel Märtens
ba3747a3f0 update toolchain 2022-11-28 14:08:11 +01:00
Marcel
2f990fb06e Merge branch 'holychowders/store_last_known_pos' into 'master' 
Store Target's Last Known Position

See merge request veloren/veloren!3698
 2022-11-20 22:38:14 +00:00
holychowders
61aa49fa66 Add last_known_pos to Target struct. 2022-11-16 18:26:07 -06:00
Samuel Keiffer
5709427e63 Merge branch 'sam/small-fixes' into 'master' 
Small fixes for sword

See merge request veloren/veloren!3694
 2022-11-16 23:33:12 +00:00
Marcel
997c5a4e61 Merge branch 'ythern/more_unique_abilities' into 'master' 
Ythern/roshwalr kit

See merge request veloren/veloren!3692
 2022-11-15 09:58:06 +00:00
Eternalisime
71e59e4b81 combat: tweaks and modified shockwave animation 2022-11-13 22:04:00 +01:00
Sam
4784b61656 Small fixes 2022-11-13 14:03:37 -05:00
Samuel Keiffer
1173c8257f Merge branch 'holychowders/agent_awareness2' into 'master' 
Rework internal representation of agent awareness

See merge request veloren/veloren!3661
 2022-11-12 18:48:32 +00:00
holychowders
95fd092e26 Fix awareness changes. 2022-11-12 12:12:32 -06:00
flo
0351bf1d63 Moss Drake 2022-11-12 13:00:42 +00:00
Eternalisime
8f4863be28 combat: balance tweaks on roshwalr 2022-11-11 10:22:23 +01:00
Eternalisime
f1b77e27fe combat: lowered flee_health on roshwalr 2022-11-10 16:57:29 +01:00
Eternalisime
918d5eb345 combat: added a unique kit to roshwalr 2022-11-10 13:53:12 +01:00
LunarEclipse
32abb59132 Updated some of my personal info 2022-11-08 23:06:32 +01:00
DaforLynx
b2b14e7ab4 Event music can use more than one event at a time. Added test for soundtracks. 2022-11-07 22:39:25 +00:00
holychowders
571b07d54a Remove dt and multiplication by 30. 2022-11-06 13:10:17 -06:00
Avi Weinstock
372ffe45d7 Add command for debugging ways. 2022-10-29 14:32:48 -04:00
holychowders
641a5c4cda Merge branch 'master' of gitlab.com:veloren/dev/veloren into holychowders/agent_awareness2 2022-10-29 13:21:27 -05:00
Avi Weinstock
08a50afd9f Mostly working train tracks. 2022-10-28 21:36:42 -04:00
holychowders
3d4ad29d1d Flee if attacked even if attacker is not close. 2022-10-28 21:31:49 +00:00
holychowders
3f3f8605af Merge branch 'master' of gitlab.com:veloren/dev/veloren into holychowders/agent_awareness2 2022-10-28 15:16:44 -05:00
holychowders
4426972057 Refer to the fully aware state of an agent as "alert". 2022-10-28 15:03:11 -05:00
Sam
0fe073fcdc Addressed feedback from testing 2022-10-27 20:07:10 -04:00
Sam
b5682c4682 Addressed review comments 2022-10-27 20:07:09 -04:00
Sam
a44c36432e Fixed that equipping weapons by using them from hotbar would bypass equipping animation. 2022-10-27 20:07:09 -04:00
Sam
1782408676 Address UX issues of contextual abilities. 2022-10-27 20:07:08 -04:00
Sam
e1f76e0127 Fixed sword AI after contextualized sword abilities. 2022-10-27 20:07:08 -04:00
Sam
8cfe62e6dc Activated abilities can now be contextualized 2022-10-27 20:07:07 -04:00
Sam
07d273aa09 Removed unneccessary term in skill point cost calculation 2022-10-27 20:07:07 -04:00
Sam
172c9e0689 Fixed inability to use abilities while in a stance 2022-10-27 20:07:07 -04:00
Sam
273949369f Fix unit tests 2022-10-27 20:07:06 -04:00
Sam
5674923a54 Changed exp/sp progression for sword skill tree 2022-10-27 20:07:06 -04:00
Sam
38ce87d80b Initial balance pass on sword ability stats 2022-10-27 20:07:05 -04:00
Sam
2e8ad96121 Stances now require a small amount of time to enter them 2022-10-27 20:07:05 -04:00
Sam
df9ef691fd Cleaving stance AI 2022-10-27 20:07:03 -04:00
Sam
c97bfdfb94 Defensive stance AI 2022-10-27 20:07:01 -04:00
Sam
7dcb3582e6 Sword AI for offensive abilities 2022-10-27 20:07:01 -04:00
Sam
4ab3abfc07 Balanced stance AI 2022-10-27 20:07:01 -04:00
Sam
221b0aff5f Sword AI can now choose their abilities 2022-10-27 20:07:00 -04:00
Sam
8d3567b6b2 Made combo melee more ergonomic to use when it is a stance 2022-10-27 20:06:59 -04:00
Sam
21aabb5663 Parries now correctly return to their stance. 2022-10-27 20:06:58 -04:00
Sam
21dedb54b9 Fixed bug where you couldn't properly exit an ability if you had a return ability but lacked the requirements to return 2022-10-27 20:06:58 -04:00
Sam
b3a15f61aa Fixed issue where you could cancel combo melee 2 mid strike 2022-10-27 20:06:58 -04:00
Sam
5757b0bdf0 Abilities are now more expensive when in a mismatched stance if that stance is not the balanced stance. 2022-10-27 20:06:57 -04:00
Sam
5974646a3c You can now leave a stance by using the corresponding ability input 2022-10-27 20:06:57 -04:00
Sam
a2242b28f4 If you were in a stance when you used an ability, return to that stance after the ability is complete. 2022-10-27 20:06:56 -04:00
Sam
a8212d6f41 Dive melee now scales its attack off of the entity's vertical speed. 
Parries now cause the attacker to effectively have a recover that is either twice as long or 0.5s longer, whichever is more.
Counters now deal twice as much damage to the target if the target is in the buildup portion of an ability.
 2022-10-27 20:06:55 -04:00
Sam
9091d46554 Animation for reaching charge. Changed dash melee code to probe with a test melee instead of performing the actual melee strike during charge. 2022-10-27 20:06:53 -04:00
Sam
7c22847009 Animation for parrying parry 2022-10-27 20:06:48 -04:00
Sam
e03e137793 Combo melee tweaks 2022-10-27 20:06:40 -04:00
Sam
da21e1cb02 Removed air slash stance and abilities 2022-10-27 20:06:40 -04:00
Sam
2116842d30 Bin program to generate dot files for skill trees 2022-10-27 20:06:37 -04:00
Sam
eacbdefb75 Skill point prerequisites and costs 2022-10-27 20:06:37 -04:00