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
12,947 Commits 151 Branches 18 Tags 2.1 GiB
r0.14
Commit Graph

3985 Commits

Author SHA1 Message Date
Marcel Märtens
ffe7b2158d put light_emitters in par_loop to improve the runtime of the campfire lit out loop 2022-07-18 20:56:28 +02:00
Forest Anderson
67534488b3 Merge branch 'tygyh/CleanUp' into 'master' 
Tygyh/clean up

See merge request veloren/veloren!3480
 2022-07-17 14:04:45 +00:00
Youssef Fahmy
91c85dea22 Humanoid Model Overhaul 2022-07-16 11:13:24 +00:00
tygyh
120ee6b6c0 Fix typos 2022-07-15 18:59:37 +02:00
tygyh
25e20b5fa0 Remove unecesssary lifetimes 2022-07-15 16:20:15 +02:00
tygyh
cbe4d9d807 Remove unused imports 2022-07-15 16:00:27 +02:00
tygyh
fefe745508 Reorder impl member order to match trait member order 2022-07-15 15:54:32 +02:00
tygyh
5e5698249b Remove unnecessarily qualified paths 2022-07-15 14:49:46 +02:00
Christof Petig
2dce472d1f Merge branch 'christof/modular-weapon-prices' into 'master' 
Implement material (de-)composition for modular weapons, add tusk+crest+pincer to price list

See merge request veloren/veloren!3469
 2022-07-14 18:24:21 +00:00
Isse
1e3b5383cf Merge branch 'zesterer/better-rain' into 'master' 
Better rain

See merge request veloren/veloren!3464
 2022-07-13 23:25:33 +00:00
Christof Petig
bb952fe755 rustfmt the last cleanup 2022-07-13 23:38:11 +02:00
Christof Petig
edfe6d887e final polish 2022-07-13 23:32:20 +02:00
Christof Petig
eab062450a clippy helped to get rid of one level of indirection 2022-07-13 23:27:17 +02:00
Christof Petig
d2aa9028ec clippy is right about this flat_map 2022-07-13 23:17:22 +02:00
Christof Petig
197f84a360 returning a vec creates much more readable code 2022-07-13 23:03:58 +02:00
Christof Petig
3bdeb77268 Full support for modular weapon in loot table read 2022-07-13 22:56:52 +02:00
Christof Petig
a0749ac9bc test passes, not happy with implementation yet 2022-07-13 20:15:28 +02:00
Christof Petig
5bbb73bc17 changelog + remove dead code, but the test still fails 2022-07-13 20:15:28 +02:00
Christof Petig
5ee72f8a5e fix test; add tusk, crest, pincer 2022-07-13 20:15:28 +02:00
Christof Petig
8c5901516e clean up 2022-07-13 20:15:28 +02:00
Christof Petig
7a1218cf2f make a recipe of all modular weapons 2022-07-13 20:15:28 +02:00
Christof Petig
3a7835c6d0 replace one Owned reference by the normal Reference type 2022-07-13 20:15:28 +02:00
Avi Weinstock
cea2550dde Add Item::new_from_item_definition_id. 2022-07-13 20:15:28 +02:00
Christof Petig
7e5ebada2d still incomplete but looks surprisingly usable 2022-07-13 20:15:28 +02:00
Christof Petig
33a01a0dab fix compilation of example 2022-07-13 20:15:28 +02:00
Christof Petig
2b2ac20403 use ItemDefintionId across trade_pricing 2022-07-13 20:15:27 +02:00
Avi Weinstock
27d2cdeb79 WIP modular weapon pricing. 2022-07-13 20:15:27 +02:00
Socksonme
3f0f1c423c Small fixes 2022-07-12 21:01:47 +00:00
Joshua Barretto
836fe2b1c6 Proper lightning 2022-07-09 01:59:18 +01:00
Joshua Barretto
4531a4e3f9 Added lightning 2022-07-08 23:26:33 +01:00
Joshua Barretto
28bc9db198 Better cloud cover 2022-07-08 18:09:13 +01:00
Joshua Barretto
853d622e19 Better fall rate 2022-07-08 16:41:31 +01:00
Joshua Barretto
23aea72466 Fixed fall rate 2022-07-08 16:09:36 +01:00
Isse
c0f06dcb8a Merge branch 'socksonme/fix_crushing_damage_crit' into 'master' 
Group up extra damage from crushing attacks whenever they're crits

See merge request veloren/veloren!3461
 2022-07-06 21:38:41 +00:00
Socksonme
e3b1d02fce Group up extra damage from crushing attacks whenever they're crits 2022-07-06 22:59:58 +03:00
Marcel Märtens
e4909650e1 update hashbrown, specs, and tracy 2022-07-06 15:41:59 +02:00
IsseW
6d8cbe6f0f remove relative rain direction and increase FALL_RATE 2022-07-04 18:18:43 +02:00
IsseW
a7c724a46d Limit figures drawn for rain occlusion 2022-07-04 18:18:35 +02:00
IsseW
27ec6d7469 add weather_zone command 2022-07-04 18:18:33 +02:00
IsseW
9f26afb4a5 refactor rain_dir to rain_vel 2022-07-04 18:11:45 +02:00
IsseW
121cf3becc Comment fixes 2022-07-04 18:11:44 +02:00
Treeco
0d21361e05 Add player-relative rain direction 2022-07-04 18:11:42 +02:00
IsseW
fd12c8abdb Remove dead shader code, clean up weather.rs 2022-07-04 18:10:06 +02:00
IsseW
6215ccd522 Remove dead code 2022-07-04 18:07:24 +02:00
IsseW
3eabe24f12 base occlusion texture size of off voxels 2022-07-04 18:07:19 +02:00
IsseW
08b0989789 add slider for rain map resolution 2022-07-04 18:07:18 +02:00
IsseW
54f958acc7 more correct occlusion 2022-07-04 18:07:16 +02:00
DaforLynx
aafd13508d Completely redoing ambient sound again. 2022-07-04 18:07:08 +02:00
DaforLynx
16ca1410be Remove extraneous sfx code 2022-07-04 18:07:08 +02:00
DaforLynx
ca815f25a1 merging some UI sfx from a now-dead branch 
Merge part 2

merge part 3

Merge part 4

merge part 5
 2022-07-04 18:07:07 +02:00
IsseW
4fa2644507 Interpolate weather in voxygen 2022-07-04 18:07:04 +02:00
IsseW
78c1de19cf More accurate weather sim 2022-07-04 18:04:39 +02:00
IsseW
6585ef1513 weather dependant music 2022-07-04 18:11:43 +02:00
IsseW
b7c0196129 Server weather sim 2022-07-04 18:11:41 +02:00
Socksonme
6a355c58f2 Remove instance from PoiseChange 2022-06-29 18:36:05 +03:00
Socksonme
2c5fd06d0b Address review 
- Change hp_pulse to not be framerate dependent
- Change some of the HpFloater checks to be inside the find() function
- Remove unnecessary join
- Add back option for showing incoming damage + add option for
  experience accumulation
- Change `ExpFloater`s to not store the owner, as they are only shown
  for the player (will have to see if the implementation is correct so
  that it may be applied to the other floaters)
- Rename `Outcome::Damage` to `Outcome::HealthChange` and `DamageInfo`
  to `HealthChangeInfo`
- Update some outdated comments/documentation
 2022-06-29 17:31:58 +03:00
socksonme
eabbfe6a51 Remove damage batch option + crit_mult 2022-06-29 17:31:54 +03:00
socksonme
0e84794217 change font size formula to not use crit_mult + use ints for change by check 2022-06-29 17:31:43 +03:00
socksonme
3d2dcbf894 Revert some changes 2022-06-29 17:31:43 +03:00
socksonme
559d5ca804 Some changes to DamageSources + various code qual changes 2022-06-29 17:31:43 +03:00
socksonme
5360a7c93e Tons of code quality changes, added damage rounding option 2022-06-29 17:31:37 +03:00
socksonme
64f0f05608 Fixed bug with healing above 5.0 and preparing for options 2022-06-29 17:31:10 +03:00
socksonme
db16e6147c Instance inside projectile constructor is now a variable 2022-06-29 17:31:09 +03:00
socksonme
202d558246 Instance number generated inside projectile constructor, remove crit field 2022-06-29 17:31:07 +03:00
socksonme
6c75ad6ef8 Code quality changes and comments 2022-06-29 17:30:54 +03:00
socksonme
c0e78d869e Instance numbers are now based on the AttackDamage struct 2022-06-29 17:30:53 +03:00
socksonme
ac5bf53c42 Instance numbers for HpChanges 2022-06-29 17:30:50 +03:00
socksonme
f8924d6c1a tweaks to damage floaters 
Added some comments where stuff needs to be discussed
 2022-06-29 17:30:32 +03:00
socksonme
7a1e19d42c Crits now only glob with eachother, now show up like healing 
Still a WIP, need to change crits to being non-floating and try implementing crits popping, need to remove some debugging stuff later
 2022-06-29 17:30:29 +03:00
socksonme
ce95680df9 Addressed comments, health and damage floaters are now separated 
Enemy healing probably needs to be discussed as it doesn't show up as of now and the way crits are handled also needs to be discussed
 2022-06-29 17:29:59 +03:00
socksonme
94f193fbe0 Damage outcomes are now emitted with health change events 
Being healed and damaged at the same time still leads to issues - needs to be sorted out
 2022-06-29 17:29:19 +03:00
socksonme
634a3095d6 Handling crits (very bad color choice+naming) 2022-06-29 17:24:05 +03:00
socksonme
93d3ce18b4 Remove dbgs and temporary? 0.0 damage fix 2022-06-29 17:24:05 +03:00
socksonme
aee7888a92 HpFloaters are now created by Outcomes, touched up Damage Outcome 2022-06-29 17:24:05 +03:00
socksonme
bf6c6fb33d Changed Damage Outcome to store more data 2022-06-29 17:24:05 +03:00
Sam
4a5ef6dce3 Poise damage dealt to a target in a stunned state is now no longer universally applied to the target as health damage. 
Instead poise damage is only converted to health damage when its source is mitigated crushing damage.
Fixed 'Long Pole' -> 'Longpole'
 2022-06-17 21:13:45 -04:00
Imbris
950723dd0d Add metrics for counting server events 2022-06-15 00:40:58 -04:00
Samantha W
57ab1c5767 Add a client-side mutelist 2022-06-14 20:35:01 +00:00
IsseW
e05da7f6fa fix depot bug 2022-06-09 09:53:06 +02:00
Christof Petig
a55cbbbf11 move the character_state test to the systems crate (where the infrastructure is complete) 2022-06-08 07:47:20 +02:00
Christof Petig
b702a27b28 different incomplete unit test attempts [ci skip] 2022-06-08 07:46:00 +02:00
Christof Petig
f8dd030643 remove dead code, test skeleton 2022-06-08 07:46:00 +02:00
Christof Petig
9c07f204a4 introduce a fast path for the common case of already horizontal ori and small rotation changes 2022-06-08 07:46:00 +02:00
Marcel Märtens
17661d9655 Revert "massivly decrease the effects of bigger tick times on the pos calculatuion by moving the block friction calcuation into the inner iterator" 
This reverts commit 819dae754e.

I wanted to have it in the commit history though
 2022-06-07 22:57:40 +02:00
Marcel Märtens
819dae754e massivly decrease the effects of bigger tick times on the pos calculatuion by moving the block friction calcuation into the inner iterator 
do physics always after character_behavior as this one is saying how the input should be handled
 2022-06-07 22:57:17 +02:00
Marcel Märtens
997b330f19 add physics tests that verify the status quo 2022-06-07 22:53:34 +02:00
terrarier2111
45efdb6602 Implement group owned loot 2022-06-04 17:16:12 +00:00
Christof Petig
59d876a654 pass humidity to meta, move smoke cycle to separate file 2022-06-01 22:13:34 +02:00
Maxwell
14d5b2e579 added all other types of chest sprites to check for non-explodable objects 2022-05-30 22:41:57 -05:00
Maxwell
a8892bab53 updated explode_power function to make chests non-explodable 2022-05-30 22:40:59 -05:00
Sam
5e57eabd11 Code changes and msm 2022-05-30 20:25:31 -04:00
N A
c09f070241 Change animal species to have only one inventory slot 2022-05-29 23:53:00 +00:00
Christof Petig
b8c3d71fbe economy trace defaults to info 2022-05-29 19:08:39 +02:00
Benoît du Garreau
8488c7b25e Upgrade assets_manager to 0.8.0 and image to 0.24 
This removes a significant number of duplicated dependencies
 2022-05-28 23:18:31 +02:00
Ben Wallis
34f580dfaa Introduced loot ownership rules to combat loot stealing by players 
* Added `LootOwner` component used to indicate that an `ItemDrop` entity is owned by another entity
* A loot winner is now calculated after EXP allocation using the EXP per entity for weighted chance distribution
* Used existing Inventory Full overitem text to show "Owned by {player} for {seconds}secs" when a pickup fails due to a loot ownership check
* Updated agent code to take into account loot ownership when searching for `ItemDrop` targets to pick up
* Added `loot` ECS system to clear expired loot ownerships
 2022-05-28 12:06:49 +00:00
Christof Petig
2bf8e1865f Skiing and ice skating 2022-05-27 17:19:52 +00:00
Imbris
ca1a27bd11 Merge branch 'imbris/update-tracy' into 'master' 
Update tracy

See merge request veloren/veloren!3400
 2022-05-27 02:50:24 +00:00
Joshua Barretto
3b6e6be947 Merge branch 'zesterer/fix-climbing' into 'master' 
Fixed climbing

See merge request veloren/veloren!3401
 2022-05-26 09:34:10 +00:00
Joshua Barretto
4eb781cdf7 Fixed climbing 2022-05-26 10:08:41 +01:00
Imbris
a366fc4512 Update tracy 2022-05-26 00:04:03 -04:00
N A
d84a26dfd8 Special case taming and mounting. 2022-05-24 02:09:45 +00:00
Corvella
42af9b8e15 Hitbox improvements 2022-05-23 09:18:10 +00:00
Joshua Barretto
d18483756b Fixed frozen character when wall-run into water horizontally 2022-05-22 19:37:52 +01:00
Sam
bbe22d6807 Fixed bins (no assets) 2022-05-18 16:44:09 -04:00
Sam
534c7dc8b9 Simplified item key (no assets) 2022-05-18 16:28:06 -04:00
Sam
72f38068e0 Moved items from 'items.crafting_ing.modular' to 'items.modular.weapon' (no assets). 2022-05-16 15:11:44 -04:00
Sam
bcf36d08b0 Add removed items to migration. 2022-05-16 15:11:43 -04:00
Sam
54a6c31c63 Slight optimization to persistence 2022-05-16 15:11:42 -04:00
Sam
85c2a85817 Addressed review comments 2022-05-16 15:11:42 -04:00
Sam
00276acbdb More feedback addressed (no assets). 2022-05-16 15:11:41 -04:00
Sam
5d0ba6e2b8 Addressed round 3 of feedback (no assets). 2022-05-16 15:11:41 -04:00
Sam
c0dd748bc7 Addressed second round of balance feedback (no assets). 2022-05-16 15:11:40 -04:00
Sam
95c3fdffa1 Addressed playtest feedback (no assets). 2022-05-16 15:11:39 -04:00
Sam
f47cbeb022 Addressed review comments 2022-05-16 15:11:38 -04:00
Sam
de8f98446e Fixed errors in csv import, csv export, and recipe graphviz bins 2022-05-16 15:11:37 -04:00
Sam
528b62c59a Rebase commit 2022-05-16 15:11:36 -04:00
Sam
64d07d02c4 Changed item definition id to better handle modular items. 2022-05-16 15:11:34 -04:00
Sam
37442b638c Changed component recipe book to generate some stuff automatically to avoid potential for stuff inside to become unsynced (no assets). 2022-05-16 15:11:33 -04:00
Sam
afd2c8730f Addressed most review comments (no assets). 2022-05-16 15:11:32 -04:00
Sam
816c265662 Rebase stuffs 2022-05-16 15:11:26 -04:00
Sam
fceb48c3ac Removed vec allocation for component recipe iterators 2022-05-16 15:11:26 -04:00
Sam
a5a517916e Initial UI including ingredients in crafting modular components 2022-05-16 15:11:25 -04:00
Sam
085b18c07a Formatting tweaks to tooltips 2022-05-16 15:11:25 -04:00
Bryant Deters
075fee5190 modular component tooltips 2022-05-16 15:11:25 -04:00
Sam
e69aa8c4ee Fixed items with components having incorrect hashes 2022-05-16 15:11:24 -04:00
Sam
6fa7852a8c Fixed random generation of modular weapons. 2022-05-16 15:11:23 -04:00
Sam
e86d2ab46a Fixed rebase 2022-05-16 15:11:22 -04:00
Sam
cb04433c14 Fix rebase 2022-05-16 15:11:22 -04:00
Sam
d436362a8d Consolidated crafting UI for the primnary component of modular weapons. 2022-05-16 15:11:21 -04:00
Sam
5877334ed3 Tags are now generated for modular items. 2022-05-16 15:11:20 -04:00
Sam
ef5b2e4a1e Added method of differing names for 1h and 2h variants of a modular wepaon. 
Added all 1h melee weapon models.
 2022-05-16 15:11:19 -04:00
Sam
af50864643 Fixed issue in updating item config when loading persisted items. 2022-05-16 15:11:18 -04:00
Sam
bf348b7f43 Addressed further review. 2022-05-16 15:11:16 -04:00
Sam
94c19735ca Fixed broken stuff during rebase. 2022-05-16 15:11:16 -04:00
Sam
81c83c5e83 Items with components can now have their name modified by the components. Also addressed more review. NO ASSETS 2022-05-16 15:11:15 -04:00
Sam
524845b661 Addressed more comments on MR. 2022-05-16 15:11:15 -04:00
Sam
259db56ca6 Addressed more comments in MR review. 2022-05-16 15:11:14 -04:00
Sam
fa9e034757 Gave modular items a pseudo item definition id that can be used when serializing ItemBase or when persisting items to the database. NO ASSETS 2022-05-16 15:11:13 -04:00
Sam
36da0cf981 Removed inner toolkind from ModularBase::Tool. 2022-05-16 15:11:13 -04:00
Sam
a9e9a70687 Changed ModularComponent to allow it to be more extensible. Overhauled random modular weapon function so that there is less runtime cost to generate one. NO ASSETS 2022-05-16 15:11:11 -04:00
Sam
b048179c0a Changed Item to have ItemBase instead of ItemDef. ONLY ASSETS. 2022-05-16 15:11:11 -04:00
Sam
08b7bb781f Changed Item to have ItemBase instead of ItemDef. NO ASSETS. 2022-05-16 15:11:10 -04:00
Sam
5bacf526ad Began addressing initial review of modular weapons. 2022-05-16 15:11:10 -04:00
Sam
03ab68eb60 Added models for sword blade, axe head, and hammer head components. 2022-05-16 15:11:09 -04:00
Sam
2aad3f3961 Switched to item list as an input for modular components so that allowed items could be centralized. 2022-05-16 15:11:08 -04:00
Sam
539c3307a6 Fixed persistence error that would occur when dropping a modular item and then picking up that same item in the same persistence cycle. 2022-05-16 15:11:06 -04:00
Sam
33feee787b Removed stuff no longer needed after new method of crafting modular weapons. 2022-05-16 15:11:05 -04:00
Sam
00649f8ebb Added crafting method for modular weapons. 2022-05-16 15:11:04 -04:00
Sam
4f466d0523 Modular weapons now work in kits. 2022-05-16 15:11:03 -04:00
Sam
ca644f8f0b Added more interesting ingredients to recipes. 
Changed bow main component from held (grip) to damage (limbs).
 2022-05-16 15:11:02 -04:00
Sam
01450b7e34 Fixed migration to properly insert components in the correct position. Fixed small error in how names were generated for any modular weapon that used the held component as its main component. 2022-05-16 15:11:01 -04:00
Sam
21084e48f0 Removed old weapons that were migrated to modular weapons. 2022-05-16 15:11:00 -04:00
Sam
b4e86bf741 Fixed csv import 2022-05-16 15:10:59 -04:00
Sam
c10fa35fa4 Added correct names to every bow, staff, and sceptre component. 2022-05-16 15:10:58 -04:00
Sam
0a44874e88 Renamed components of bow, staff, and sceptre 2022-05-16 15:10:58 -04:00
Sam
38cb465722 Fixed loading of modular weapons from the loadout to work with nested components. 
Modular weapons can now be correctly dispalyed when wielded.
 2022-05-16 15:10:57 -04:00
Sam
0a38567e8d Modular weapons can now be properly displayed in the inventory. 2022-05-16 15:10:57 -04:00
Sam
762b3be3c3 Modular weapons can now be dropped as loot or assigned to enemies. 2022-05-16 15:10:56 -04:00
Sam
c01fe655f1 Added wood 2022-05-16 15:10:55 -04:00
Sam
d380a2dbaf Quality is now propogated through modular items from the quality of the components. 2022-05-16 15:10:55 -04:00
Sam
c6f4b51215 Removed descriptions from modular weapons and components. 2022-05-16 15:10:54 -04:00
Sam
885bb9aaa7 Added programmatic names for modular components. 2022-05-16 15:10:53 -04:00
Sam
405b9b2448 Modular weapons now have programmatically generated names. 2022-05-16 15:10:53 -04:00
Sam
4e89bc7485 Added test functions to assist in fixing unit tests that broke from changed functionality. 2022-05-16 15:10:52 -04:00
Sam
f9256ecd62 Added recipes 2022-05-16 15:10:51 -04:00
Sam
6620c1dd1f Added HandsKind to automatically resolve handedness of modular weapons. 2022-05-16 15:10:51 -04:00
Sam
85b7382487 Added handedness requirements to recipes and components. 2022-05-16 15:10:50 -04:00
Sam
2feb8f298b Removed deprecated functionality from modular weapons. 2022-05-16 15:10:49 -04:00
Sam
511f39c5ae Adds support for loading modular item from database with an arbitrary amount of component nesting. 2022-05-16 15:10:49 -04:00
Sam
77934c9214 Made changes to crafting to allow modular weapons to work as intended. 2022-05-16 15:10:48 -04:00
IsseW
fb7aa07b01 site command completion 2022-05-15 23:57:21 +02:00
Hugo Peixoto
74d4e4f45e Fix path finding calculation of starting point 
When a chaser's route finishes calculating, the chaser may already be a
few blocks away from the starting position, thanks to movement inertia.
The path finding code finds the point along the route closest to the
chaser's position.

This calculation only considered the xy coordinates when finding the
closest point. This caused issues whenever the calculated route goes
below the chaser's position (for example, when the chaser is on top of a
bridge and the route circled around to go under the bridge). In this
case, there was a chance that the closest point was the one below the
bridge. This caused the chaser to try to move directly to a directly
inaccessible block.

The fix was to remove the xy() filter so that the closest point
algorithm also considered the z coordinate.
 2022-05-14 16:41:45 +01:00
Hugo Peixoto
b681ad79ce Fix heuristic to restart route in chase() 
We had a random chance of restarting the route to avoid getting the
chaser stuck. This didn't work properly because the rerouting code was
only triggered if `self.route.is_none()` or if the target moved
significantly, and the random chance branch only set `bearing` to `None`.

This change sets `self.route = None` to trigger rerouting.
 2022-05-14 16:41:45 +01:00
Hugo Peixoto
ba6d1bce60 Remove unnecessary code 
We had an unnecessary unwrap_or_else() preceded by a question mark
operator, which means that the or_else clause could never be called.
 2022-05-14 16:41:45 +01:00
Joshua Barretto
e02f8aee65 Merge branch 'zesterer/lod-objects' into 'master' 
LoD Objects (inc. Trees)

See merge request veloren/veloren!3367
 2022-05-11 14:56:12 +00:00
Joshua Barretto
907ba3dcbc Added giant trees to LoD 2022-05-10 20:30:48 +01:00
Joshua Barretto
d4fd9d2d0e Added LoD houses 2022-05-10 19:19:46 +01:00
Joshua Barretto
7382aab13a Upped default LoD distance 2022-05-10 17:12:12 +01:00
Samuel Keiffer
1bd33bb997 Merge branch 'holychowders/streamline_stealth_coefficient' into 'master' 
Distinguish armor and sneaking stealth; Show stealth as percentage in Stats UI.

Closes #1525

See merge request veloren/veloren!3352
 2022-05-10 11:41:49 +00:00
Joshua Barretto
f35c98d1a1 Added LoD distance setting 2022-05-10 12:40:06 +01:00
Joshua Barretto
2df01385d2 Voxelise trees 2022-05-10 12:38:37 +01:00
Joshua Barretto
1db7cc7fde LoD trees in snow are white 2022-05-10 12:38:36 +01:00
Joshua Barretto
cf346d05c1 Different kinds of tree 2022-05-10 12:38:36 +01:00
Joshua Barretto
ac0e7a7724 Use dedicated fragment shader 2022-05-10 12:38:36 +01:00
Joshua Barretto
b3126ca687 Initial implementation of LoD trees 2022-05-10 12:38:36 +01:00
holychowders
fc2095803d Use inline conditional to simplify assignment. 2022-05-09 22:23:08 -05:00
Forest Anderson
cea55143ce Change outcomes to eventbus 2022-05-09 19:58:13 +00:00
Marcel Märtens
3fcf95061e before buff was around 5ms - 6ms on 100 players 2022-05-08 19:49:21 +02:00
holychowders
4c76e9314d Use sum instead of fold. 2022-05-06 19:27:30 -05:00
holychowders
1ebbf335e1 Simplify stealth logic. Remove max item stealth upper limit and restore close to original curve. 2022-05-06 19:25:03 -05:00
holychowders
e473c47bcf Distinguish stealth from armor and stealth from sneaking. Also fixes #1525. 
- Armor and sneaking have exclusive effects on overall stealth, rather
  than armor taking effect only while sneaking.

Gameplay:
- Agents factor in stealth from armor in all cases, not only when sneaking.
- Max stealth takes place when sneaking (final multiplier of `0.7`) and with stealth from armor up to `0.7` (`0.3` multiplier), resulting in a max distance modifier of about `0.5`, approximately what it was previously.
- Min stealth score from armor is now 0 instead of 2.

Internals:
- Stealth getter accounts for sneaking in final calculation, not just
  armor.
- Prevents potential division by zero.
- Stealth getter returns value that should be multiplied instead of divided.
- Legitimized stealth as a score between 0 and 1.

Notes:
- FIXME: Someone more familiar with the different armor types may want to adjust their stealths.
  - Armor stealths seem to be valued between `0.0` and `1.0`, and I've reinforced this in the code. However, it is possible, particularly for the `Dragonscale` armors, to cumulatively reach a value of `2.0`.
 2022-05-06 13:15:46 -05:00
holychowders
9c68fbbeed Fix agents not hearing sounds due to reduced listen_dist, caused by commit a6955e5af. 
- `listen_dist` has been restored to normal and the behavior intended by
  the trouble commit has been much more properly encoded.
 2022-05-04 21:22:19 -05:00
Marcel
84ab219cf3 Merge branch 'xMAC94x/update-toolchain' into 'master' 
update toolchain to `nightly-2022-04-25`

See merge request veloren/veloren!3343
 2022-05-03 14:07:49 +00:00
Marcel Märtens
697673bcca update toolchain to nightly-2022-04-25 2022-05-03 15:22:28 +02:00
Samuel Keiffer
3abba05fb8 Merge branch 'holychowders/improve_perception_system' into 'master' 
Agent: Use FOV when scanning for hostile targets and refactor `choose_target()`.

See merge request veloren/veloren!3307
 2022-05-02 22:45:14 +00:00
Jonathan Berglin
144d6d41f7 Extract 'calculate_projection_and_collision_dist' function 2022-05-02 09:14:17 +00:00
Marcel
593d8fa4b5 Merge branch 'xMAC94x/update_vek' into 'master' 
switch to upstream vek again

See merge request veloren/veloren!3342
 2022-05-02 08:34:21 +00:00
holychowders
a6955e5afb Re-add listen_dist check in choose_target() and add randomness to simulate agents detecting entities directly behind them. 2022-05-01 19:18:43 -05:00
holychowders
dda85e4bc3 Address code review. 2022-05-01 18:23:23 -05:00
holychowders
d3873e357e Agent: Use FOV when scanning for hostile targets and refactor choose_target(). 
- Refactors `choose_target()`, renaming it and extracting functions with more meaningful names and more correct behavior.
- Adds FOV for agents scanning for hostile targets.
 2022-05-01 17:29:45 -05:00
holychowders
914b44c714 Fix villagers seeing cultists and familiar enemies through objects. 2022-05-01 15:06:43 +00:00
Marcel Märtens
d70c8dd160 remove unused file 2022-04-28 12:23:55 +02:00
Marcel Märtens
fa49248c31 switch to upstream vek again 2022-04-28 09:10:55 +02:00
Youssef Fahmy
aec866e5ec Balance tweaks 2022-04-23 14:54:01 +00:00
Samuel Keiffer
7b1e7046df Merge branch 'fix_sneak_on_mount' into 'master' 
Fixed being able to sneak on mount

See merge request veloren/veloren!3296
 2022-04-16 16:56:47 +00:00
Plright
cffa980f24 Fixed being able to sneak on mount 2022-04-16 16:56:47 +00:00
juliancoffee
1b18629616 Execute asset migration 2022-04-08 19:17:01 +03:00
juliancoffee
f875c0b5d4 Adress review 2022-04-08 16:37:06 +03:00
juliancoffee
8a1d665b0d Box inlined LoadoutSpec 2022-04-07 18:44:16 +03:00
juliancoffee
11bf16e3d7 Make ItemSpec and Hands untagged 2022-04-07 18:44:16 +03:00
juliancoffee
13324700ba Post-cleaning 2022-04-07 18:44:16 +03:00
juliancoffee
faeac0eef3 Fully implement tests for new EntityConfig 2022-04-07 18:44:15 +03:00
juliancoffee
dd02e8ae6a Add loadout spec examples 2022-04-07 18:44:15 +03:00
juliancoffee
cfba7bfc65 Add validation functions to LoadoutSpec 2022-04-07 18:44:15 +03:00
juliancoffee
7cd5a694b2 Dummy implementation of LoadoutSpec tests 2022-04-07 18:44:15 +03:00
juliancoffee
a4908cf5ae Implement migration for EntityConfig 2022-04-07 18:44:15 +03:00
juliancoffee
15431e7f7a Dummy implementation for EntityConfig migration 2022-04-07 18:44:15 +03:00
juliancoffee
357b953e3b Implement new InventorySpec for EntityConfig 
* Add new InventorySpec which uses Inline loadout spec
* Disable all tests!
 2022-04-07 18:44:15 +03:00
juliancoffee
77f8d6da6f Remove old loadout_builder::LoadoutSpec 2022-04-07 18:44:15 +03:00
juliancoffee
f791dace7f Avoid writing None fields in LoadoutSpecNew 
* use serde(skip_serializing_if = "Option::is_none")
 2022-04-07 18:44:15 +03:00
juliancoffee
48c7e29db2 Add comment migrations to asset_migrate 2022-04-07 18:44:15 +03:00
juliancoffee
b81904efd1 Implement migration script for LoadoutSpec 2022-04-07 18:44:15 +03:00
juliancoffee
3f7bfff8d7 Implement all needed features 
+ Multiple/Random inheritance for loadout configs
+ Using ItemSpecNew in Hands
+ Rename Hands::Specific to Hands::InHands to represent non-random
  combination
 2022-04-07 18:44:14 +03:00
juliancoffee
5e07875be9 Add LoadoutSpecNew with new loadout config 
Changes from old config:
* Structure instead of HashMap which allows us have multiple types for
  fields.
* Using error propagating instead of panic, which opens possibility for
  better error messages.
* Implemented inheritance.
* New Hands type for more practical way of declaring weapons/tools.
 2022-04-07 18:44:14 +03:00
Marcel Märtens
64b9602760 update further dependencies, including strum and get rid of old strum_macro 2022-04-04 16:06:47 +02:00
Marcel Märtens
affdf3131f update a bunch of dependencies, including clap3 2022-04-04 11:43:29 +02:00
flo
3d24b1d635 CliffTowns 2022-03-29 12:52:08 +00:00
Jack hollis-london
aeae94d31b small refactor per code review 2022-03-27 20:25:19 +02:00
jh0l
403a523ec7 refactor: ♻️ move voxygen hud update definitions from common/trade to voxygen/hud & trade 2022-03-27 20:24:23 +02:00
jh0l
de70ce61d8 feat: ✨ a TextEdit input in the trade window so that users can specify the amount of an item to trade by typing 2022-03-27 20:24:21 +02:00
jh0l
6f22f31376 feat: ✨ a TextEdit input in the trade window so that users can specify the amount of an item to trade by typing 2022-03-27 20:24:18 +02:00
Justin Shipsey
aee1aa7c1d Merge branch 'holychowders/prevent_undesired_movement_on_agent_interaction' into 'master' 
Agent Perception: Improve Awareness System

See merge request veloren/veloren!3263
 2022-03-26 00:28:18 +00:00
Christof Petig
aeac483bac parallel simulation of economies 2022-03-21 23:35:08 +01:00
Mehmet-dev
903e216d32 fixing blood particles on bodies not supposed to bleed from gameplay perspective 2022-03-20 15:45:50 +00:00
James Melkonian
8c06dc9a5c Add chunk reload command (admin only) 2022-03-19 08:43:38 +00:00
Olexorus
cf66eccb75 Use Rust 2021 postfix .into_iter() 2022-03-15 16:34:56 +01:00
Imbris
6d101419c7 Merge branch 'imbris/small-fixed' into 'master' 
Small logging filter directives refactor including removing: "ignoring ``: invalid...

See merge request veloren/veloren!3271
 2022-03-13 16:37:45 +00:00
DaforLynx
7b6f424bb0 Loud rivers 2022-03-13 07:47:23 +00:00
Imbris
e00cd7685b Small logging filter directives refactor including removing: "ignoring ``: invalid filter directive"message that always appeared when using RUST_LOG env var 2022-03-13 01:37:52 -05:00
DaforLynx
123fee2707 Fix swim sfx, fix glider sfx, add glide sfx 2022-03-13 05:44:07 +00:00
holychowders
df91f665d7 Agent Perception: Restrict when idling agents respond to sounds. 
- Prevent utterances and other sounds from causing undesired jitters and
  fleeing, such as those caused by greeting villagers.
- Agents will no longer flee from quieter weapon sounds such as melee.
 2022-03-12 16:58:06 -06:00
Marcel Märtens
167e3321e1 put tracy in a seperate scope 2022-03-08 20:57:55 +01:00
Christof Petig
c3d6b8c250 crafting factor was wrongly used as well … 2022-03-05 13:18:09 +01:00
Christof Petig
d02018f893 hotfix for sunflow ice tea costing 16x the amount of its ingredients 
also makes price debugging output more readable
 2022-03-05 13:07:55 +01:00
Sam
bc7c088a12 More sensible vertical limit to what melee attacks can hit 2022-03-03 20:03:32 -05:00
Sam
0542e46e7d Lighting works now hackily 2022-03-03 01:11:01 -05:00
Sam
b558331b32 Finishing touches 2022-03-03 01:10:55 -05:00
Christof Petig
f347b9de11 Diversify price calculation for items by using multiple categories per item. 2022-03-03 02:32:34 +00:00
ubruntu
94a9b407c2 Fix waypoints being movable 2022-02-28 19:20:37 +00:00
Imbris
e52159f638 Remove original character from game world when possessing to make persistence more robust. 2022-02-27 13:47:13 -05:00