Commit Graph

9534 Commits

Author SHA1 Message Date
Marcel Märtens
85ca33024c added an experimental new data model which is based on more traits and structs 2021-08-13 10:34:13 +02:00
Marcel Märtens
5617efff48 implement LodDelta to catch changes in LodData
test caching of LodData access
2021-08-13 10:22:42 +02:00
Marcel Märtens
d5dca4f6e8 work on a deltas, to store the diff while working on data.
this state does not work, because i tried to iplement delta in a trait type. however this is not necessary, i will revert this.
Just keep this commit for historical reasons - it wont build.
2021-08-13 10:22:11 +02:00
Marcel Märtens
536ef3d6ff increasing performance by another 10-20% on read as well as on write
Option<usize> takes 16 bytes which we cannot allow,
so we use a u32 to store the same information, we use std::u32::MAX to mark that a LOD has no children
we have no checks for that limit, so we hope it never gets that high... dear god...
the intel laptop statistics now seem to be alot more stable and even top the ryzen desktop statistics, we get faster in every bench
2021-08-13 10:21:41 +02:00
Marcel Märtens
caa7150556 fix all tests, now the new ECS access should work fine.
this implementations reaches about 3000 ns per access, need to improve further
2021-08-13 10:21:13 +02:00
Marcel Märtens
3c92e831e7 bring basic new featureset to work with make_at_least, still needs to fix some bugs 2021-08-13 10:20:32 +02:00
Marcel Märtens
a3c36f135a implement a new version, that uses a more ecs approach of LOD.
the old implementation needed a Vec per Element, which itself needs 24 bytes, which is a huge overhead for a single byte element.
the new implementation has global Vec per region and only needs a index for the first element, which might be 8 bytes (implementation 4 bytes because of some assumptions) or none at all.
It's still not ideal, because it will requiere alot of duplicate coding.

Former-commit-id: 7172829c18ceabe67689487ffd269ebe62d1647b
2021-08-13 10:11:50 +02:00
Marcel Märtens
1456497bd0 start working on RFC#11,
implement a regionmanager and basic region component as well as tests for those
this is a fist implementation and likly to change

Former-commit-id: fdb7097dc30ab1642d25a02532458bcc2811ab61
2021-08-13 10:08:21 +02:00
Marcel
add74cd0ea Merge branch 'xMAC94x/fix_1165' into 'master'
remove futures_executor from renderer and rather pass tokio runtime to it...

See merge request veloren/veloren!2755
2021-08-11 15:26:08 +00:00
Marcel
0bedfde53e Merge branch 'trade-window-improvements' into 'master'
UI: Fixes and enhancements to the trading window

See merge request veloren/veloren!2738
2021-08-11 09:25:17 +00:00
Marcel Märtens
bc821a46cd code cleanup 2021-08-11 09:42:29 +02:00
Marcel Märtens
889a8d11f5 zest prefers this over await 2021-08-11 01:23:48 +02:00
Marcel
631b4747d9 Merge branch 'juliancoffee/i18n_sprites' into 'master'
Localization for sprite overitem (currenly only crafting stations)

See merge request veloren/veloren!2759
2021-08-10 23:17:25 +00:00
Illia Denysenko
2a093a9991 Localization for sprite overitem (currenly only crafting stations) 2021-08-10 23:17:25 +00:00
Marcel Märtens
32e58c4b17 remove futures_executor from renderer and rather pass tokio runtime to it properly. therefore the runtime is now created with Voxygen rather than with the Connect attempt 2021-08-11 00:38:03 +02:00
Marcel
92684b31fa Merge branch 'kilpkonn/camera_clipping' into 'master'
Camera clipping

Closes #955

See merge request veloren/veloren!2730
2021-08-10 12:20:27 +00:00
Tavo Annus
6114cbbcf3 Fix skybox jumping 2021-08-10 14:01:09 +02:00
Tavo Annus
5c5f172667 Use old strategy for far distances 2021-08-10 14:00:59 +02:00
Tavo Annus
06b8ad62d3 Minor tweaks to clipping, style fixes 2021-08-10 14:00:51 +02:00
Tavo Annus
ad075b55c9 Allow trees to pass between character and camera for bigger distances 2021-08-10 14:00:42 +02:00
Tavo Annus
e834711293 Fix character being too close in menu 2021-08-10 14:00:34 +02:00
Tavo Annus
a7aa37f7f6 Fix camera shaking & Style fixes 2021-08-10 14:00:13 +02:00
Tavo Annus
42dab09249 Improve camera clipping 2021-08-10 13:59:41 +02:00
Marcel
9b7fe0b7e6 Merge branch 'juliancoffee/kit_all' into 'master'
Implement `/kit all` and a bit of refactoring

See merge request veloren/veloren!2752
2021-08-10 11:26:31 +00:00
juliancoffee
3ac74a8259 Implement /kit all and a bit of refactoring
+ notifying about sucessful kit application
+ notifying about case with insufficient space
+ handle case where you don't have enough free slots
+ handle quantity of non-stackable items
+ add test for items in kit manifest
2021-08-10 13:28:38 +03:00
Samuel Keiffer
d5feca45c5 Merge branch 'pacmanmati/veloren-pacmanmati/1224-consolidate-redundant-stage-sections' into 'master'
Consolidate redundant stage sections

See merge request veloren/veloren!2748
2021-08-10 01:23:26 +00:00
Sam
2103abbb76 Fixed sfx file after consolidation. 2021-08-09 20:24:04 -04:00
Marcel
9f15062849 Merge branch 'juliancoffee/all_item_defs' into 'master'
Use asset::load_dir to get list of all items

See merge request veloren/veloren!2751
2021-08-09 23:42:43 +00:00
Marcel
cde1283e04 Merge branch 'juliancoffee/deterministic_dungeons' into 'master'
Don't chose room kinds with dynamic_rng

See merge request veloren/veloren!2750
2021-08-09 23:33:13 +00:00
juliancoffee
449902a50e Use asset::load_dir to get list of all items 2021-08-10 02:03:46 +03:00
Samuel Keiffer
f131adaba7 Merge branch 'snowram/map-level-ux' into 'master'
Makes dungeons start at level 1 visually

See merge request veloren/veloren!2545
2021-08-09 15:56:27 +00:00
juliancoffee
771df2f0f1 Don't chose room kinds with dynamic_rng 2021-08-09 18:19:35 +03:00
Snowram
dddb47a385 Makes dungeons start at level 1 visually 2021-08-09 16:36:37 +02:00
Samuel Keiffer
2bc4f364bf Merge branch 'lboklin/gliding-improvements' into 'master'
Minor improvements to gliding and glider-wielding

See merge request veloren/veloren!2734
2021-08-09 14:33:02 +00:00
Sam
52ee598cf1 Consolidated Use into Action as well. 2021-08-09 10:31:17 -04:00
pacmanmati
5f37509a78 #1224 - Replace redundant StageSection: Swing, Shoot, Cast with Action 2021-08-09 10:27:53 -04:00
juliancoffee
172f19376a Tweak boss knockback abilities
Tweak Mindflayer vortex knockback (make it rarer)
Tweak Tidal Warrior pincer and wave knockback
Tweak claygolem rocket and shockwave knockback
Tweak Yeti shockwave and strike knockback
2021-08-09 13:05:01 +03:00
juliancoffee
4069a381c5 Make Frenzied buff again 2021-08-09 13:05:00 +03:00
juliancoffee
58cfd690c3 Complete skill preset "max" with sceptre HDuration 2021-08-09 10:09:12 +01:00
Treeco
a48fa0f349 Buff swim thrust for humans reduce gains from skillpoints
This is intended to give a swim speed of 4.7 m/s when unskilled, and 7.2 when skilled
However, this turns out to be horrifically fps-dependant, both after this branch and in master. Needs further research into fixes
This commit tunes it for 60 fps
2021-08-09 10:06:16 +01:00
Treeco
2fc62bfe7f Make each race's hitbox and weight scale linearly with their height
This causes all humanoids to handle identically when falling, gliding, or swimming
2021-08-09 10:06:16 +01:00
Ludvig Böklin
ebf489984c Improve gliding
- make glider dimensions a factor of body height
- increase glider dimensions across the board
- remove delay from transition into glide
- enable glider control while wielding glider
- improve glide wield animation
2021-08-09 10:06:16 +01:00
Ludvig Böklin
b667ba86f9 Fix mistake of pre-multiplying aerodynamic coefficients
Increase glider zero-lift drag
2021-08-09 10:06:15 +01:00
Xeriab Nabil
8e7939a921 UI: Fixes and enhancements to trading window 2021-08-08 20:11:54 +03:00
Ben Wallis
7c8c0973a8 Merge branch 'xvar/fixes' into 'master'
Fixed issue caused by Uid component being removed too soon on logout

See merge request veloren/veloren!2746
2021-08-08 14:29:14 +00:00
Ben Wallis
7039bf7a0c Fixed issue caused by Uid component being removed too soon on logout 2021-08-08 14:59:11 +01:00
Samuel Keiffer
9bfd396c36 Merge branch 'ubruntu/relative-xp-curve' into 'master'
XP reward curve modified for faster gain at lower levels

See merge request veloren/veloren!2706
2021-08-08 03:34:57 +00:00
ubruntu
dca795e533 XP reward curve modified for faster gain at lower levels 2021-08-08 03:34:56 +00:00
Samuel Keiffer
c6df38cc9d Merge branch 'juliancoffee/beam_agents' into 'master'
Expose beam_offsets to AI

See merge request veloren/veloren!2744
2021-08-08 03:34:53 +00:00
juliancoffee
f16f8182cd Add FIXME about Staff flamethrower 2021-08-08 00:41:39 +03:00