Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,775 Commits 151 Branches 18 Tags 2.1 GiB
32abb59132
Commit Graph

12775 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
221b0aff5f Sword AI can now choose their abilities 2022-10-27 20:07:00 -04:00
Sam
937db8706c Made animations when dual wielding less bad 2022-10-27 20:07:00 -04:00
Sam
bc8f794309 New ability icons 2022-10-27 20:06:59 -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
21aabb5663 Parries now correctly return to their stance. 2022-10-27 20:06:58 -04:00
Sam
21dedb54b9 Fixed bug where you couldn't properly exit an ability if you had a return ability but lacked the requirements to return 2022-10-27 20:06:58 -04:00
Sam
b3a15f61aa Fixed issue where you could cancel combo melee 2 mid strike 2022-10-27 20:06:58 -04:00