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
9,529 Commits 151 Branches 18 Tags 2.1 GiB
94bcf5b59b
Commit Graph

9529 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dr. Dystopia
94bcf5b59b Move assignment out of if-statement 2021-08-12 12:34:04 +02:00
Marcel
0dfc0d39dd Merge branch 'fix-1278' into 'master' 
Fixes the issue mentioned in #1278

See merge request veloren/veloren!2760
 2021-08-12 07:24:16 +00:00
Xeriab Nabil
8ce679766a Fixes the issue mentioned in #1278 2021-08-12 03:23:31 +03: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
juliancoffee
a7922336ea Expose beam_offsets to AI 2021-08-08 00:33:43 +03:00
Samuel Keiffer
2b10f818f5 Merge branch 'juliancoffee/pillar_fix' into 'master' 
Nerf pillars + Fix Beam ori

See merge request veloren/veloren!2732
 2021-08-07 16:35:24 +00:00
Marcel
f3fdfc37d7 Merge branch 'juliancoffee/gliding_debug' into 'master' 
Gliding Debug Info

See merge request veloren/veloren!2743
 2021-08-07 13:19:58 +00:00
Illia Denysenko
0858279810 Gliding Debug Info 2021-08-07 13:19:58 +00:00
Ben Wallis
fab5c54253 Merge branch 'juliancoffee/egui_setting' into 'master' 
Egui toggle

See merge request veloren/veloren!2742
 2021-08-06 21:13:17 +00:00