Imbris
6b54bedcd0
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
9fb6b84670
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
01d1089a46
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
680492cea6
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
01ca6911a9
* 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
c8527491cc
#918 reverting wrongly merged inventory related changes.
2021-07-28 21:13:09 +02:00
juliancoffee
4adc045627
Added comments on PositionSpecifier usage
2021-07-28 20:03:23 +03:00
juliancoffee
14ac9a8b4e
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
1bdab02aad
Deduplicate bar text
2021-07-28 10:33:51 +03:00
Thomas Kosel
acb7f5dc4b
#918 remove usages of .restrict_mut() from character_behavior.rs
2021-07-27 23:34:16 +02:00
Thomas Kosel
27f666622f
#918 remove usages of .restrict_mut() from mount.rs and stats.rs
2021-07-27 22:22:39 +02:00
Sam
f164d6036e
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
199d56b1db
Fix block-hopping with strangely sized blocks
2021-07-25 20:03:17 +01:00
Imbris
1a081cdc5b
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
edad38098f
Revert "Resolve all '#[allow(clippy::excessive_precision)]' error supressions"
...
This reverts commit 0247ae2bf6
2021-07-25 12:29:21 -04:00
Avi Weinstock
516ad1c772
Revert "Resolve all '#[allow(clippy::identity_op)]' error supressions"
...
This reverts commit 63eff216f0
2021-07-25 12:28:25 -04:00
Jonathan Berglin
cd2992afd3
Tygyh/resolve clippy error supressions
2021-07-25 15:35:14 +00:00
James Melkonian
54eb97b9de
Reduce number of map layers and remove unneeded alpha channel
2021-07-24 19:54:40 -07:00
Joshua Barretto
37077b5703
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
Dr. Dystopia
db48e30ea1
Resolve unused '#[allow(clippy::needless_range_loop)]' error supressions
2021-07-24 20:22:05 +02:00
Dr. Dystopia
f039321cd7
Resolve unused '#[allow(clippy::redundant_pattern_matching)]' error supressions
2021-07-24 20:19:16 +02:00
Dr. Dystopia
c577a7d677
Resolve unused '#[allow(clippy::while_let_on_iterator)]' error supressions
2021-07-24 20:04:52 +02:00
Dr. Dystopia
575db6f51d
Resolve unused '#[allow(clippy::assign_op_pattern)]' error supressions
2021-07-24 20:01:11 +02:00
Joshua Barretto
6fa3ac610b
Merge branch 'aweinstock/fix-waypoint-2' into 'master'
...
Further improve handling of underground waypoints:
See merge request veloren/veloren!2665
2021-07-24 17:59:58 +00:00
Avi Weinstock
5dd56b724c
Rename find_space_opt to try_find_space.
2021-07-24 13:09:10 -04:00
Samuel Keiffer
85b9f70469
Merge branch 'knightresspaladin/fix-circle-charge' into 'master'
...
Fixed CircleCharge and buffed Rugged Hide droppers
See merge request veloren/veloren!2613
2021-07-23 14:56:36 +00:00
Avi Weinstock
ca10d89068
Further improve handling of underground waypoints:
...
- Set the waypoint to the valid position after chunk load, so that respawns work.
- Search for the nearest valid surface before falling back to the top of the chunk, so that waypoints inside caves/buildings work.
2021-07-22 23:03:52 -04:00
Marcel Märtens
baf19b4d60
remove an unused queue_created in the Queue, might be added in the future again for more metrics. Also use core than std in one place
2021-07-22 20:57:16 +02:00
Marcel Märtens
7d93d907f6
implement slowjob metrics to measuere time in queue and execution time
2021-07-22 19:31:21 +02:00
Knightress Paladin
7ce9a3e284
Removed exhausted check from BasicAura and reformat max call
2021-07-21 20:20:27 -07:00
Knightress Paladin
c48a7c0072
Used integer types to store combo values
2021-07-21 16:46:26 -07:00
Knightress Paladin
578cacc194
Relocated BasicAura's combo reading to its static data
2021-07-21 16:46:26 -07:00
Knightress Paladin
9be690770a
Added check to prevent heal aura from being negative
2021-07-21 16:46:26 -07:00
Knightress Paladin
ce31ac9fd1
Added exhaustion check to BasicAura to try to prevent repeated casts
2021-07-21 16:46:26 -07:00
Knightress Paladin
68725a0131
Added check for 0 combo in healing aura strength equation
2021-07-21 16:46:26 -07:00
Dr. Dystopia
9abd066e53
Apply same member order as in trait
2021-07-20 09:43:52 +02:00
Knightress Paladin
081c6e5362
Fixed CircleCharge and buffed Rugged Hide droppers
2021-07-18 23:12:55 -07:00
Imbris
d2b8a5a169
Fix check before calculating entity pushback, was causing a NaN and probably other bugs
2021-07-19 01:31:40 -04:00
Imbris
3e6fd0ee1d
Setup animation mount points for quadruped medium, update offsets in
...
common for new quadruped mediums, properly transform the offset in the
mount system using ori, fix issue with composing in the base ori with
the mounting bone ori in voxygen.
2021-07-18 15:09:36 -04:00
Imbris
b2bf83e200
Rework mounting animation so that full hierarchies of animation transforms can be applied to the mounter, factor out some common code in figure/mod.rs
2021-07-18 15:04:02 -04:00
Snowram
09cbb90f61
Make the mounter animations dependant of the mountee animation
2021-07-18 15:03:57 -04:00
Jonathan Berglin
b15f426ee5
Resolve all approved error supressions
2021-07-18 17:11:46 +00:00
Samuel Keiffer
37147e2a83
Merge branch 'juliancoffee/overworld_assetization' into 'master'
...
Wildlife assetization
See merge request veloren/veloren!2591
2021-07-18 13:43:32 +00:00
Joshua Barretto
1501f0467e
Merge branch 'zesterer/small-fixes' into 'master'
...
Fixed handling of orientation changes for airships
See merge request veloren/veloren!2640
2021-07-18 08:29:50 +00:00
Imbris
30119a6afc
Re-address approx_constant lint without using fractional constants and
...
re-add a few blank lines
2021-07-17 20:41:09 -04:00
Joshua Barretto
eade248e1f
Fixed handling of orientation changes for airships
2021-07-18 01:13:36 +01:00
Imbris
9c72333741
Revert "Merge branch..."
...
This reverts merge request !2608
2021-07-17 22:04:59 +00:00
juliancoffee
021d5c60de
Add test for duplicates in EntityConfig::meta
...
+ make tests cleaner
2021-07-17 15:37:31 +03:00
juliancoffee
23a020f602
Add Automatic NameKind to EntityConfig
...
+ add animal entities for wildlife spawns
2021-07-17 15:37:31 +03:00
juliancoffee
d04364b1f1
Replace EntityConfig main/second_tool with hands
...
+ Check equip_slot can hold item in LoadoutBuilder
2021-07-17 15:37:31 +03:00
