Commit Graph

4212 Commits

Author SHA1 Message Date
f8924d6c1a tweaks to damage floaters
Added some comments where stuff needs to be discussed
2022-06-29 17:30:32 +03:00
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
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
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
634a3095d6 Handling crits (very bad color choice+naming) 2022-06-29 17:24:05 +03:00
93d3ce18b4 Remove dbgs and temporary? 0.0 damage fix 2022-06-29 17:24:05 +03:00
aee7888a92 HpFloaters are now created by Outcomes, touched up Damage Outcome 2022-06-29 17:24:05 +03:00
bf6c6fb33d Changed Damage Outcome to store more data 2022-06-29 17:24:05 +03:00
a3b7127de9 Evven zoomier WorldGen, lots of things broken! 2022-06-28 00:24:46 -07:00
3e73fba165 Better naming for shortened key functions
* Old display_shortened that returned Option is now called try_shortened
* What was called try_shortened is now just display_shortest, because if
  shortened version isn't available, it means that regular version is
  already shortened.
2022-06-26 21:59:36 +03:00
9d928261cb Try to display shortened version of key in diary
* Make try_shortened method that tries shortened version of key or
  regular version if shortened one isn't available
* Use it in most places where display_shortened + display_string were
  used
* Use it for diary skilbar
2022-06-25 18:17:37 +03:00
8c837da561 Add i18n keys to abilities
* New hud/ability.ron file for ability localizations
* i18n keys are created by adding .name and .desc to ability id. Because
  of how i18n worked (returning key if string wasn't found), it was
  impossible to do because it leads to UB in case string is missed.
  To solve this we've added get_opt method that returns None
* New Localization::get_or method for convinient fallback key usage
2022-06-25 18:17:37 +03:00
be02e3ced0 Fixed title screen FPS cap not being applied correctly when background FPS is set to unlimited 2022-06-19 14:04:36 +01:00
c7a6955565 fix 2022-06-18 15:25:55 +02:00
57ab1c5767 Add a client-side mutelist 2022-06-14 20:35:01 +00:00
9b78d75f06 Add experimental shader option to visualize shadow map texels 2022-06-05 16:35:12 -04:00
be1cc1b983 Add a few pieces of documentation to code related to light and shadows 2022-06-05 16:35:12 -04:00
45efdb6602 Implement group owned loot 2022-06-04 17:16:12 +00:00
589ceb6d38 avoid one allocation, spotted by imbris 2022-06-01 22:47:53 +02:00
3cc88f9b1d move temp and humidity out of array, introduce different smoke types 2022-06-01 22:14:23 +02:00
bf3eef6e1a remove dead use 2022-06-01 22:14:23 +02:00
dd28dc81be humidity + clean up 2022-06-01 22:13:35 +02:00
92ab095480 test and fix temperature handling 2022-06-01 22:13:35 +02:00
59d876a654 pass humidity to meta, move smoke cycle to separate file 2022-06-01 22:13:34 +02:00
f12f79439f fix negative values for RGB and vary dryness and strength according to biome 2022-06-01 22:13:34 +02:00
827006e7e0 vary color, strength based on position, color on biome 2022-06-01 22:13:34 +02:00
6ddedecc05 introduce smoke strength and color 2022-06-01 22:13:34 +02: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
6431c5567c Fix clippy error 2022-05-28 23:58:47 +02:00
f36e74e383 Fix deprecated function use 2022-05-28 23:53:30 +02:00
ca2ef3e813 Add comments 2022-05-28 23:32:16 +02:00
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
d56e0de392 Merge branch 'xvar/fix-charselect-bug' into 'master'
Fixed handling of deleted characters on character select screen

Closes #1560

See merge request veloren/veloren!3408
2022-05-28 18:12:49 +00:00
c001de7409 Fixed pressing enter on character creation screen attempting to log in instead of create the character. Fixed deleting a character with no characters remaining resulting in the deleted character still being selected internally. 2022-05-28 16:28:26 +01:00
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
2bf8e1865f Skiing and ice skating 2022-05-27 17:19:52 +00:00
ca1a27bd11 Merge branch 'imbris/update-tracy' into 'master'
Update tracy

See merge request veloren/veloren!3400
2022-05-27 02:50:24 +00:00
5cf899c4fe Plot fixes in client and dynamic name fix in voxygen (tracy update) 2022-05-26 22:19:11 -04:00
a366fc4512 Update tracy 2022-05-26 00:04:03 -04:00
fb6a8e0360 Merge branch 'xMAC94x/network_error' into 'master'
Pass network errors through the stack to display them in logs

See merge request veloren/veloren!3385
2022-05-25 22:12:42 +00:00
b9c324a183 Merge branch 'tame_and_mount_special_casing' into 'master'
Special case taming and mounting.

See merge request veloren/veloren!3354
2022-05-24 02:09:45 +00:00
N A
d84a26dfd8 Special case taming and mounting. 2022-05-24 02:09:45 +00:00
a9622fe28e Add a setting to toggle zooming in when charging bow 2022-05-23 23:09:47 +00:00
fc735f509e fix a unrelated clippy issue that came up suddenly 2022-05-23 09:20:54 +02:00
50c34e56ce Merge branch 'chucksys/chat-opacity-text' into 'master'
Add chat window opacity value alongside slider

See merge request veloren/veloren!3377
2022-05-19 03:48:20 +00:00
Sam
534c7dc8b9 Simplified item key (no assets) 2022-05-18 16:28:06 -04:00
Sam
46fe8604b7 Added search filtering to modular entries in crafting UI 2022-05-16 15:11:46 -04:00
Sam
066b8ef9fd Address feedback (no assets) 2022-05-16 15:11:43 -04:00
Sam
85c2a85817 Addressed review comments 2022-05-16 15:11:42 -04:00