Samuel Keiffer
a0899db36a
Merge branch 'slipped/oritweak' into 'master'
...
ori tweaks, animal adjusts
See merge request veloren/veloren!2234
2021-05-03 18:49:22 +00:00
Samuel Keiffer
7b82e9b1f4
Merge branch 'sam/ability-sets' into 'master'
...
Allow Specification of Custom Ability Sets per Weapon
See merge request veloren/veloren!2231
2021-05-03 17:50:11 +00:00
Avi Weinstock
bb7dbe245d
Make terrain compression a checkbox instead of a bandwidth (throughput?) heuristic.
2021-05-03 00:09:44 -04:00
James Melkonian
6956d364d1
Add map markers for lakes and mountains
2021-05-03 02:00:23 +00:00
jshipsey
f6043b7e53
ori addition to combomelee
2021-05-01 12:29:28 -04:00
Joshua Barretto
b471128ce5
Added map marker
2021-05-01 16:26:13 +00:00
Sam
c5ce67f36c
Made naming of fields more explicit.
2021-05-01 09:25:56 -04:00
Sam
3c3977d6a6
Formatting stuffs.
2021-05-01 09:25:53 -04:00
Sam
40d00f46cb
Removed clone in animations. Added GATs to animations to do so.
2021-05-01 09:25:53 -04:00
Sam
25c78dc660
Removed all unique and simple tool kinds.
2021-05-01 09:25:51 -04:00
Sam
3bf46fa640
Removed ability set as field on items.
2021-05-01 09:25:49 -04:00
DaforLynx
5358e7346a
Poise (stun) SFX and fix for town music
2021-04-29 23:36:22 +00:00
DaforLynx
5f8c7e54b5
Town music
2021-04-28 05:07:59 +00:00
Marcel
2abbd1cdda
Merge branch 'james/sound-unwraps' into 'master'
...
Remove an unwrap and move outcome sfx to ron
See merge request veloren/veloren!2206
2021-04-27 21:01:06 +00:00
James Melkonian
3ae25b8348
Remove an unwrap and move outcome sfx to ron
2021-04-27 21:01:06 +00:00
Marcel
134ee907bb
Merge branch 'yusdacra/chore/nix' into 'master'
...
build(nix): update flake deps, switch buildPlatform to use crate2nix
See merge request veloren/veloren!2202
2021-04-27 20:55:55 +00:00
Ludvig Böklin
b389806d2e
Glider physics
2021-04-27 14:41:48 +00:00
Yusuf Bera Ertan
78b1773c05
build(nix): switch to crate2nix
2021-04-27 05:18:12 +03:00
jshipsey
585e468de1
skill adjustments, ori changes
2021-04-25 22:02:32 -04:00
Samuel Keiffer
06d9ec1d8a
Merge branch 'juliancoffee/fix_campfire_heal_message' into 'master'
...
Fix campfire heal buff description
See merge request veloren/veloren!2165
2021-04-25 23:06:48 +00:00
Illia Denysenko
8cc6469626
Fix campfire heal buff description
2021-04-25 23:06:47 +00:00
Marcel
31098ad75b
Merge branch 'xMAC94x/reduce_deps' into 'master'
...
remove some unused deps Yuri found
See merge request veloren/veloren!2197
2021-04-25 20:22:31 +00:00
Marcel Märtens
fd5d1ffaf3
remove some unused deps Yuri found
2021-04-25 20:18:20 +02:00
Sam
c368883499
Cleaned up tweaks in ui and allowed sfx choosing to scale to amount of sfx variants provided.
2021-04-25 13:09:10 -04:00
Monty
c59f11ef6e
Add i18n, change SCT Blocked col and string
2021-04-25 13:09:09 -04:00
Sam
6294b3c5ff
Initial SCT implementation to display blocks.
2021-04-25 13:09:09 -04:00
Sam
fdd2b58954
Addressed testing feedback.
...
Particles better.
2021-04-25 13:09:08 -04:00
Sam
2d3d48e84c
Parrying no longer requires releasing the block button, and instead can parry if block happened in buildup.
2021-04-25 13:09:07 -04:00
alfy
434d1353eb
block and parry sounds added
2021-04-25 13:09:06 -04:00
Sam
b028b647ca
Blocking now works if no weapon is equipped in main hand.
...
Added temp sfx for blocking and parrying.
Added temp particles for successful parry.
Tweaked values of default block ability.
2021-04-25 13:09:02 -04:00
jshipsey
d4d2f4e79a
anim
2021-04-25 13:08:43 -04:00
Sam
c9e1b1d341
Melee weapons can now block.
2021-04-25 13:08:42 -04:00
Samuel Keiffer
eb86237922
Merge branch 'juliancoffee/fix_buff_bar' into 'master'
...
Fix bug with missing Burning icon
See merge request veloren/veloren!2195
2021-04-25 15:55:43 +00:00
juliancoffee
4cfc1bfecf
Fix Bug with missing Burning icon
2021-04-25 10:44:22 +03:00
juliancoffee
6f5b7b8de7
Update doc-strings
2021-04-25 09:12:15 +03:00
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
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
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
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
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
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
Monty Marz
ccb913a2c0
Add handles to lanterns, fix cooking pot scale
2021-04-22 17:12:07 +00:00
