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

3019 Commits

Author SHA1 Message Date
Thomas Kosel
4e174c0b17
#918 reverting wrongly merged inventory related changes. 2021-07-28 21:13:09 +02: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
Dr. Dystopia
2044cea131 Resolve unused '#[allow(clippy::needless_range_loop)]' error supressions 2021-07-24 20:22:05 +02:00
Dr. Dystopia
0a9c1d6fee Resolve unused '#[allow(clippy::redundant_pattern_matching)]' error supressions 2021-07-24 20:19:16 +02:00
Dr. Dystopia
dd13f5298d Resolve unused '#[allow(clippy::while_let_on_iterator)]' error supressions 2021-07-24 20:04:52 +02:00
Dr. Dystopia
0a926009e5 Resolve unused '#[allow(clippy::assign_op_pattern)]' error supressions 2021-07-24 20:01:11 +02:00
Joshua Barretto
b82dfc1cee 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
3b977881fe Rename find_space_opt to try_find_space. 2021-07-24 13:09:10 -04:00
Samuel Keiffer
564214cc87 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
3aa4a1018a 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
e7cba8341b 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
1912617e84 implement slowjob metrics to measuere time in queue and execution time 2021-07-22 19:31:21 +02:00
Knightress Paladin
9f86189d86 Removed exhausted check from BasicAura and reformat max call 2021-07-21 20:20:27 -07:00
Knightress Paladin
974ab07e82 Used integer types to store combo values 2021-07-21 16:46:26 -07:00
Knightress Paladin
9abe3691af Relocated BasicAura's combo reading to its static data 2021-07-21 16:46:26 -07:00
Knightress Paladin
18edd19240 Added check to prevent heal aura from being negative 2021-07-21 16:46:26 -07:00
Knightress Paladin
05a2efee52 Added exhaustion check to BasicAura to try to prevent repeated casts 2021-07-21 16:46:26 -07:00
Knightress Paladin
3b217e59aa Added check for 0 combo in healing aura strength equation 2021-07-21 16:46:26 -07:00
Dr. Dystopia
9218c3bc3b Apply same member order as in trait 2021-07-20 09:43:52 +02:00
Knightress Paladin
91ac4af88f Fixed CircleCharge and buffed Rugged Hide droppers 2021-07-18 23:12:55 -07:00
Imbris
ceb800f187 Fix check before calculating entity pushback, was causing a NaN and probably other bugs 2021-07-19 01:31:40 -04:00
Imbris
e2fc167e0c 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
00b92096c9 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
00b029d338 Make the mounter animations dependant of the mountee animation 2021-07-18 15:03:57 -04:00
Jonathan Berglin
214e6c1d42 Resolve all approved error supressions 2021-07-18 17:11:46 +00:00
Samuel Keiffer
42d6e4b118 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
d0e7ef9c92 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
fa439fb08d 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
5989a25ef2 Fixed handling of orientation changes for airships 2021-07-18 01:13:36 +01:00
Imbris
7c60b9577c Revert "Merge branch..." 
This reverts merge request !2608
 2021-07-17 22:04:59 +00:00
juliancoffee
aa9ecdfa83 Add test for duplicates in EntityConfig::meta 
+ make tests cleaner
 2021-07-17 15:37:31 +03:00
juliancoffee
4a83cb13c5 Add Automatic NameKind to EntityConfig 
+ add animal entities for wildlife spawns
 2021-07-17 15:37:31 +03:00
juliancoffee
91b3f49c15 Replace EntityConfig main/second_tool with hands 
+ Check equip_slot can hold item in LoadoutBuilder
 2021-07-17 15:37:31 +03:00
juliancoffee
335dbf4cc8 Move builder assets in EntityConfig to meta field 2021-07-17 15:37:31 +03:00
juliancoffee
b74dd21d3b Merge None-loot in EntityConfig to LootKind 2021-07-17 15:37:31 +03:00
juliancoffee
19c7355c4e Add wildlife assetization support 
+ add asset tests
+ migrate tundra animals
+ migrate taiga animals
+ declare temperate zone (animals yet to be created)
+ declare jungle zone (animals yet to be created)
+ declare tropical zone (animals yet to be created)
+ declare desert zone (animals yet to be created)
+ declare water (river inhabitants) zones (animals yet to be created)
 2021-07-17 15:37:30 +03:00
juliancoffee
f7b7f1ca4d Add Exact body field for EntityConfig 
Add Alignment field to EntityConfig

+ Migrate to specifying alignment and body in entity assets
+ Make Body required field (with Uninit if you want to specify it later)
 2021-07-17 15:37:30 +03:00
Imbris
d776cafa4a Merge branch 'aweinstock/fix-waypoint' into 'master' 
Spawn players aboveground when using `/site` or when their waypoint is underground.

See merge request veloren/veloren!2612
 2021-07-16 23:18:33 +00:00
Avi Weinstock
b9b666c2dc Address MR 2612 review comments. 2021-07-16 17:46:48 -04:00
Samuel Keiffer
651b775932 Merge branch 'knightresspaladin/healing-aura' into 'master' 
Knightresspaladin/healing aura

See merge request veloren/veloren!2587
 2021-07-16 21:32:03 +00:00
Avi Weinstock
a463b8b171 Defer repositioning until after chunks are generated normally, to reduce latency and avoid duplicate work. 2021-07-16 15:42:50 -04:00