Commit Graph

7864 Commits

Author SHA1 Message Date
Joshua Barretto
6714fbc419 Haaaaaands 2021-04-25 17:38:06 +01:00
Joshua Barretto
e7af860764 Bad impl of volumetric point lights 2021-04-25 17:31:26 +01:00
Ludvig Böklin
afef73e90d Enable energy recharge while gliding 2021-04-25 15:18:40 +02:00
Ludvig Böklin
c0f43aafb1 Make glider orientation stick to look dir even without input 2021-04-25 14:56:04 +02:00
Ludvig Böklin
bf7f9b28fa Remove spanwise flow component in calculation of angle of attack 2021-04-25 14:42:09 +02:00
Ludvig Böklin
91a8b19863 Improve glider handling 2021-04-25 14:28:49 +02:00
Ludvig Böklin
0f6f7a9096 Add documentation to Glider data constructor 2021-04-25 07:51:17 +02:00
Ludvig Böklin
94b1d37fb7 Fix loss of glider control when falling perfectly vertically 2021-04-25 07:51:17 +02:00
Ludvig Böklin
0810d8920f Remove energy cost from deploying glider 2021-04-25 07:51:17 +02:00
Ludvig Böklin
cef4a074c2 Update changelog 2021-04-25 07:51:16 +02:00
Ludvig Böklin
93ce593c62 Increase glider aspect ratio and remove inline tweaks 2021-04-25 07:50:27 +02:00
Ludvig Böklin
df8b18903b Add descriptive panic for aspect ratios that are too high; remove accidental file 2021-04-25 07:50:27 +02:00
Ludvig Böklin
053fb9662f Retain pitch on no input 2021-04-25 07:50:27 +02:00
Ludvig Böklin
a6dc8853da Set fluid medium to air if none 2021-04-25 07:50:27 +02:00
Ludvig Böklin
23995b2ef1 Preserve current fluid medium 2021-04-25 07:50:26 +02:00
Ludvig Böklin
7186569259 Reduce abstraction for lift calculation; remove RigidWings struct 2021-04-25 07:50:17 +02:00
Ludvig Böklin
96168b5654 No gliding bodies, only gliding glider 2021-04-25 07:48:32 +02:00
Ludvig Böklin
906bf798e7 Implement lift and adapt things to work with it 2021-04-25 07:46:41 +02:00
Justin Shipsey
79cb7a5826 Merge branch 'snowram/bird-large' into 'master'
Large bird skeleton

See merge request veloren/veloren!2121
2021-04-25 03:34:12 +00:00
Snowram
c16ec43938 Body specific beam offsets 2021-04-25 04:07:12 +02:00
Snowram
8f54a0bf31 More phoenix AI work
More phoenix AI work
2021-04-25 04:07:12 +02:00
James Melkonian
0cf7e7114f Phoenix AI pass 2021-04-25 04:07:11 +02:00
Snowram
8cf8e51962 Phoenix npc + AI (WIP) 2021-04-25 04:07:11 +02:00
Snowram
ab26efa970 Improves bird_large anims 2021-04-25 04:07:09 +02:00
Snowram
bd84677906 Day period dependant wildlife spawns 2021-04-25 02:14:51 +02:00
Snowram
fd177c9669 Breathe and stun anims 2021-04-25 02:14:50 +02:00
Snowram
eb98360183 Cockatrice bird_large conversion 2021-04-25 02:14:50 +02:00
Snowram
0f6b902924 Idle, run, vel/ori aware fly anims 2021-04-25 02:14:49 +02:00
Snowram
bc95484863 Swaps bird_small skeleton to a new bird_large 2021-04-25 02:14:49 +02:00
Samuel Keiffer
e4324a3481 Merge branch 'ygor/skillbar-account-for-skillset' into 'master'
Make skillbar buttons account for energy cost reduction

See merge request veloren/veloren!2185
2021-04-24 19:32:19 +00:00
Marcel
aa6145c9b5 Merge branch 'ada/english-fallback' into 'master'
Add option to load English string as fallback if string missing

See merge request veloren/veloren!1791
2021-04-24 14:39:35 +00:00
Ada Lovegirls
01c30868eb Add option to load English string as fallback if string missing 2021-04-24 14:39:35 +00:00
Ben Wallis
c6205875ee Merge branch 'xvar/server-version-check' into 'master'
Added client/server version mismatch warnings

See merge request veloren/veloren!2184
2021-04-24 09:05:45 +00:00
Ben Wallis
2e08c2f76f Added client/server version mismatch message when a network error is encountered during client init.
Added warning banner on character select when successfully connected to a server with a mismatched version.
2021-04-24 09:08:30 +01:00
Justin Shipsey
ff445d3306 Merge branch 'holychowders/fix_grammatical_error' into 'master'
Fix grammatical error in NPC message

See merge request veloren/veloren!2191
2021-04-24 06:12:42 +00:00
holychowders
516f2fec4a Fix grammatical error in NPC message 2021-04-23 22:43:37 -07:00
Ygor Souza
4f71c621f4 Make skillbar buttons account for energy cost reduction
Previously, the buttons would compare the current energy to the base
cost of the ability, so they would sometimes be grayed out while the
ability was usable. Now they ajust the ability with the character
skillset before getting the energy cost for the purposes of setting
the skillbar icon color.
2021-04-24 03:45:58 +02:00
Samuel Keiffer
fef68ad2a1 Merge branch 'ygor/fix-staff-shockwave-infinite-range' into 'master'
Fix fire shockwave infinite vertical range

Closes #1038

See merge request veloren/veloren!2189
2021-04-24 01:38:14 +00:00
Ygor Souza
71b8426592 Add basic distance check to shockwave hit test
Before checking if the entity hitbox intersects the shockwave shell, we
do a basic check that the entity is close enough to be hit, considering
its radius.

This fixes the unlimited vertical range problem, since the distance is
measured in 3D.
2021-04-24 03:09:45 +02:00
Marcel
4d0aa9c3ad Merge branch 'juliancoffee/update-uk_UA' into 'master'
update uk_UA localization

See merge request veloren/veloren!2186
2021-04-23 21:30:46 +00:00
Illia Denysenko
4e7aba5b3f update uk_UA localization 2021-04-23 21:30:46 +00:00
Songtronix
0f5d289ecb Merge branch 'xMAC94x/quickfix_for_airshipper' into 'master'
xMac94x/quickfix for airshipper

See merge request veloren/veloren!2188
2021-04-23 18:52:21 +00:00
Marcel Märtens
a610db5cfc have a seperate stage for scheduled builds 2021-04-23 17:48:02 +02:00
Marcel
1489fccbe3 Merge branch 'juliancoffee/fix_localization_tests' into 'master'
Fix off-by-one error in localization tests

See merge request veloren/veloren!2187
2021-04-23 11:42:00 +00:00
juliancoffee
dc8d306890 Fix off-by-one error in localization tests
BlameHunk lines start counting from 1, not 0. Comparing with `line + 1`
fix this.
2021-04-23 14:11:44 +03:00
Justin Shipsey
8828691935 Merge branch 'update_pt_BR_20210422' into 'master'
update pt_br 20210422

See merge request veloren/veloren!2182
2021-04-23 01:00:41 +00:00
Nícolas Wildner
6188bb9e96 update pt_br 20210422 2021-04-23 01:00:41 +00:00
Imbris
c2a8153325 Merge branch 'ygor/fix-arrow-outcome-loop' into 'master'
Skip physics pass for arrows stuck on surfaces

Closes #1094

See merge request veloren/veloren!2183
2021-04-22 22:30:36 +00:00
Ygor Souza
e59f1e8d28 Skip physics pass for arrows stuck on surfaces
This keeps the arrow velocity from changing, which is what was causing
the ProjectileHit outcome to be pushed multiple times for the same
arrow, since the outcome checks if the arrow velocity is above a given
threshold.
2021-04-22 23:03:04 +02:00
Marcel
6613374053 Merge branch 'revert-3506f754' into 'master'
Decouple Test-Ci with Release-Ci

See merge request veloren/veloren!2041
2021-04-22 20:23:59 +00:00