Joshua Barretto
6070bd6538
Merge branch 'master' into 'master'
...
Italian: hud-map-bridge
See merge request veloren/veloren!3717
2022-12-29 13:09:21 +00:00
Christof Petig
0fba3a73e4
Merge branch 'raresgmihalcea/update_flashing_lights_description' into 'master'
...
Update description of the flashing lights setting
See merge request veloren/veloren!3727
2022-12-29 13:01:59 +00:00
Monty Marz
6b74437c8c
Bag icon improvement
2022-12-23 15:22:13 +00:00
Marcel
5f4f285523
Merge branch 'christmas-2022' into 'master'
...
Christmas 2022 changes
See merge request veloren/veloren!3721
2022-12-22 21:06:51 +00:00
DaforLynx
5e282340ba
Christmas 2022 changes
2022-12-22 21:06:51 +00:00
Joshua Barretto
1798cdcffe
Merge branch 'zesterer/floofy-clouds' into 'master'
...
Floofy Clouds (improved cloud performance and visuals)
See merge request veloren/veloren!3726
2022-12-17 15:41:08 +00:00
Joshua Barretto
dcc4762106
Fixed moon lighting of clouds
2022-12-17 15:04:57 +00:00
Joshua Barretto
5cf3aefb87
Better storm clouds
2022-12-17 14:57:55 +00:00
Rares
d63f8850a4
Update description of the flashing lights setting
...
The lights are supposed to be enabled when the setting is checked
The new description should better reflect the intended behaviour
Only the English descriptions have been updated.
2022-12-16 21:34:22 +02:00
Joshua Barretto
94c0e3749e
Improved cloud visuals and performance
2022-12-15 23:56:28 +00:00
Marcel Märtens
b8afaafe69
fix spanish file movement
2022-12-15 21:39:59 +01:00
Francesco Vasco
03fae4f434
Italian: hud-map-bridge
2022-12-13 19:36:54 +01:00
Gamma
0e2fe6ff15
update the Spanish translation
2022-12-04 23:43:51 +00:00
rmdlv
f64af1dc86
Russian translation fixes
2022-12-03 19:40:45 +08:00
Marcel
122d2df04f
Merge branch 'tygyh/Swedish-translations' into 'master'
...
Update swedish translations
See merge request veloren/veloren!3705
2022-12-01 14:10:00 +00:00
Jonathan Berglin
511026fd65
Update swedish translations
2022-12-01 14:09:59 +00:00
Marcel
f96776b060
Merge branch 'alejandrohernandezcarbonero83-master-patch-36663' into 'master'
...
Update npc.ftl
See merge request veloren/veloren!3715
2022-12-01 13:39:25 +00:00
electro79
dfc31eb0b5
Update npc.ftl
2022-11-30 16:55:10 +00:00
Marcel
ba62cc853e
Merge branch 'Madrots/update-es_LA' into 'master'
...
Madrots/update-es_LA
See merge request veloren/veloren!3708
2022-11-30 15:34:33 +00:00
Madrots
605a0a07b0
Madrots/update-es_LA
2022-11-30 15:34:32 +00:00
Marcel
82e4520407
Merge branch 'master' into 'master'
...
Added 'hud-skill-set_as_exp_bar' in italian.
See merge request veloren/veloren!3710
2022-11-30 15:34:29 +00:00
Francesco Vasco
0ba7e5a06e
Added 'hud-skill-set_as_exp_bar' in italian.
2022-11-30 15:34:27 +00:00
Marcel
44bca9a1b0
Merge branch 'floppy_dagon_kit' into 'master'
...
dagon_kit
See merge request veloren/veloren!3696
2022-11-30 15:27:21 +00:00
flo
466ed2c382
dagon_kit
2022-11-30 15:27:21 +00:00
Marcel
7191ee9325
Merge branch 'alejandrohernandezcarbonero83-master-patch-19384' into 'master'
...
Update char_selection.ftl
See merge request veloren/veloren!3711
2022-11-30 15:18:04 +00:00
IsseW
7296843923
simple bridges
2022-11-30 15:13:52 +01:00
electro79
b5cb66d053
Update char_selection.ftl
2022-11-29 21:56:21 +00:00
DaforLynx
d338906b19
More music and artist links
2022-11-25 18:48:56 +00:00
Monty Marz
3abfa4d2cc
Add Exp-Bar
2022-11-22 11:52:39 +00:00
Marcel
1a92bd7fe1
Merge branch 'master' into 'master'
...
Italian transaltion
See merge request veloren/veloren!3687
2022-11-21 16:24:06 +00:00
Francesco Vasco
d127bcc5d8
Italian transaltion
2022-11-21 16:24:06 +00:00
Justin Shipsey
a75b1bc21c
Merge branch 'mossdrake_and_wood_fix' into 'master'
...
reduce mossdrake, fix woodgolem loottable
See merge request veloren/veloren!3700
2022-11-21 14:22:16 +00:00
flo
e7b802712d
reduce mossdrake, fix woodgolem loottable
2022-11-21 14:22:15 +00:00
Marcel
107cc8963f
Merge branch 'Halosesparta13-master-patch-90913' into 'master'
...
Translation for the "ability.ftl" file to the es_LA folder
See merge request veloren/veloren!3613
2022-11-20 18:16:49 +00:00
Halosesparta
cfcf197e32
Translation for the "ability.ftl" file to the es_LA folder
2022-11-20 18:16:48 +00:00
Marcel
e5979c78f8
Merge branch 'kuba1001t/update-pl_PL' into 'master'
...
Update polish translations
See merge request veloren/veloren!3677
2022-11-20 18:13:01 +00:00
Marcel
833ae2331a
Merge branch 'tygyh/Swedish-translations' into 'master'
...
Update swedish translations
See merge request veloren/veloren!3682
2022-11-20 18:12:59 +00:00
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
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
Eternalisime
7c66c94fa2
fix loot table
2022-11-13 22:49:29 +01:00
Eternalisime
48e23dba49
combat: reverted tweak on shockwave and changed loot table
2022-11-13 22:45:05 +01:00
Eternalisime
6e18683d98
combat: tweak on shockwave
2022-11-13 22:24:01 +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
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
Eternalisime
ed25a84c72
combat: tweaked roshwalr melee detection and range
2022-11-12 13:51:27 +01: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
Eternalisime
13980861f8
combat: tweaked roshwalr AI
2022-11-11 16:37:58 +01:00
Eternalisime
8f4863be28
combat: balance tweaks on roshwalr
2022-11-11 10:22:23 +01:00
Monty Marz
a763a865fe
Musical Instruments part 2
2022-11-10 20:59:53 +00:00
Eternalisime
918d5eb345
combat: added a unique kit to roshwalr
2022-11-10 13:53:12 +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
Joshua Barretto
b64ca9e698
Tweaked door opening, many entities push grass
2022-11-02 14:44:18 +00:00
Avi Weinstock
ff5acf18d7
Doors now animate opening when entities are near them.
2022-11-01 19:29:51 -04:00
flo
da65485228
bats
2022-11-01 15:01:18 +00:00
tygyh
abd2e0832f
Update swedish translations
2022-11-01 11:05:51 +01: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
08a50afd9f
Mostly working train tracks.
2022-10-28 21:36:42 -04:00
Kuba 1001
92465bfe59
lang(pl_PL): update polish translations
2022-10-28 17:46:17 +02:00
Sam
7022350693
Sword AI now randomly rolls again
2022-10-27 20:07:11 -04:00
Sam
d60839010a
Rebase commit
2022-10-27 20:07:10 -04:00
Sam
0fe073fcdc
Addressed feedback from testing
2022-10-27 20:07:10 -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
5674923a54
Changed exp/sp progression for sword skill tree
2022-10-27 20:07:06 -04:00
Sam
a21ce80daf
Tweaked sword component stats
2022-10-27 20:07:05 -04:00
Sam
38ce87d80b
Initial balance pass on sword ability stats
2022-10-27 20:07:05 -04:00
Sam
eb67cc2cf7
Reaching stance AI
2022-10-27 20:07:04 -04:00
Sam
43a5a2a93a
Parrying stance AI
2022-10-27 20:07:03 -04:00
Sam
df9ef691fd
Cleaving stance AI
2022-10-27 20:07:03 -04:00
Sam
5358016ba0
Crippling stance AI
2022-10-27 20:07:02 -04:00
Sam
c7d3aa19e4
Mobility stance AI
2022-10-27 20:07:02 -04:00
Sam
c97bfdfb94
Defensive stance AI
2022-10-27 20:07:01 -04:00
Sam
7dcb3582e6
Sword AI for offensive abilities
2022-10-27 20:07:01 -04:00
Sam
4ab3abfc07
Balanced stance AI
2022-10-27 20:07:01 -04:00
Sam
bc8f794309
New ability icons
2022-10-27 20:06:59 -04:00
Sam
b3a15f61aa
Fixed issue where you could cancel combo melee 2 mid strike
2022-10-27 20:06:58 -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
Sam
73a36235fc
Animation for mobility feint
2022-10-27 20:06:52 -04:00
Sam
eb7c2337dd
Animation for heavy finisher
2022-10-27 20:06:50 -04:00
Sam
871d480639
Combo related skill icons
2022-10-27 20:06:50 -04:00
Sam
be3f2dca92
Animation for heavy pommel strike
2022-10-27 20:06:49 -04:00
Sam
ba4c28e83a
Animation for heavy combo
2022-10-27 20:06:49 -04:00
Sam
d7a0a6e743
Animation for parrying counter
2022-10-27 20:06:49 -04:00
Sam
632941e99d
Animation for parrying riposte
2022-10-27 20:06:48 -04:00
Sam
7c22847009
Animation for parrying parry
2022-10-27 20:06:48 -04:00
