Commit Graph

12787 Commits

Author SHA1 Message Date
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
flo666
a64236f50f quadruped_medium shockwave animation WIP 2022-11-13 19:41:18 +01:00
Eternalisime
19fb2e6416 fixed format 2022-11-13 11:45:03 +01:00
Eternalisime
8aa4f782f4 added a space 2022-11-13 11:27:17 +01:00
Eternalisime
ed25a84c72 combat: tweaked roshwalr melee detection and range 2022-11-12 13:51:27 +01: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
Eternalisime
f1b77e27fe combat: lowered flee_health on roshwalr 2022-11-10 16:57:29 +01:00
Eternalisime
e1e78a914f combat: added angle condition on shockwave 2022-11-10 14:24:06 +01:00
Eternalisime
918d5eb345 combat: added a unique kit to roshwalr 2022-11-10 13:53:12 +01:00
LunarEclipse
0e476cd3df Merge branch 'lunareclipse/update-personal-information' into 'master'
Updated some of my personal info

See merge request veloren/veloren!3691
2022-11-09 00:33:52 +00:00
LunarEclipse
32abb59132 Updated some of my personal info 2022-11-08 23:06:32 +01:00
Samuel Keiffer
97f3fa56d3 Merge branch 'DaforLynx/event-music' into 'master'
Event music can use more than one event at a time. Added test for soundtracks.

See merge request veloren/veloren!3686
2022-11-07 22:39:25 +00: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
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
Isse
aa846ddb31 Merge branch 'door-fixes' into 'master'
Doors now animate opening when entities are near them.

See merge request veloren/veloren!3683
2022-11-05 18:38:53 +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
Joshua Barretto
836d4e4427 Merge branch 'bats' into 'master'
bats

See merge request veloren/veloren!3681
2022-11-01 15:01:18 +00:00
flo
da65485228 bats 2022-11-01 15:01:18 +00:00
Avi Weinstock
2242f7245d Avoid placing site2 houses on paths (this affects worldgen even with train tracks disabled, since the paths are already there). 2022-10-31 14:55:13 -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
Marcel
7cb701e469 Merge branch 'holychowders/dont_just_stand_there_when_attacked' into 'master'
Flee if attacked even if attacker is not close.

See merge request veloren/veloren!3669
2022-10-28 21:31:49 +00:00
holychowders
3d4ad29d1d Flee if attacked even if attacker is not close. 2022-10-28 21:31:49 +00:00
Samuel Keiffer
dda62b998d Merge branch 'sword' into 'master'
Sword

See merge request veloren/veloren!3662
2022-10-28 01:01:07 +00:00
Sam
b090467f19 Changelog 2022-10-27 20:33:52 -04: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
b5682c4682 Addressed review comments 2022-10-27 20:07:09 -04:00
Sam
a44c36432e Fixed that equipping weapons by using them from hotbar would bypass equipping animation. 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
e1f76e0127 Fixed sword AI after contextualized sword 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
07d273aa09 Removed unneccessary term in skill point cost calculation 2022-10-27 20:07:07 -04:00
Sam
172c9e0689 Fixed inability to use abilities while in a stance 2022-10-27 20:07:07 -04:00
Sam
273949369f Fix unit tests 2022-10-27 20:07:06 -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
2e8ad96121 Stances now require a small amount of time to enter them 2022-10-27 20:07:05 -04:00
Sam
eb67cc2cf7 Reaching stance AI 2022-10-27 20:07:04 -04:00
Sam
9b4dcbfdde Heavy 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