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,232 Commits 151 Branches 18 Tags 2.1 GiB
71941132ce
Commit Graph

4529 Commits

Author SHA1 Message Date
IsseW
6562c7076f remove fluid model todo 2022-07-04 18:18:42 +02:00
Imbris
b2d3759105 Cleanup profiling comments and commented code 2022-07-04 18:18:39 +02:00
Imbris
5866e23e32 Pre-compute view_mat_inv * proj_mat_inv on the CPU before sending to the cloud shader 2022-07-04 18:18:38 +02:00
IsseW
80e29e2c20 put rain_density in uniform 2022-07-04 18:18:37 +02:00
IsseW
5b7b13adce Add medium check to rain 2022-07-04 18:18:36 +02:00
IsseW
ab707b6df1 sample weather at correct position for occlusion 2022-07-04 18:18:36 +02:00
IsseW
a7c724a46d Limit figures drawn for rain occlusion 2022-07-04 18:18:35 +02:00
DaforLynx
ac82689f83 Clean up audio code, fix egui bug 2022-07-04 18:18:34 +02:00
IsseW
9f26afb4a5 refactor rain_dir to rain_vel 2022-07-04 18:11:45 +02:00
DaforLynx
9104a07530 Code cleanup, doubled volume of leaves.ogg 2022-07-04 18:11:43 +02:00
Treeco
0d21361e05 Add player-relative rain direction 2022-07-04 18:11:42 +02:00
IsseW
fa589e915e make rain view distance smaller, dont put wind in texture 2022-07-04 18:11:41 +02:00
DaforLynx
dc8424c549 Moving audio code 2022-07-04 18:10:05 +02:00
IsseW
6215ccd522 Remove dead code 2022-07-04 18:07:24 +02:00
DaforLynx
05e7de5629 Adjust some values for ambience volume 2022-07-04 18:07:23 +02:00
IsseW
b82bb5b247 Don't have rain be behind an expiremental shader 2022-07-04 18:07:22 +02:00
IsseW
6274d54e56 fix todos 2022-07-04 18:07:21 +02:00
IsseW
a93240d2a6 cleaner get_ambient_channel 2022-07-04 18:07:20 +02:00
IsseW
3eabe24f12 base occlusion texture size of off voxels 2022-07-04 18:07:19 +02:00
DaforLynx
a6fd5d5c8b Some organization. Faster volume lerping. 2022-07-04 18:07:19 +02:00
IsseW
08b0989789 add slider for rain map resolution 2022-07-04 18:07:18 +02:00
DaforLynx
6059a30f27 Rain diminishes with distance above terrain 2022-07-04 18:07:16 +02:00
IsseW
54f958acc7 more correct occlusion 2022-07-04 18:07:16 +02:00
DaforLynx
83ee54001e Ambience slider; fix to utterances 2022-07-04 18:07:15 +02:00
DaforLynx
365f45397b At this point all sfx should be able to detect underwater 2022-07-04 18:07:14 +02:00
DaforLynx
088d1cfe9d Remove debug lines, re-mix some sfx, add crafting sfx, separate inv event sfx into spatial and nonspatial 2022-07-04 18:07:13 +02:00
IsseW
234ed5afb2 Rain occlusion projection matrix 2022-07-04 18:07:13 +02:00
IsseW
79cac935c8 Added rain occlusion 2022-07-04 18:07:11 +02:00
DaforLynx
b3200ed89f More ambience :) 2022-07-04 18:07:10 +02:00
DaforLynx
c4239e074f Prevent unnecessary running of code 2022-07-04 18:07:09 +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
b578f0231f Interpolate in client 2022-07-04 18:07:06 +02:00
IsseW
4fa2644507 Interpolate weather in voxygen 2022-07-04 18:07:04 +02:00
IsseW
e37f2be820 Put rainbows behind experimental 2022-07-04 18:07:03 +02:00
Benjam Soule H. Walker
99c76be297 added sound for rain 2022-07-04 18:07:02 +02:00
IsseW
273c5ed2f0 Temporary noise solution 2022-07-04 18:07:00 +02:00
IsseW
67683f315f Put rain behind expiremental shader 2022-07-04 18:06:59 +02:00
IsseW
9c84a20cef better sim 2022-07-04 18:06:58 +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
Isse
16c5c657cc Fix mimalloc for hot reloading 2022-07-04 10:08:27 +00:00
IsseW
57d6b4a55f Switch to mimalloc on windows 2022-07-04 09:15:18 +02:00
Imbris
54f6f278a0 Include an associated Config type in the atlas trait which is provided when creating the atlas 2022-07-01 23:47:42 -04:00
Imbris
95f17a6d22 General cleanup, remove local dependency, switch to u16 from i32 in several places, avoid guillotiere types in atlas API (one spot still remains) 2022-07-01 23:47:42 -04:00
Imbris
16461cfcba Cleanup atlas allocator work, remaining TODO: 
* refactor meshing and trait API to replace guillotiere types
* associated config type on atlas trait
* investigate other areas of sprite performance like LOD scaling (i.e.
  there are now significant gaps in between meshing)
 2022-07-01 23:47:41 -04:00
Imbris
5e5f7885e5 Tiled guillotiere allocator for sprites working 2022-07-01 23:47:41 -04:00
Imbris
b1f5fc01db Before removing variable size edge tiles 2022-07-01 23:47:41 -04:00
Samuel Keiffer
0bd08b1f9e Merge branch 'socksonme/rework_sct' into 'master' 
Rework SCT

See merge request veloren/veloren!3126
 2022-07-02 02:42:42 +00:00
Imbris
6c8970f6fd Merge branch 'imbris/voxygen-compile-time' into 'master' 
Improve voxygen compile time with small tweak

See merge request veloren/veloren!3449
 2022-07-01 08:22:05 +00:00
Imbris
e9ed7007ec Convert hashmap to array of SpriteConfigs to ensure we keep quick lookup times since this is queried for every block when processing a new chunk, 2022-07-01 03:34:35 -04:00
Imbris
291a424b4e This seems to save at least 30 seconds (out of 90 to 120 secs) when tweaking TILE_SIZE in voxygen/src/mesh/greedy.rs (NOTE: I did some more timing, see associated MR description) 2022-06-30 00:11:04 -04:00
Socksonme
6a355c58f2 Remove instance from PoiseChange 2022-06-29 18:36:05 +03:00
Socksonme
da0baa674f Remove hp_floaters whenever they wouldn 2022-06-29 17:31:59 +03:00
Socksonme
b7a718cb99 Remove old comments 2022-06-29 17:31:58 +03:00
Socksonme
f048600335 Add back old i18n + some small fixes 
- Fix .filter() for combo_floater
- Rename sct_inc_dmg_accum_duration to sct_inc_dmg, as it was in the
  wrong place

to rebase
 2022-06-29 17:31:58 +03:00
Socksonme
f6189a61f2 Address review - addendum 
- `BlockFloater`s and `ComboFloater`s don't store the owner anymore,
  `ExpFloater` still does, however the field is used to prevent
  accumulating old floaters with new ones. This change also makes it so
  that if the client changes entity, they keep the old entity's
  floaters.
- The `combo_floaters` field is now `combo_floater` plus it now uses an
  Option<ExpFloater>.
- Changed `handle_health_change` to change the health even if the entity
  does not have a `Pos` or `Uid`, now uses `emit_now`combo_floater` plus
  it now uses an Option<ExpFloater>.
- Changed `handle_health_change` to change the health even if the entity
  does not have a `Pos` or `Uid`, now uses `emit_now`
- Changed some comments
 2022-06-29 17:31:58 +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
8feaea5cdf Exp floater accumulation + ignore all below 0.1 2022-06-29 17:31:57 +03:00
socksonme
eabbfe6a51 Remove damage batch option + crit_mult 2022-06-29 17:31:54 +03:00
socksonme
29ce64b4f5 Small changes to hud 2022-06-29 17:31:43 +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
762b726d21 basic i18n for english + code touchups 
Getting Invalid Probability error when attacking a lot of enemies - needs to be checked out
 2022-06-29 17:31:42 +03:00
socksonme
ddf0ba6dd6 Small UI changes + fix hurt animation 2022-06-29 17:31:41 +03:00
socksonme
5533d139bc Slider for accumulated damage duration 2022-06-29 17:31:41 +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
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
juliancoffee
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
juliancoffee
3d1b2735a2 Clean i18n lifetimes 2022-06-26 00:44:55 +03:00
juliancoffee
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
juliancoffee
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
Ben Wallis
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
IsseW
c7a6955565 fix 2022-06-18 15:25:55 +02:00
Samantha W
57ab1c5767 Add a client-side mutelist 2022-06-14 20:35:01 +00:00
Imbris
9b78d75f06 Add experimental shader option to visualize shadow map texels 2022-06-05 16:35:12 -04:00
Imbris
be1cc1b983 Add a few pieces of documentation to code related to light and shadows 2022-06-05 16:35:12 -04:00
terrarier2111
45efdb6602 Implement group owned loot 2022-06-04 17:16:12 +00:00
Christof Petig
589ceb6d38 avoid one allocation, spotted by imbris 2022-06-01 22:47:53 +02:00
Christof Petig
3cc88f9b1d move temp and humidity out of array, introduce different smoke types 2022-06-01 22:14:23 +02:00
Christof Petig
bf3eef6e1a remove dead use 2022-06-01 22:14:23 +02:00
Christof Petig
dd28dc81be humidity + clean up 2022-06-01 22:13:35 +02:00
Christof Petig
92ab095480 test and fix temperature handling 2022-06-01 22:13:35 +02:00
Christof Petig
59d876a654 pass humidity to meta, move smoke cycle to separate file 2022-06-01 22:13:34 +02:00
Christof Petig
f12f79439f fix negative values for RGB and vary dryness and strength according to biome 2022-06-01 22:13:34 +02:00
Christof Petig
827006e7e0 vary color, strength based on position, color on biome 2022-06-01 22:13:34 +02:00
Christof Petig
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
Benoît du Garreau
6431c5567c Fix clippy error 2022-05-28 23:58:47 +02:00
Benoît du Garreau
f36e74e383 Fix deprecated function use 2022-05-28 23:53:30 +02:00
Benoît du Garreau
ca2ef3e813 Add comments 2022-05-28 23:32:16 +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
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
Ben Wallis
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
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
Imbris
5cf899c4fe Plot fixes in client and dynamic name fix in voxygen (tracy update) 2022-05-26 22:19:11 -04:00
Imbris
a366fc4512 Update tracy 2022-05-26 00:04:03 -04:00
Marcel
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
Samuel Keiffer
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
Corvella
a9622fe28e Add a setting to toggle zooming in when charging bow 2022-05-23 23:09:47 +00:00
Marcel Märtens
fc735f509e fix a unrelated clippy issue that came up suddenly 2022-05-23 09:20:54 +02:00
Imbris
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
Sam
13ea6dee93 Addressed second round of balance feedback (assets). 2022-05-16 15:11:40 -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
1b85258838 Crafting slots now properly check component recipe book to see if an input is valid. 2022-05-16 15:11:35 -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
Bryant Deters
777fcdf477 closing crafting menu clears crafting components in modular recipe [ci_skip] 2022-05-16 15:11:31 -04:00
Bryant Deters
cabde522b0 cleanup commented line [ci_skip] 2022-05-16 15:11:31 -04:00
Bryant Deters
0d4b05b256 text margin fix, removed some mutable variables, can_perform for modulars accounts for crafting sprites [ci skip] 2022-05-16 15:11:30 -04:00
Sam
f6bf8206ab Use new icons from Pfau 2022-05-16 15:11:30 -04:00
Monty Marz
c3f92622c1 bg icons 2022-05-16 15:11:29 -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
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
aeac0f5ad6 Modular inputs now have tooltips. 2022-05-16 15:11:19 -04:00
Monty Marz
3d5e29b44d Ui 2022-05-16 15:11:18 -04:00
Sam
360e12be22 UI can display a preview of the modular weapon output. 2022-05-16 15:11:17 -04:00
Sam
8fc0138e84 Initial crafting UI for modular weapons. 2022-05-16 15:11:17 -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