Snowram
abfb14626a
Body specific beam offsets
2021-04-25 04:07:12 +02:00
Snowram
58300592ca
More phoenix AI work
...
More phoenix AI work
2021-04-25 04:07:12 +02:00
James Melkonian
7cfd8debed
Phoenix AI pass
2021-04-25 04:07:11 +02:00
Snowram
4249d0ddcc
Phoenix npc + AI (WIP)
2021-04-25 04:07:11 +02:00
Snowram
738be81943
Improves bird_large anims
2021-04-25 04:07:09 +02:00
Snowram
ff5d267535
Day period dependant wildlife spawns
2021-04-25 02:14:51 +02:00
Snowram
b0d617d91d
Breathe and stun anims
2021-04-25 02:14:50 +02:00
Snowram
e58e56cb07
Cockatrice bird_large conversion
2021-04-25 02:14:50 +02:00
Snowram
e930b5ee18
Idle, run, vel/ori aware fly anims
2021-04-25 02:14:49 +02:00
Snowram
5b8fbe9a23
Swaps bird_small skeleton to a new bird_large
2021-04-25 02:14:49 +02:00
Samuel Keiffer
869f1f9501
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
6926eb587a
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
c7d6dde677
Add option to load English string as fallback if string missing
2021-04-24 14:39:35 +00:00
Ben Wallis
2251c91b1a
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
d0108fe32b
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
73cce1a51f
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
e7bbe45a42
Fix grammatical error in NPC message
2021-04-23 22:43:37 -07:00
Ygor Souza
efa7a2599e
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
a6d1b5dd2d
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
9b7c7bc69a
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
45eee41693
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
37ed8aa208
update uk_UA localization
2021-04-23 21:30:46 +00:00
Songtronix
fafdc8af3e
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
e157c81671
have a seperate stage for scheduled builds
2021-04-23 17:48:02 +02:00
Marcel
76a22c6607
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
65fbc5ea98
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
8cfa6dfb2d
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
a04768a33e
update pt_br 20210422
2021-04-23 01:00:41 +00:00
Imbris
e41da7e778
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
72167db397
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
21384690af
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
Marcel
8fb27f3d6d
use different docker tags for master and nightly runs,
...
This allow us to decouple our test-ci from the release-ci and is necessary for multiple release channels in the future.
E.g. we can run a master build without it directly beeing pushed to watchtower and airshipper (config setting requiered on airshipper)
Adjust Tags for server-cli
2021-04-22 21:38:29 +02:00
Marcel
592e34e6ba
Merge branch 'aweinstock/deflate-terrain' into 'master'
...
Compress terrain chunks with deflate. Includes a benchmark showing that this...
See merge request veloren/veloren!2166
2021-04-22 17:12:53 +00:00
Marcel
85c3d6d326
Merge branch 'pfau/lantern_handles' into 'master'
...
Add handles to lanterns, fix cooking pot scale
See merge request veloren/veloren!2181
2021-04-22 17:12:07 +00:00
Monty Marz
ccb913a2c0
Add handles to lanterns, fix cooking pot scale
2021-04-22 17:12:07 +00:00
Joshua Barretto
95abcb3c8f
Merge branch 'zesterer/small-fixes' into 'master'
...
Fixed broken crafting sprite requirement
See merge request veloren/veloren!2180
2021-04-22 11:57:13 +00:00
Joshua Barretto
58d5eb7748
Fixed broken crafting sprite requirement
2021-04-22 12:30:48 +01:00
Ben Wallis
08352bcde8
Merge branch 'lboklin/wildlife-group-spawn-dist' into 'master'
...
Space wildlife group spawns apart to prevent spawnplosions
See merge request veloren/veloren!2178
2021-04-22 08:50:20 +00:00
Ludvig Böklin
b11906ac3a
Space wildlife group spawns apart to prevent spawnplosions
2021-04-22 08:50:20 +00:00
Snowram
d2d637dcd9
Merge branch 'slipped/zeropointeight' into 'master'
...
small tweaks
See merge request veloren/veloren!2168
2021-04-22 07:05:18 +00:00
jshipsey
414c47a402
comments
2021-04-22 00:04:39 -04:00
jshipsey
4500e2a4ca
formatting
2021-04-22 00:04:39 -04:00
jshipsey
6d31e9ad84
fix for 1h on back
2021-04-22 00:04:39 -04:00
jshipsey
d47dc7c49e
remove 0.8, add snow's mixed_vel idea for other bodies
2021-04-22 00:04:39 -04:00
Joshua Barretto
d874d7a699
Merge branch 'zesterer/pit-of-tartarus' into 'master'
...
Made the pit of tartarus less bad
See merge request veloren/veloren!2179
2021-04-21 22:08:06 +00:00
Joshua Barretto
1aed08f885
Made the pit of tartarus less bad
2021-04-21 22:18:44 +01:00
Dominik Broński
7589f40eb7
Merge branch 'lboklin/arrow-turret-drag-fix' into 'master'
...
Fix ArrowTurret drag coefficient
See merge request veloren/veloren!2175
2021-04-21 20:17:44 +00:00
Imbris
a53d0809a7
Merge branch 'imbris/quickfix' into 'master'
...
Quick physics perf fix
See merge request veloren/veloren!2177
2021-04-21 18:32:53 +00:00
Imbris
101e6cdce6
Quick physics perf fix
2021-04-21 14:03:23 -04:00
Imbris
94e109afc4
Merge branch 'revert-68539a75' into 'master'
...
Revert "Merge branch 'revert-b10718c5' into 'master'"
See merge request veloren/veloren!2176
2021-04-21 17:47:18 +00:00
