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
9,460 Commits 151 Branches 18 Tags
Commit Graph

3058 Commits

Author SHA1 Message Date
juliancoffee
5e3f89960b Normalize masses in range 75-100. 
+ Remove match on body_type
 2021-08-06 11:57:42 +03:00
Ludvig Böklin
a55ac235b9 Make character upright itself even while idle 2021-08-05 08:34:21 +02:00
Samuel Keiffer
4b62e39d29 Merge branch 'ygor/fix-axe-energy-reward' into 'master' 
Allow axe combo to reward energy without skillpoint

See merge request veloren/veloren!2722
 2021-08-05 00:38:41 +00:00
Joshua Barretto
f5ea8d32f7 Fixed block snapping 2021-08-04 14:12:10 +01:00
Joshua Barretto
492a37d23a Added action timer system for agent code 2021-08-04 14:04:56 +01:00
juliancoffee
f3e8328717 Avoid negative bounds in harm checks 
* disallow_harm -> allow_harm to avoid negative reasoning since it mostly
requires double negation in code
* allow_harm -> may_harm to specify side-effect free
 2021-08-03 18:57:53 +03:00
juliancoffee
ff02f3ab06 Return self-harm 2021-08-03 16:43:56 +03:00
juliancoffee
a407276851 Refactor projectile system 2021-08-03 16:43:55 +03:00
juliancoffee
7c738fb843 Post review refactoring 
* inline `target_dodging` into struct declaration as they are named
anyway
* move `avoid_harm` check out of `Attack::apply_attack` so we don't need
to pass whole Player component.
* another cosmetic things
 2021-08-03 16:43:55 +03:00
juliancoffee
6004e76959 Prettify aura system 2021-08-03 16:43:55 +03:00
juliancoffee
77cb772159 Make Veloren compile again 2021-08-03 16:43:55 +03:00
juliancoffee
6e52bbf7a8 Add CHANGELOG note about battle_mode setting 2021-08-03 16:43:54 +03:00
juliancoffee
23c8e95f7f Refactor Aura system, add avoid_harm flag 
+ fix bug where you cast OutOfGroup on yourself and your group
 2021-08-03 16:42:58 +03:00
juliancoffee
94b48f5448 Cleaning 2021-08-03 16:42:58 +03:00
juliancoffee
eb770a7dd7 Add battle_mode server setting and player flag 2021-08-03 16:42:58 +03:00
Ygor Souza
734b98c82d Allow axe combo to reward energy without skillpoint 
When the character does not have the Double Strike Combo skill, the
ability's stage_data only contains one element, and thus the
stage_data.len() - 1 expression would set the max_energy_regen to 0.
This change forces the multiplier to 1 in this specific case, so the axe
can still reward energy without the combo skill point, to match the
other weapons.
 2021-08-03 07:10:03 +02:00
Joshua Barretto
697cf418c3 Better Agent API 2021-08-02 13:08:39 +01:00
Ludvig Böklin
0d7c0dfd50 Fix gliderwield downhill run jitter 2021-08-01 11:20:46 +00:00
Joshua Barretto
d74c2b47c8 Merge branch 'zesterer/menacing' into 'master' 
Added menacing, made agent code less hacky

See merge request veloren/veloren!2707
 2021-08-01 00:27:02 +00:00
Imbris
59490b2a89 Merge branch 'imbris/stamina-energy' into 'master' 
Replace stamina with energy

Closes #1214

See merge request veloren/veloren!2704
 2021-08-01 00:26:59 +00:00
Joshua Barretto
f311556c0b Merge branch 'imbris/small-fix' into 'master' 
Fix typo in log message and remove prefixed '_' from a few used variables

See merge request veloren/veloren!2703
 2021-07-31 21:54:25 +00:00
Joshua Barretto
243790a0df Added menacing, made agent code less hacky 2021-07-31 20:33:28 +01:00
Imbris
22b77a7a04 Replace stamina -> energy in code, i18n keys, and asset names 2021-07-31 01:34:40 -04:00
Imbris
d3c8dc268e Merge branch 'mohs/refactoring_character_behavior' into 'master' 
reducing complexity of character_behavior's run method by extracting logical pieces.

See merge request veloren/veloren!2697
 2021-07-31 02:47:55 +00:00
Imbris
330c743305 Fix typo in log message and remove prefixed '_' from a few used variables 2021-07-30 22:10:12 -04:00
Thomas Kosel
04efa90fcf
improving code quality by removing superfluous & 2021-07-30 10:12:20 +02:00
Monty Marz
2466cad155 Remove sceptre, add swords 2021-07-29 22:38:35 +00:00
Thomas Kosel
354fa7d00b
changing <Sys> to Self to be a little more speaking and less riddles. 2021-07-29 23:14:46 +02:00
Thomas Kosel
8cd690f644
renaming methods to match the names of the methods called within 2021-07-29 22:55:58 +02:00
Thomas Kosel
c51e9a6880
moving CharacterState interpreting methods to character_state.rs 2021-07-29 22:38:20 +02:00
Thomas Kosel
b6320a5cdc
reducing complexity of character_behavior's run method by extracting logical pieces. 2021-07-29 20:09:31 +02:00
Imbris
14d9d72b5c Merge branch 'imbris/1002-fix' into 'master' 
Add comment to physics and replace magic number in climbing boost with a named...

Closes #1002

See merge request veloren/veloren!2694
 2021-07-29 17:46:14 +00:00
Imbris
fe77c6c76d Merge branch 'juliancoffee/hud_refactor' into 'master' 
Skillbar hud refactoring (+ shortened key names)

See merge request veloren/veloren!2663
 2021-07-29 16:08:56 +00:00
Imbris
f0a5f0890e Add comment to physics and replace magic number in climbing boost with a named constant, fixes #1002 2021-07-29 03:11:44 -04:00
Marcel
9b30bb9e7d Merge branch 'juliancoffee/entity_refactor' into 'master' 
Improve terms of EntityConfig and LoadoutBuilder

See merge request veloren/veloren!2688
 2021-07-28 23:19:04 +00:00
Ben Wallis
f4b3d463c8 * Pets are now saved on logout and spawned with the player on login 
* Pets now teleport to their owner when they are too far away from them
* Limited the animals that can be tamed to `QuadrupedLow` and `QuadrupedSmall` to prevent players taming overly powerful creatures before the pet feature is further developed
* Added `Pet` component used to store pet information about an entity - currently only used to store the pet's database ID
* Added `pet` database table which stores a pet's `body_id` and `name`, alongside the `character_id` that it belongs to
* Replaced `HomeChunk` component with more flexible `Anchor` component which supports anchoring entities to other entities as well as chunks.
 2021-07-28 22:36:41 +00:00
Thomas Kosel
4e174c0b17
#918 reverting wrongly merged inventory related changes. 2021-07-28 21:13:09 +02:00
juliancoffee
4065f01797 Added comments on PositionSpecifier usage 2021-07-28 20:03:23 +03:00
juliancoffee
9c7f96b6c1 Improve terms of EntityConfig and LoadoutBuilder 
* rename LoadoutBuilder::new to LoadoutBuilder::empty
* remove LoadoutBuilder::default as Default makes no sense here
* move comments from template.ron to EntityConfig struct
* add FIXME comments to split EntityConfig into EntityBase and
EntityExtension
 2021-07-28 19:19:10 +03:00
juliancoffee
3487a1ae8d Deduplicate bar text 2021-07-28 10:33:51 +03:00
Thomas Kosel
554edde64d
#918 remove usages of .restrict_mut() from character_behavior.rs 2021-07-27 23:34:16 +02:00
Thomas Kosel
2ae3f9fc1e
#918 remove usages of .restrict_mut() from mount.rs and stats.rs 2021-07-27 22:22:39 +02:00
Sam
449b4bb3d5 Made swapping equipped weapons a server event instead of being called in common to prevent server-client desyncs. 2021-07-25 18:30:17 -05:00
Joshua Barretto
a9d9a28c5f Fix block-hopping with strangely sized blocks 2021-07-25 20:03:17 +01:00
Imbris
316845d7c3 Merge branch 'james/map-ui' into 'master' 
Reduce number of map layers and remove unneeded alpha channel

See merge request veloren/veloren!2676
 2021-07-25 17:24:50 +00:00
Avi Weinstock
a274d61677 Revert "Resolve all '#[allow(clippy::excessive_precision)]' error supressions" 
This reverts commit 0247ae2bf60dbc3713cba5dc9845f6a06e165c91.
 2021-07-25 12:29:21 -04:00
Avi Weinstock
b0f76da08d Revert "Resolve all '#[allow(clippy::identity_op)]' error supressions" 
This reverts commit 63eff216f050e83404629dfd84ae3c8e38e8fe54.
 2021-07-25 12:28:25 -04:00
Jonathan Berglin
ffeab0c391 Tygyh/resolve clippy error supressions 2021-07-25 15:35:14 +00:00
James Melkonian
1ec5d7b5d0 Reduce number of map layers and remove unneeded alpha channel 2021-07-24 19:54:40 -07:00
Joshua Barretto
6162076246 Merge branch 'Resolve-unused-clippy-supressions' into 'master' 
Resolve unused clippy supressions

See merge request veloren/veloren!2673
 2021-07-24 20:44:06 +00:00