Samuel Keiffer
5709427e63
Merge branch 'sam/small-fixes' into 'master'
...
Small fixes for sword
See merge request veloren/veloren!3694
2022-11-16 23:33:12 +00:00
Sam
b2b8ea1772
Made calculation of prim count more accurate
2022-11-15 19:54:08 -05:00
Imbris
dfbb8fa1a9
Merge branch 'hjalle2000/snappy_ui' into 'master'
...
snappy ui scaling by having a addtional dropdown menu
See merge request veloren/veloren!3695
2022-11-15 13:56:28 +00:00
Marcel
997c5a4e61
Merge branch 'ythern/more_unique_abilities' into 'master'
...
Ythern/roshwalr kit
See merge request veloren/veloren!3692
2022-11-15 09:58:06 +00:00
Marcel Märtens
e10df6ec58
snappy ui scaling by having a addtional dropdown menu
2022-11-15 10:28:57 +01:00
Eternalisime
7113befe88
removed useless check
2022-11-13 22:21:32 +01:00
Eternalisime
71e59e4b81
combat: tweaks and modified shockwave animation
2022-11-13 22:04:00 +01:00
Sam
4784b61656
Small fixes
2022-11-13 14:03:37 -05:00
flo666
a64236f50f
quadruped_medium shockwave animation WIP
2022-11-13 19:41:18 +01:00
Justin Shipsey
aa2fabcd45
Merge branch 'mossdrake' into 'master'
...
Moss Drake
See merge request veloren/veloren!3693
2022-11-12 13:00:44 +00:00
flo
0351bf1d63
Moss Drake
2022-11-12 13:00:42 +00:00
Justin Shipsey
420e824a3e
Merge branch 'train-track-shadows' into 'master'
...
Train track shadows
See merge request veloren/veloren!3688
2022-11-12 13:00:24 +00:00
Christof Petig
a820eee289
Merge branch 'floppy-bat-wing-tweaks' into 'master'
...
tweak bat wing animation
See merge request veloren/veloren!3684
2022-11-12 10:18:11 +00:00
flo
df70381a7c
tweak bat wing animation
2022-11-12 10:18:10 +00:00
Marcel
7a75b72aa3
Merge branch 'KingPEPSALT/improve_time_command' into 'master'
...
FIX #1622 , /time command will not allow time going backwards as rtsim cannot...
See merge request veloren/veloren!3570
2022-11-11 10:30:44 +00:00
Avi Weinstock
e72719ddf1
Hitboxes no longer cast shadows.
2022-11-10 18:26:11 -05:00
Monty Marz
a763a865fe
Musical Instruments part 2
2022-11-10 20:59:53 +00:00
LunarEclipse
f6e2c6885c
Cargo fmt
2022-11-10 17:19:43 +01:00
pepsalt
5294603431
changed {:?}s to {}s in format strings
2022-11-10 17:18:59 +01:00
pepsalt
f22a9d030d
CHANGE: moved time of day interpolation logic out of Client and into Scene for semantics and accessing the settings logically
2022-11-10 17:16:48 +01:00
pepsalt
775025ac63
CHANGE, client time lerp would cause flashing lights for large discrepancies, it now no longer lerps if the flashing lights setting is not on
2022-11-10 17:16:45 +01:00
DaforLynx
b2b14e7ab4
Event music can use more than one event at a time. Added test for soundtracks.
2022-11-07 22:39:25 +00:00
Avi Weinstock
18657fdb66
Render train tracks to the shadow map.
2022-11-06 20:54:58 -05:00
Avi Weinstock
db251273ed
Apply shadow map shadows to train tracks.
2022-11-06 18:09:07 -05:00
Samuel Keiffer
72bffe0df8
Merge branch 'train-tracks' into 'master'
...
Train tracks
See merge request veloren/veloren!3679
2022-11-05 22:56:07 +00:00
Avi Weinstock
f5c1293e9f
Address review comments for MR 3679:
...
- Fix normal vectors/lighting for train tracks.
- Adjust chat command logging statement.
- Remove train tracks when their chunks get unloaded.
- Create a struct for the 6-tuple returned from `get_nearest_ways`.
- Move code that creates the train tracks into `layers::apply_trains_to`.
2022-11-03 15:20:53 -04:00
Avi Weinstock
ff5acf18d7
Doors now animate opening when entities are near them.
2022-11-01 19:29:51 -04:00
Avi Weinstock
f83afcd5a8
Make train tracks configurable as a worldgen feature. Fixes for clippy and fmt.
2022-10-29 14:50:52 -04:00
Avi Weinstock
372ffe45d7
Add command for debugging ways.
2022-10-29 14:32:48 -04:00
Joshua Barretto
1c1ff2189e
Merge branch 'zesterer/fxupscale' into 'master'
...
Fixed window scale reset bug
See merge request veloren/veloren!3675
2022-10-29 12:59:06 +00:00
Avi Weinstock
08a50afd9f
Mostly working train tracks.
2022-10-28 21:36:42 -04:00
Sam
0fe073fcdc
Addressed feedback from testing
2022-10-27 20:07:10 -04:00
Sam
b5682c4682
Addressed review comments
2022-10-27 20:07:09 -04:00
Sam
1782408676
Address UX issues of contextual abilities.
2022-10-27 20:07:08 -04:00
Sam
8cfe62e6dc
Activated abilities can now be contextualized
2022-10-27 20:07:07 -04:00
Sam
273949369f
Fix unit tests
2022-10-27 20:07:06 -04:00
Sam
2e8ad96121
Stances now require a small amount of time to enter them
2022-10-27 20:07:05 -04:00
Sam
df9ef691fd
Cleaving stance AI
2022-10-27 20:07:03 -04:00
Sam
c97bfdfb94
Defensive stance AI
2022-10-27 20:07:01 -04:00
Sam
937db8706c
Made animations when dual wielding less bad
2022-10-27 20:07:00 -04:00
Sam
8d3567b6b2
Made combo melee more ergonomic to use when it is a stance
2022-10-27 20:06:59 -04:00
Sam
191174aa30
The currently active stance shows as a buff
2022-10-27 20:06:56 -04:00
Sam
d3a52bd63b
Buffed cleaving spin
2022-10-27 20:06:56 -04:00
Sam
ac2e2fd724
Added animations for recover section of all abilities
2022-10-27 20:06:55 -04:00
Sam
a8212d6f41
Dive melee now scales its attack off of the entity's vertical speed.
...
Parries now cause the attacker to effectively have a recover that is either twice as long or 0.5s longer, whichever is more.
Counters now deal twice as much damage to the target if the target is in the buildup portion of an ability.
2022-10-27 20:06:55 -04:00
Sam
356c26cc66
UI for sword skill tree.
2022-10-27 20:06:54 -04:00
Sam
b09b0222c4
Animation for reaching flurry, tweaked animation for balanced combo.
2022-10-27 20:06:54 -04:00
Sam
9091d46554
Animation for reaching charge. Changed dash melee code to probe with a test melee instead of performing the actual melee strike during charge.
2022-10-27 20:06:53 -04:00
Sam
2e5dfd86de
Animation for reaching skewer
2022-10-27 20:06:53 -04:00
Sam
035f9135d6
Animation for reaching combo
2022-10-27 20:06:52 -04:00
