juliancoffee
8f138080a9
Make Frenzied buff again
2021-08-09 13:05:00 +03:00
juliancoffee
d054ff0162
Complete skill preset "max" with sceptre HDuration
2021-08-09 10:09:12 +01:00
Treeco
ad7b18f8f0
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
a8559c61f2
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
ae866ac7c6
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
c1df48168a
Fix mistake of pre-multiplying aerodynamic coefficients
...
Increase glider zero-lift drag
2021-08-09 10:06:15 +01:00
Xeriab Nabil
c1d7aec7f1
UI: Fixes and enhancements to trading window
2021-08-08 20:11:54 +03:00
Ben Wallis
83aea64061
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
e3ce3f0f97
Fixed issue caused by Uid component being removed too soon on logout
2021-08-08 14:59:11 +01:00
Samuel Keiffer
e0e7d643a6
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
d324afe73a
XP reward curve modified for faster gain at lower levels
2021-08-08 03:34:56 +00:00
Samuel Keiffer
84addad24e
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
174f0ba20d
Add FIXME about Staff flamethrower
2021-08-08 00:41:39 +03:00
juliancoffee
0ccfb8e004
Expose beam_offsets to AI
2021-08-08 00:33:43 +03:00
Samuel Keiffer
3b3bf10e4a
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
47295feeb1
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
d304aaebe9
Gliding Debug Info
2021-08-07 13:19:58 +00:00
Ben Wallis
26d5648183
Merge branch 'juliancoffee/egui_setting' into 'master'
...
Egui toggle
See merge request veloren/veloren!2742
2021-08-06 21:13:17 +00:00
juliancoffee
a8b73e0bba
Shift egui debug window right
2021-08-06 22:58:36 +03:00
juliancoffee
65d4d692f2
Add hotkey to toggle Egui Debug
2021-08-06 22:58:36 +03:00
juliancoffee
0fcfec73e6
Add option to toggle egui debug
2021-08-06 22:58:36 +03:00
Imbris
e7fabceaf1
Merge branch 'juliancoffee/asset_tweak_v2' into 'master'
...
asset_tweak v2
See merge request veloren/veloren!2723
2021-08-06 17:41:54 +00:00
Xeriab Nabil
4c02227de7
UI: Fixes and enhancements to trading window
2021-08-06 17:11:54 +03:00
Marcel
7e1f81ffa2
Merge branch 'xMAC94x/translationfix' into 'master'
...
write header only once
See merge request veloren/veloren!2741
2021-08-06 13:07:49 +00:00
Samuel Keiffer
063f73d3d9
Merge branch 'juliancoffee/normalize_mass' into 'master'
...
Normalize masses in range 75-100.
See merge request veloren/veloren!2740
2021-08-06 11:53:52 +00:00
juliancoffee
ce04dd5c69
Adress review, add test for structs
2021-08-06 13:04:01 +03:00
Marcel Märtens
3710e88c1a
write header only once
2021-08-06 12:02:22 +02:00
juliancoffee
5e3f89960b
Normalize masses in range 75-100.
...
+ Remove match on body_type
2021-08-06 11:57:42 +03:00
juliancoffee
43297b4684
Change beam offsets
...
* Make it so that beam starts from inside hitbox of owner.
Without it it's possible to cheese beem attack just making close enough
to its owner.
2021-08-05 21:07:46 +03:00
juliancoffee
198b375ea3
Give TrainingDummy hitbox
2021-08-05 21:07:46 +03:00
juliancoffee
163d37e3fc
Fix Beam orientation, remove orientation_behavior
...
* make old OrientationBehavior::FromOri default behaviour
* use rotation formed from look_dir instead of constructing
ori on the fly (which is altered after normalization).
2021-08-05 21:07:46 +03:00
juliancoffee
eb9285d000
Agent code TODO-s
2021-08-05 21:07:45 +03:00
juliancoffee
d38329d9f8
Nerf pillars
...
* make platforms one block high
2021-08-05 21:07:45 +03:00
Samuel Keiffer
b5d9c9d238
Merge branch 'lboklin/idle-upright' into 'master'
...
Make character upright itself even while idle
See merge request veloren/veloren!2733
2021-08-05 12:36:28 +00:00
Ludvig Böklin
a55ac235b9
Make character upright itself even while idle
2021-08-05 08:34:21 +02:00
Samuel Keiffer
4b62e39d29
Merge branch 'ygor/fix-axe-energy-reward' into 'master'
...
Allow axe combo to reward energy without skillpoint
See merge request veloren/veloren!2722
2021-08-05 00:38:41 +00:00
Imbris
8874658424
Merge branch 'capucho/derivative-fix' into 'master'
...
Don't use derivatives in vertex shader
See merge request veloren/veloren!2731
2021-08-05 00:37:04 +00:00
João Capucho
c9ea426687
Don't use derivatives in vertex shader
2021-08-04 23:14:08 +01:00
Joshua Barretto
0617439cf7
Merge branch 'zesterer/agent-fixes' into 'master'
...
Added action timer system for agent code
See merge request veloren/veloren!2726
2021-08-04 16:17:49 +00:00
Joshua Barretto
f5ea8d32f7
Fixed block snapping
2021-08-04 14:12:10 +01:00
Joshua Barretto
492a37d23a
Added action timer system for agent code
2021-08-04 14:04:56 +01:00
Joshua Barretto
c13245b163
Merge branch 'zesterer/fix-pets' into 'master'
...
Fix pets without agency
See merge request veloren/veloren!2728
2021-08-04 00:25:04 +00:00
Joshua Barretto
715e053356
Fix pets without agency
2021-08-04 00:22:03 +01:00
Joshua Barretto
99c9ae9952
Merge branch 'juliancoffee/handle_pvp' into 'master'
...
Handle PvP/PvE
See merge request veloren/veloren!2686
2021-08-03 21:09:09 +00:00
Marcel
b7bd81388c
Merge branch 'umr1352/fix#1260' into 'master'
...
fix issue #1260 : give a warning if an error occurs on language files load
Closes #1260
See merge request veloren/veloren!2724
2021-08-03 21:09:06 +00:00
Enrico Marconi
f2ce496d0e
fix issue #1260 : give a warning if an error occurs on language files load
2021-08-03 21:09:05 +00:00
Marcel
b9ec52eec4
Merge branch 'yusdacra/chore/nix' into 'master'
...
build(nix): fix nix builds
Closes #1132
See merge request veloren/veloren!2720
2021-08-03 21:09:04 +00:00
juliancoffee
f3e8328717
Avoid negative bounds in harm checks
...
* disallow_harm -> allow_harm to avoid negative reasoning since it mostly
requires double negation in code
* allow_harm -> may_harm to specify side-effect free
2021-08-03 18:57:53 +03:00
Yusuf Bera Ertan
0d41fab95c
build: update keyboard-keynames
2021-08-03 18:16:55 +03:00
Yusuf Bera Ertan
fe2b63a102
docs(nix): add notice for vulkan driver error potentially relating to nixpkgs mismatches
2021-08-03 17:45:42 +03:00
