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
14,630 Commits 151 Branches 18 Tags 2.1 GiB
4e0e94b5c6
Commit Graph

2322 Commits

Author SHA1 Message Date
Sam
0ff06edcdc Combo melee skips recover if continuously striking. Combo animations consolidated to one file. 2022-10-27 20:06:27 -04:00
Sam
17258975fc Combo melee 2 state 2022-10-27 20:06:26 -04:00
Marcel
51d4c8dd51 Merge branch 'halloween' into 'master' 
Halloween event

See merge request veloren/veloren!3668
 2022-10-25 21:37:34 +00:00
Samuel Keiffer
f676e732f6 Merge branch 'flaffwaffle/action_state_concurrent_states' into 'master' 
ActionState extensions to allow for multiple concurrent state variables And More Complex AI

See merge request veloren/veloren!3659
 2022-10-25 03:21:46 +00:00
Timothy Finnegan
1922d69154 Ran Cargo fmt 2022-10-24 19:52:37 -07:00
IsseW
9a6a3a05a1 bat config 2022-10-25 00:31:04 +02:00
kitswas
c83ec87d6a Code cleanup 2022-10-24 22:05:11 +05:30
kitswas
e29a9f4e36 Colour reflects old poise state 2022-10-24 22:05:11 +05:30
kitswas
b21764c99f Added tick mark for the upcoming threshold 2022-10-24 22:05:11 +05:30
kitswas
be586aa84f Extracted hard-coded poise thresholds to a constant 2022-10-24 22:05:11 +05:30
Timothy Finnegan
5e5e1066eb Added support for multiple timers, conditions, and counters in a single action node. 2022-10-23 18:31:09 -07:00
James Melkonian
6bacb487f3 Bat AI 2022-10-23 20:05:39 +02:00
flo666
586d0f6dd8 add bat (created by Gemu) 2022-10-23 20:05:39 +02:00
flo666
79e6fd58fe - make tricksters spawn in groups and play instruments 
- remove defunct draugr flee
 2022-10-23 20:05:39 +02:00
flo666
e1bd385408 make draugrs Npcs flee at health below 100%, 
trickster gear,
single spawns (trickster, dullahan),
 2022-10-23 20:05:39 +02:00
holychowders
7502cd664a Have agents update awareness of targets. 
This is preliminary and has no visible effect.
 2022-10-21 20:25:54 -05:00
holychowders
f45c465c75 Add new Awareness struct. 2022-10-20 11:36:29 -05:00
holychowders
bc20744cd3 Remove old unused awareness stuff. 2022-10-20 11:36:16 -05:00
Monty Marz
2d8627c29b Add gnarling chieftain mask 2022-10-15 11:05:21 +00:00
Avi Weinstock
e6576f0cf3 Make the trading AI for pets only accept food. 2022-09-30 15:11:03 -04:00
Avi Weinstock
60f5383f8b Address comments for MR 3633. 2022-09-30 14:51:49 -04:00
Avi Weinstock
c62bc0dd0d Allow pets to be traded with. 2022-09-30 14:51:49 -04:00
Marcel Märtens
cf6a764aa4 update toolchain to 2022-09-23 2022-09-25 15:58:32 +02:00
Samuel Keiffer
59d8d287d9 Merge branch 'seachapel_npc_work' into 'master' 
seachapel npc work

See merge request veloren/veloren!3599
 2022-09-22 01:04:01 +00:00
flo
a37e1f8d99 seachapel npc work 2022-09-22 01:04:01 +00:00
Joshua Yanovski
1c14ec7ee1 Parallelize ingame messages. 2022-09-21 10:25:57 -07:00
Joshua Yanovski
67231aff90 Remove persistence loading error from SkillSet. 
This is needed (for now) in order to parallelize ingame_chat, because
one of the handled messages updates this value on the server.  It turns
out that the value is not actually used on the server, only the client,
so this was mostly a matter of threading this back to the correct place.
Additionally, we took the opportunity to modify the UI to not log you
into the game until your character was confirmed to be loaded, which
was a todo item that lets us simplify some error handling logic and
remove stuff from global state.
 2022-09-21 09:29:25 -07:00
flo
dc688bccb9 fix_salamander_and_elbst 2022-09-13 17:32:53 +00:00
Joshua Yanovski
aea4aca057 Merge branch 'xmac94x/steal-sharps-clippy-improvements' into 'master' 
Xmac94x/steal sharps clippy improvements

See merge request veloren/veloren!3612
 2022-09-11 19:56:35 +00:00
flo
e43608ce80 add guitar & instrument sample edits 2022-09-10 17:23:38 +00:00
Joshua Yanovski
986d104faa Update Rust toolchain. 2022-09-08 15:43:53 -07:00
juliancoffee
34c5e95d8a Add Energy regen buff 
* Fix broken i18n keys for health and energy increases
* Better handle buff descriptions
Calculate infobox lines for item stats to set correct infobox frame
dimensions
 2022-09-06 15:50:04 +03:00
Isse
7ea720b2ef Merge branch 'creature_model_updates' into 'master' 
Creature model updates

See merge request veloren/veloren!3584
 2022-09-06 10:35:11 +00:00
flo
e4a3671345 Creature model updates 2022-09-06 10:35:10 +00:00
juliancoffee
2b3cfe690d Adress review 
* Make compatible_handndess check its own function and get back to
  `match`
 2022-09-06 00:59:15 +03:00
juliancoffee
421aa44d5f Make kit generate all possible modulars 2022-09-05 00:24:58 +03:00
juliancoffee
0c5a33b031 Add functions to generate collection of modulars 2022-09-05 00:24:58 +03:00
flo
6c89cd8fbf put Organ under Toolkind Instrument 2022-08-30 16:55:02 +00:00
Samuel Keiffer
52ce12f383 Merge branch 'floppy-music-instruments' into 'master' 
Music Instruments

See merge request veloren/veloren!3535
 2022-08-28 18:48:18 +00:00
flo
9339971032 Music Instruments 2022-08-28 18:48:18 +00:00
flo666
1876d169c8 - Dagon, SeaCrocodile hitboxes 2022-08-27 08:06:33 +02:00
flo
e882e62c08 seachapel 2022-08-24 21:50:53 +00:00
Joshua Barretto
51d90707b5 Relaxed automod somewhat 2022-08-23 10:03:06 +01:00
Imbris
275b17be57 Merge branch 'imbris/misc_fix' into 'master' 
Trade canceling related tweaks, make kill_npcs not leave clutter (and actually remove entities in the first place), and misc tweaks

See merge request veloren/veloren!3555
 2022-08-21 16:35:16 +00:00
DaforLynx
656727ecbd Miscellaneous audio fixes 2022-08-21 05:32:02 +00:00
Imbris
ca66a9f79b Fix bug in Health::kill that caused Destroy event to never be emitted by preemptively setting is_dead to true 2022-08-20 18:47:09 -04:00
juliancoffee
69cea513ee Make comments to be doc-comments 2022-08-20 22:30:25 +03:00
juliancoffee
6319dcfc22 Add more components in /body 
* Add mass
* Add density
* Add collider.
This one is strange as always, I don't know what's wrong, but debug hitbox
changes only after death. Real one seems to work.
 2022-08-20 17:02:08 +03:00
Tormod Gjeitnes Hellen
e306b3bfe3
Have the ambushers say something. 
Very unsure about the way I did this...
 2022-08-17 23:50:09 +02:00
Samuel Keiffer
a1b5f53d15 Merge branch 'craft-all' into 'master' 
Craft all

See merge request veloren/veloren!3525
 2022-08-12 00:47:48 +00:00
Julio Cezar Silva
9315482fc4 Craft all 2022-08-12 00:47:48 +00:00
Joshua Barretto
602de267b1 Perform validation on all kinds of chat message 2022-08-11 11:11:33 +01:00
IsseW
87821d5c1d force update counter 2022-08-09 19:22:09 +02:00
Imbris
d5b59c2bb7 Convert away from IdvStorage to mixture of VecStorage and DenseVecStorage 2022-08-08 00:38:20 -04:00
Sam
28a4ce9be1 Various tweaks 2022-07-26 19:44:49 -04: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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
914b44c714 Fix villagers seeing cultists and familiar enemies through objects. 2022-05-01 15:06:43 +00:00
Youssef Fahmy
aec866e5ec Balance tweaks 2022-04-23 14:54:01 +00:00
juliancoffee
f875c0b5d4 Adress review 2022-04-08 16:37:06 +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
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
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
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
Mehmet-dev
903e216d32 fixing blood particles on bodies not supposed to bleed from gameplay perspective 2022-03-20 15:45:50 +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
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
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
ninefox
61913402a2 add code to center item drops 
reduce size of coins
 2022-02-23 17:16:10 -08:00
Marcel
df7cd2da1a Merge branch 'isse/shared-waypoints' into 'master' 
Shared and persistent waypoints

See merge request veloren/veloren!3162
 2022-02-20 10:10:18 +00:00
Isidor Nielsen
a685a353cb Shared and persistent waypoints 2022-02-20 10:10:18 +00:00
James Melkonian
7f21cbf4bc Fix airship command by splitting out ships 2022-02-18 08:34:14 +00:00
Samuel Keiffer
6c7c0eefae Merge branch 'gnarlings' into 'master' 
Gnarlings

See merge request veloren/veloren!3194
 2022-02-15 00:22:37 +00:00
Sam
6dafacaa24 Addressed review comments 2022-02-13 21:49:46 -05:00
unvariant
9d98cd9e58 Render item drops instead of placeholder textures 2022-02-14 02:09:45 +00:00
UncomfySilence
a0d43cb21d further balance changes 2022-02-13 10:35:19 +01:00
Sam
c77270b799 Addressed feedback 2022-02-12 20:52:01 -05:00
jshipsey
2eee43865f chieftain anims 2022-02-11 02:18:48 -05:00
Sam
4991f7ecea Gnarlign site tweaks and chieftain buff 2022-02-11 01:23:09 -05:00
Sam
bf7e84c6ae Initial particle work 2022-02-10 14:58:37 -05:00
Sam
0031aa6f5f Chieftain AI and attacks 2022-02-10 14:58:35 -05:00
Sam
fcb0f8d8f0 Wood golem attacks and ai 2022-02-10 14:58:32 -05:00
Sam
e044bf5091 Mandragora attacks and ai 2022-02-10 14:58:32 -05:00
Sam
f1801560fa Deadwood ai 2022-02-10 14:58:31 -05:00
Sam
82c976919e Darts are now darts. 2022-02-10 14:58:29 -05:00
jshipsey
6d34a6b544 wallrunning 2022-02-09 19:34:23 -05:00
phoenix13032005
7a1f0d9fa1 Balance update 
+ Make icons for Mino and Mindy dungeons with their faces
+ Adjust loot tables
+ Adjust names with respect to the lore of @Gemu
 2022-02-09 12:13:42 +02:00
Tormod G. Hellen
82273f0f36 Make friendly creatures defend each other. 2022-02-08 22:32:25 +01:00
Jonathan Berglin
3bdc7b1bb9 Add documentation to Agent functions 2022-02-07 23:56:03 +00:00
James Melkonian
f21e0f31fb Restrict RtSim ships to airships 2022-02-03 21:41:20 -08:00
Christof Petig
42faef9ab0 clippy is right, 
but I don't want to rearrange print_sorted (test). so reduce overall strictness
 2022-01-31 22:25:38 +01:00
Christof Petig
080444fc8b juliancoffee prefers this style 2022-01-31 22:19:21 +01:00
Christof Petig
f4f1b5c77b more stable sorting 2022-01-31 22:00:23 +01:00
Christof Petig
dc92d0ab12 fix multiple calls of init 2022-01-31 21:31:08 +01:00
Christof Petig
d8edd70837 create a nice csv table for comparison 2022-01-31 21:19:23 +01:00
Christof Petig
47aba3e4cd clean up double rescaling 2022-01-31 20:52:25 +01:00
Christof Petig
6b9180bba6 separate amount from probability 2022-01-31 19:45:39 +01:00
Christof Petig
12fedef98f fix some test cases 2022-01-31 19:45:39 +01:00
juliancoffee
45ba21796c Add test cases 2022-01-31 19:45:39 +01:00
Christof Petig
8230323a76 fix code quality 2022-01-31 19:45:39 +01:00
Christof Petig
66c431ba86 cargo fmt 2022-01-31 19:45:39 +01:00
Christof Petig
a98b9ad049 normalize loot tables before combining them, take current values for a start 2022-01-31 19:45:38 +01:00
Christof Petig
8228437b22 load loot table only once, add utility function and test cases 2022-01-31 19:45:38 +01:00
Justin Shipsey
612f084831 Merge branch 'slipped/bipeds' into 'master' 
Slipped/bipeds

See merge request veloren/veloren!3163
 2022-01-31 17:08:01 +00:00
Avi Weinstock
5f8957d8ef Globally allow the clippy lints {new_without_default, many_single_char_names, identity_op, type_complexity, too_many_arguments}. 2022-01-30 20:16:20 +01:00
jshipsey
7cac4b4001 myrmidon fix 2022-01-30 02:02:23 -05:00
jshipsey
4fbd3027a1 new mobs 2022-01-28 02:50:15 -05:00
juliancoffee
e1bfa6c7e2 remove outdated comment 2022-01-28 00:02:34 +02:00
juliancoffee
765311add0 Add entity config migration tool 2022-01-28 00:02:34 +02:00
Dr. Dystopia
b0d6a68e8c Create 'push_initiate_invite' function 2022-01-26 21:23:37 +01:00
Dr. Dystopia
027154a5be Create 'push_invite_response' function 2022-01-26 21:16:29 +01:00
Dr. Dystopia
0516526985 Create 'push_utterance' function 2022-01-26 21:12:19 +01:00
Dr. Dystopia
765e858c19 Create 'push_cancel_input' function 2022-01-26 21:07:36 +01:00
Dr. Dystopia
b2b208687c Create 'push_basic_input' function 2022-01-26 20:09:59 +01:00
Dr. Dystopia
bc0a8c7704 Create 'push_action' function 2022-01-26 19:52:19 +01:00
floppy
fb316e8f66 SeaCrocodile spawning in tropical Oceans 2022-01-24 19:36:13 +01:00
Forest Anderson
d3aa224f15 Merge branch 'tygyh/Fix-warnings' into 'master' 
Fix warnings

See merge request veloren/veloren!3051
 2022-01-23 19:25:35 +00:00
Forest Anderson
1bcda9da7b Merge branch 'maveth/skill-improvements' into 'master' 
Test for cyclic skill dependencies

See merge request veloren/veloren!3098
 2022-01-23 18:35:58 +00:00
Dr. Dystopia
bb48267827 Fix warnings 2022-01-23 19:03:47 +01:00
Joshua Barretto
8a684973b4 Merge branch 'zesterer/tiny-fixes' into 'master' 
Addressing criticisms

See merge request veloren/veloren!3121
 2022-01-22 16:44:01 +00:00
Sam
fe1db1e9e0 Can move around, so character state system runs 
Hotbar now visible
Can't yet activate skillbar abilities, only M1 and M2
 2022-01-20 15:26:35 -05:00
Joshua Barretto
f8783487a8 Preventing gliding when mounted, allowed dancing 2022-01-20 12:53:08 +00:00
Snowram
a6e396e29a Stunned and jump anims, stats, spawns, more IA work 2022-01-20 00:53:29 +01:00
Snowram
f6d7ba33ef Arthropods spawns and loots 2022-01-19 19:01:16 +01:00
jshipsey
82df5f23c3 spit anim 2022-01-19 19:01:16 +01:00
jshipsey
269b1fcd00 summon an 2022-01-19 19:01:15 +01:00
Snowram
38bbd60fd2 Arthropod basic attack 2022-01-19 19:01:14 +01:00
Snowram
6da42e61ab Arthropod jump attack, hitboxes 2022-01-19 19:01:14 +01:00
Snowram
1e6ead4005 Arthropod charge 2022-01-19 19:01:13 +01:00
Snowram
02ed6ffd60 More arthropod work 2022-01-19 19:01:13 +01:00
Snowram
ae71f2e4f0 Adds poisoned debuff (energy change over time) 2022-01-19 19:01:13 +01:00
Snowram
fa549eece7 Adds new arthropod species 2022-01-19 19:01:12 +01:00
Snowram
f67bf2a539 Adds arthropod skeleton 2022-01-19 19:01:11 +01:00
Imbris
59d195b9bc Merge branch 'imbris/component-sync' into 'master' 
Sync some components only from the client's own entity.

See merge request veloren/veloren!3108
 2022-01-19 07:44:14 +00:00
Samuel Keiffer
c3e92b6c7a Merge branch 'sam/melee-constructor' into 'master' 
Melee Constructor

See merge request veloren/veloren!3111
 2022-01-19 06:36:51 +00:00
Sam
f93b85368d Addressed review comments. 2022-01-19 00:56:44 -05:00
Imbris
3beb3c8205 Address review comments 2022-01-19 00:56:42 -05:00
Imbris
374bd10e5d Small comment fixes 2022-01-19 00:56:42 -05:00
Imbris
cc40058ae2 Reduce extra energy updates 2022-01-19 00:56:42 -05:00
Imbris
5494bd31f2 Sync SkillSet from all entities for now since it is needed for some things in voxygen, fix character_behavior system always triggering energy and density modification flags 2022-01-19 00:56:42 -05:00
James Melkonian
ac6f53922f Move agent code into separate files 2022-01-18 03:02:43 +00:00
Sam
b0644ca767 Melee attacks are now created through a melee constructor. 2022-01-17 20:41:24 -05:00
Maveth
fa6e5f2cec Add a comment explaining something unintuitive 2022-01-17 10:39:58 -06:00
Joshua Barretto
9c565dadc5 Merge branch 'zesterer/mount-everest' into 'master' 
Mount Everest

See merge request veloren/veloren!3101
 2022-01-17 13:21:38 +00:00
Sam
31a894601f Removed health sclaing from summon character state. 2022-01-16 18:18:23 -05:00
Joshua Barretto
20509a7818 Removed mounted combat edge cases 2022-01-16 19:28:53 +00:00
Joshua Barretto
043016a433 Don't try to mount unmountable entities, clippy fixes and fmt 2022-01-16 17:53:14 +00:00
Joshua Barretto
504e2a38d5 Added overhead hints, smoother mount movement 2022-01-16 17:53:14 +00:00
Joshua Barretto
2923d3cd2b Made NPCs prefer food when idle 2022-01-16 17:53:13 +00:00
Joshua Barretto
537cc38b5e Fixed lantern position when mounting 2022-01-16 17:53:13 +00:00
Joshua Barretto
b3e2d825ed Overhauled mounting to make it more reliable 2022-01-16 17:53:13 +00:00
Sam
7ae8ed09f6 Addressed MR comments. 2022-01-15 21:50:27 -05:00
Sam
ed38272d23 Diary stats now use real values. 2022-01-15 21:46:55 -05:00
Sam
d0e487da8a Ability sets now start with non-empty defaults. 2022-01-15 21:45:27 -05:00
Sam
4c3771a1a0 Persistence of auxiliary abilities. 2022-01-15 21:42:34 -05:00
Sam
d86692c4fe Added in-memory persistence of ability sets per weapon kind pair. 2022-01-15 21:42:34 -05:00
Sam
cf724bd76c Initial UI work 2022-01-15 21:42:32 -05:00
Sam
9b6c76bd3b Removed health scaling that bypasses the skill system. 2022-01-15 11:58:28 -05:00
Tormod G. Hellen
3afa16bf03 Fix hotbar changing when sorting inventory. 
Previously the hotbar slots would refer to inventory slots. An
unfortunate consequence of this was that when the contents of an
inventory slot changed, so would the corresponding hotbar slot
change. This commit fixes that.
 2022-01-14 19:14:24 +01:00
Tormod G. Hellen
a33e6df303 Remove unused code. 2022-01-14 18:23:42 +01:00
jshipsey
475fc1631f akhlut 2022-01-13 23:20:58 -05:00
jshipsey
1fac6359de more gnarling weapons 2022-01-13 23:20:56 -05:00
jshipsey
7f928d0bc0 woodengolem, chieftain, icedrake, blowgun 2022-01-13 23:20:52 -05:00
Maveth
c8f083aa44 Thank you clippy, very cool 2022-01-13 12:31:51 -06:00
Maveth
167c9b2113 Test for cyclic skill dependencies 2022-01-13 12:21:11 -06:00
Sam
8c2a484ee5 Addressed review comments. 2022-01-12 22:19:00 -05:00
Sam
e98edbcc7a Conversion of poise damage to health damage now scales depending on the poise state the target is in. 
Entities are now immune to poise damage for 1 second after exiting a poise state.
Rebalanced most phyiscal damage attacks on player-accessible tools.
 2022-01-12 22:18:59 -05:00
Sam
2e2e56661f Tweaked poise effects and thresholds. 2022-01-12 22:18:59 -05:00
Sam
d1e1de3b14 Slashing damage now decreases target's energy if available, and if target has no remaining energy will do additional damage. 
Piercing damage now ignores an amount of protection equal to the piercing damage value.
Crushing damage now does poise damage equal to the amount of mitigated damage.
When poise damage is dealt while in a poise state, poise damage is instead converted to damage.
 2022-01-12 22:18:58 -05:00
Sam
2e09feb426 Tweaks to prompt dialog. 2022-01-03 19:55:06 -05:00
Sam
efbc5f9b75 UI notifying player that their skillset has been invalidated. 2022-01-03 19:55:06 -05:00
Sam
0a9f3381f5 Skill points now attempt to be earned as experience is added. 2022-01-03 19:55:05 -05:00
Sam
da78800047 Changed skill groups to be a hashmap instead of a vec. 2022-01-03 19:55:05 -05:00
Sam
6d2496b7de Changed skill group to store available_exp instead of spent_exp to help enforce certain invariants. Addressed more review coments. 2022-01-03 19:55:04 -05:00
Sam
8221336587 Addressed some review. 2022-01-03 19:55:04 -05:00
Sam
64c8321626 Made skill groups remain locked if skill to unlock them not acquired. 2022-01-03 19:55:03 -05:00
Sam
903c57b862 Persitence now tracks spent_exp as an additional point to potentially invalidate skills. 2022-01-03 19:55:03 -05:00
Sam
c8675eaf45 Added hash value to decide if we should invalidate persited skills and allow a respec. 2022-01-03 19:55:02 -05:00
Sam
356eae85a6 Skillsets now store an ordered vec of skills that is used to track order that skills were acquired in. 2022-01-03 19:55:01 -05:00
Sam
27dd7b4391 Refactored skills code. 2022-01-03 19:55:01 -05:00
Sam
c44c10718b Split skillset and skills into separate files. 2022-01-03 19:55:00 -05:00
Sam
fe45a158ed Skill groups now only persist earned_exp instead of available_exp, earned_sp, and available_sp. 2022-01-03 19:55:00 -05:00
DoctorKompot
0dba858ca9 fixed turban specifier in item image manifest, reverted bag size for purified soulkeeper, updated item quality colors in mod files 2021-12-27 03:01:26 +02:00
Imbris
bf48bd5346 update toolchain to nightly-2021-12-19 2021-12-23 13:04:24 +01:00
ubruntu
59cb9ea7c2 Hide empty stats on item tooltips 2021-12-20 15:07:38 +00:00
ubruntu
333bc0bed8 Fix stat comparisons in item tooltips 2021-12-18 02:31:30 +00:00
Samuel Keiffer
9684fe09b7 Merge branch 'holychowders/allow_most_npcs_to_flee_again' into 'master' 
Re-allow and Improve Agents' Fleeing

See merge request veloren/veloren!2950
 2021-12-16 01:12:03 +00:00
Benoît du Garreau
aca088388b Update assets_manager to 0.7 2021-12-12 22:11:47 +01:00
James Melkonian
5f6d1c3438 Convert Armor Stats to Options 2021-12-12 00:25:35 +00:00
holychowders
b40d94dd53 Re-allow and improve fleeing. 2021-12-07 20:18:03 -06:00
Jonathan Berglin
596307c9b7 Remove unused clippy suppressions 2021-12-05 17:59:02 +00:00
Marcel Märtens
ef40ebe0c8 update toolchain to nightly-2021-11-24 2021-11-24 10:09:22 +01:00
Kemper
d37dbf5d24 Adjust hitboxes for husk and medium birds 
The hitbox of the husk did not include the head and the hitboxes
of the medium birds were far too wide.
 2021-11-19 06:18:13 +00:00
Marcel Märtens
086f9737e4 move server.voxel for airship to common 2021-11-15 16:39:39 +01:00
Marcel Märtens
cd516d0912 name it just manifests rather then tmp_manifests 2021-11-15 09:47:38 +01:00
Marcel Märtens
d24b904563 move ship_manifest to common assets until its properly included in servers ECS and pushed to clients 2021-11-15 09:00:12 +01:00
Ben Wallis
022c1417b6 EXP on kill is now shared between damage contributors. A "damage contributor" is either an individual entity, or a group - depending if the attacker is in a group. This means that not only does the "killing blow" no longer get 100% of EXP, but multiple groups and individuals all receive their fair share of EXP on death (assuming they are still within range of the entity when it dies). 
Damage from a given individual or group only counts towards a kill for 10 minutes since that individual or group's last damage to the entity - after this period their damage contribution is removed. This avoids the list of damage contributors growing excessively large for an entity that does a lot of combat but never dies.

EXP sharing within groups is unchanged - the difference is simply that the input to this calculation may be less than 100% of the base EXP reward for the kill if other individuals or groups contributed damage.
 2021-11-13 20:46:45 +00:00
Joshua Barretto
657ac45288 Updated changelog 2021-11-13 17:13:09 +00:00
Joshua Barretto
46ec4203a2 Arbitrary volume airships 2021-11-13 17:13:08 +00:00
Sam
f65c89862c Removed vec allocation with an impl Iterator. 2021-11-11 22:43:25 -05:00
Sam
a288f9ee43 Addressed further review. 2021-11-11 22:37:37 -05:00
Sam
dfcb8c8519 Addressed review feedback. 2021-11-11 18:10:22 -05:00
Sam
b678f7f46e Added some client methods for changing abilities to hook into. 2021-11-11 01:55:32 -05:00
Sam
da677e8ea6 Abilities can now be referred to by the asset id. 2021-11-10 17:30:19 -05:00
Sam
4309e1ff9b Did voxygen stuff for ability pool. 2021-11-09 21:20:41 -05:00
Sam
d33ff9f17e Ability pool updates after switching weapons now. 2021-11-09 19:51:06 -05:00
Sam
a8bec0280c Ability pool mostly functional. 2021-11-09 12:56:07 -05:00
Oolnokk
b67558c1ba 2 new beards, four new hairstyles and 1 new eye option for dwarf males 2021-10-31 22:58:25 -04:00
Sam
560f73d296 Addressed review feedback. 2021-10-31 16:39:47 -04:00
Sam
41effe61d0 Being knocked out of item use or sprite interact states forces a poise state. 2021-10-29 19:24:40 -04:00
Sam
57851b7df3 Fixed buff applied. 2021-10-29 17:37:10 -04:00
Sam
f339793911 Buffed staff firebomb a little. 2021-10-29 17:37:07 -04:00
Sam
2b447852fd Added min fall off to explosions. 2021-10-29 17:37:02 -04:00
Sam
fbd742abdb Changed crafting to only consume items after checking that the crafting would be successful instead of consuming items first and reinserting on failure. 2021-10-27 17:02:36 -04:00
Sam
4b9e9c506b Fixed opening salvaging station not showing salvage text. 2021-10-27 17:02:35 -04:00
Sam
6ff7317e05 Added function that returns the output of salvaging an item when result just needs to be checked. 2021-10-27 17:02:32 -04:00
Sam
9fc3a9bf01 Fixed item path of leather items under hide folder. 2021-10-27 17:02:32 -04:00
Sam
356057afc4 Added comments in areas that were lacking. 2021-10-27 17:02:31 -04:00
Sam
794b072d3e Simple recipes now take a vec of slots to look in for the ingredients. 2021-10-27 17:02:30 -04:00
Sam
111abbc3bc Added salvage tags to items, removed old salvage recipes from recipe book. 2021-10-27 17:02:29 -04:00
Sam
ed5cf8ebf9 Backend stuff for salvaging. 2021-10-27 17:02:29 -04:00
Sam
cac3f00250 Lengendary crit changes. 2021-10-26 20:55:32 -04:00
Sam
4d4b7e846a Haha, nerfs go brr 2021-10-26 18:44:45 -04:00
Joshua Barretto
37056e75f9 Merge branch 'demonic/shrubs' into 'master' 
Added new Spots, Shrubs and Ships.

See merge request veloren/veloren!2953
 2021-10-26 10:06:14 +00:00
DemonicOnPc
a74af55c46 Gemu's Revamped vox models added. 2021-10-26 05:28:05 -04:00
Justin Shipsey
434913b946 Merge branch 'kemper/sand-shark-hitbox' into 'master' 
Better sand shark hitbox

See merge request veloren/veloren!2956
 2021-10-24 22:03:08 +00:00
Kemper
b96c6c94ab Adjust sand shark hitbox 2021-10-24 21:04:46 +00:00
DemonicOnPc
b1476071b1 Added new Spots, Shrubs and Ships. 
Spots
- Gnarling Tree
- Troll Cave
- Underwater Shipwreck second variation.

Shrubs added to biomes
- Savannah Shrubs
- Taiga Shrubs
- Temperate Shrubs

Galleon ship added
 2021-10-24 08:10:44 -04:00
ubruntu
e6bfce99bb Use stealth stat on armors 2021-10-24 05:31:49 +00:00
Bryant Deters
b2bd43f4d3 Sneak with weapons drawn 2021-10-18 14:53:55 -05:00
Joshua Barretto
c397bfa69f Merge branch 'socksonme/refactor_villageralarm' into 'master' 
Socksonme/refactor villageralarm

See merge request veloren/veloren!2931
 2021-10-17 12:47:19 +00:00
Sam
c5c70f6945 Correctly took dot product, switched to square root of dot product 2021-10-15 22:41:53 -04:00
Sam
7b2ade34c4 Removed angle between with dot product in handle_orientation. 2021-10-15 17:26:10 -04:00
socksonme
c631341da9 Refactored SoundKind and UtteranceKind 2021-10-15 22:49:25 +03:00
Imbris
f61d742d29 Fix NaNs 2021-10-15 13:17:13 -04:00
Imbris
e67c688c11 Add test for Ori::angle_between 2021-10-15 12:02:53 -04:00
Imbris
c412a96d6a Fix issue with angle between going over PI and remove faulty test (angle between Quaternions isn't equivalent to the angle between Dir vectors since Quaternions involve rolling as well) 2021-10-15 03:20:40 -04:00
Imbris
aa1ffa9f61 Remove timings and commented code (separate from the previous commit so we can keep these notes in the git history), add potentially better version of the straight up/down case for to_horizontal as a comment for testing in the future, remove fine grained spans 2021-10-15 01:38:56 -04:00
Imbris
b0bd8cdb45 Improve Ori impl of From<Dir> and Ori::to_horizontal by avoiding acos/asin calls by constructing the quaternions in a more direct fashion 2021-10-15 01:23:00 -04:00
Imbris
457ed6ac64 Remove per entity VecDeque's of events from character StateUpdate and instead pass in external Vecs that can be pushed to (saves significant time not allocating for VecDeque::new) 2021-10-15 01:23:00 -04:00
Imbris
43e743c2bc Rewrite Ori::to_horizontal to reduce redundant normalization and directly calculate the needed yaw instead of using the more general Ori::from(dir), fix bugs in Ori::from(dir) and optimize the up/down case, add tests for Ori::to_horizontal and Ori::angle_between 2021-10-15 01:23:00 -04:00
Imbris
d515b42eac Improve efficiency of states::utils::handle_orientation by reducing the conversions between Ori/Dir less frequent and optimizing the conversion of Dir -> Ori, also added a method to compute the angle between two Ori so that they don't need to be converted to Dir 2021-10-15 01:23:00 -04:00
Henry Corse
e01ce2dcf4 Kaedr/pretty printing error messages 2021-10-14 18:37:51 +00:00
Sam
1e3b0dcd16 Fix block energy cost being multiplied by 10 and also slightly reduce it. 2021-10-13 10:02:28 -04:00
Imbris
f65399eb00 Make LiquidKind::merge as inlineable, remove always from TerrainGrid::for_each_in inline annotation 2021-10-10 02:42:07 -04:00
ubruntu
0e2808a8fd Interactable campfires 2021-10-05 00:55:29 +00:00
Joshua Barretto
2ae7bca9c0 Rebalanced boat speed 2021-10-05 00:02:03 +01:00
Joshua Barretto
c6d3137612 Fixed sail boat thrust, removed dead water code, added comments 2021-10-05 00:02:03 +01:00
Joshua Barretto
bfbca3e517 Added sail boat 2021-10-05 00:02:03 +01:00
Benoît du Garreau
ef1c51332d Update assets_manager to 0.6.0 2021-10-01 21:13:01 +02:00
juliancoffee
68aba856ec Cleaning 2021-09-27 23:21:57 +03:00
juliancoffee
7291d32209 Make ItemDrop component with Item again 2021-09-27 20:36:18 +03:00
juliancoffee
b056cccb0c Hardened loot table handling 
- Rename LootSpec::None to LootSpec::Nothing to not confuse with Option
- Warn on invalid item paths in loot tables
 2021-09-27 15:09:22 +03:00
Sam
09dd9b4813 Changed ItemDrop to use LootSpec 2021-09-27 15:09:22 +03:00
Marcel
cea927efb6 Merge branch 'xMAC94x/update-toolchain' into 'master' 
update toolchain to `nightly-2021-09-24`

See merge request veloren/veloren!2862
 2021-09-26 19:25:02 +00:00
Samuel Keiffer
ea2fa5f110 Merge branch 'sam/cr-weights' into 'master' 
Changed weights of cr calculation and exp from cr formula.

See merge request veloren/veloren!2875
 2021-09-26 18:21:56 +00:00
Sam
c62162c2d3 Changed weights of cr calculation and exp from cr formula. 2021-09-25 21:52:20 -04:00
Sam
942376f88c Made poise a float at interface of module. 2021-09-25 14:07:47 -04:00
Marcel Märtens
e36eef99c8 apply some clippy fixes that comes with the new toolchain version 2021-09-24 23:18:18 +02:00
Sam
0e5e2b46f2 Changed energy to internally use an integer with a high resolution, and externally to use a float. 2021-09-23 14:11:09 -04:00
Joshua Barretto
bee5b232e6 Fixed crash caused by invalid health, stated current <= maximum invariant more clearly 2021-09-23 12:36:03 +01:00
Snowram
cf6bf74f7a Set beam offset depending on body dimensions 2021-09-21 15:31:46 +02:00
Snowram
7a73e4240b Bird large beam offset hack 2021-09-21 15:31:43 +02:00
jshipsey
1ad107f4a7 animation tweaks 2021-09-21 15:30:43 +02:00
jshipsey
aedb2e9d2b wyvern walk 2021-09-21 15:30:43 +02:00
Snowram
834749353a Adds flame wyvern npc 2021-09-21 15:30:42 +02:00
Justin Shipsey
02c19aaee8 Merge branch 'zesterer/remove-unscheduled-skydives' into 'master' 
Remove unscheduled skydives

See merge request veloren/veloren!2851
 2021-09-18 04:53:22 +00:00
Joshua Barretto
a76496c339 Use previous position caches for airship collision detection 2021-09-17 22:34:28 +01:00
Imbris
bc4455afe4 Merge branch 'anomaluridae/cleanup-interactable' into 'master' 
Seperation of targets vs interactables. Cleaner cursor interactions.

See merge request veloren/veloren!2754
 2021-09-17 19:25:08 +00:00
anomaluridae
5c66f73bb4 make the ContollerInputs.select_pos be explicitly the breakable blacks for mining 2021-09-17 10:34:20 -07:00
juliancoffee
f810af4eec Rename EntityInfo level field to health_scaling 2021-09-17 20:12:42 +03:00
juliancoffee
e5d69d153b Adress review 
Make sausage ascii-art have `a` line inside of stadium
 2021-09-17 13:28:34 +03:00
juliancoffee
4e3fb87526 Adress review 
- Rename Collider::get_radius to bounding_radius
- Check origin difference in CapsulePrism with EPSILON * 10.0 instead of
  magic 0.00001
- Add comments for closest_points, hardnened expression against NaNs
- Add comments to try_e2e_collision function, renamed to
  resolve_e2e_collision, make it return whether collision was triggered.
- Remove Collider::Box (it is Cylinder, which is subset of CapsulePrism
  with p0=p1=Vec2::zero())
 2021-09-17 13:28:34 +03:00
juliancoffee
c069a3523d Fix beam offsets 
- Introduce notion of min and max radius for Body instead of old
  `radius()` function (which is renamed to `max_radius()`).
 2021-09-17 13:28:34 +03:00
juliancoffee
eeb3bec8ad Refactor implementation of e2e collision 
+ Add some hopefully helpful comments
+ Extract colliding tries to separate function
+ Move to Capsule + Cylinder collider combination instead of Capsule +
  Capsule.
 2021-09-17 13:28:34 +03:00
juliancoffee
d86c9f2678 Remove body::Shape enum, make npc use CapsulePrism 2021-09-17 13:28:34 +03:00