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,658 Commits 151 Branches 18 Tags 2.1 GiB
057b1a4ad6
Commit Graph

12658 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam
057b1a4ad6 Added capability for attacks to be interrupted by dodging or blocking 2022-10-27 20:06:29 -04:00
Sam
c09e858cba Single target melee attacks now hit the closest target instead of a random target. 2022-10-27 20:06:28 -04:00
Sam
1e0dfe003d Rolling can now only interrupt abilities when in buildup 2022-10-27 20:06:28 -04:00
Sam
7b27b63122 Melee attacks now only hit a single target by default 2022-10-27 20:06:28 -04:00
Sam
af39287331 Added support for abilities being cheaper if activated from the correct stance 2022-10-27 20:06:27 -04:00
Sam
0ff06edcdc Combo melee skips recover if continuously striking. Combo animations consolidated to one file. 2022-10-27 20:06:27 -04:00
Sam
17258975fc Combo melee 2 state 2022-10-27 20:06:26 -04:00
Isse
38c9d87624 Merge branch 'fix_soundtrack' into 'master' 
fix soundtrack

See merge request veloren/veloren!3676
 2022-10-27 17:40:51 +00:00
flo
42ffb54fd7 fix soundtrack 2022-10-27 17:40:51 +00:00
Joshua Barretto
ab8d61afc8 Merge branch 'fix_facegourd_name' into 'master' 
fix facegourd item name

See merge request veloren/veloren!3674
 2022-10-27 13:49:07 +00:00
flo
34eae80253 fix facegourd item name 2022-10-27 13:49:06 +00:00
Marcel
5d5a2d5ff8 Merge branch 'DaforLynx/halloween-soundtrack' into 'master' 
Halloween soundtrack with automatic functionality

See merge request veloren/veloren!3672
 2022-10-27 06:56:39 +00:00
DaforLynx
926c1bc533 Halloween soundtrack with automatic functionality 2022-10-27 06:56:39 +00:00
Samuel Keiffer
7eaae7eb51 Merge branch 'zesterer/fxupscale' into 'master' 
Added FxUpscale and graphics presets

See merge request veloren/veloren!3673
 2022-10-27 00:40:08 +00:00
Joshua Barretto
29d40cf509 Added graphics presets 2022-10-27 01:15:40 +01:00
Joshua Barretto
4db88bb22c Better sampling of noisy regions 2022-10-27 01:15:21 +01:00
Joshua Barretto
589f59b771 Improve FxUpscale quality for distant objects 2022-10-27 01:15:21 +01:00
Joshua Barretto
f29b1da583 Implemented FxUpscale 2022-10-27 01:15:20 +01:00
Marcel
779cccd238 Merge branch 'kevinsmia1939/thai-translate' into 'master' 
Improve and fix Thai translation.

See merge request veloren/veloren!3666
 2022-10-25 21:37:58 +00:00
Kavin Teenakul
40c949c274 Improve and fix Thai translation. 2022-10-25 21:37:58 +00:00
Marcel
51d4c8dd51 Merge branch 'halloween' into 'master' 
Halloween event

See merge request veloren/veloren!3668
 2022-10-25 21:37:34 +00:00
Samuel Keiffer
f676e732f6 Merge branch 'flaffwaffle/action_state_concurrent_states' into 'master' 
ActionState extensions to allow for multiple concurrent state variables And More Complex AI

See merge request veloren/veloren!3659
 2022-10-25 03:21:46 +00:00
Timothy Finnegan
1922d69154 Ran Cargo fmt 2022-10-24 19:52:37 -07:00
Samuel Keiffer
5ad84b7fca Merge branch 'kitswas/poise-indicator' into 'master' 
Poise Indicator

See merge request veloren/veloren!3582
 2022-10-24 23:58:12 +00:00
flo666
ada9bd8f36 fix unitest error: 
layer::wildlife::tests::test_name_uniqueness' panicked at 'world.wildlife.spawn.calendar.halloween.halloween:
 2022-10-25 00:33:36 +02:00
flo666
9b1efe1bee clippy, fmt, remove leftover file, fix sitenames in soundtrack 2022-10-25 00:33:23 +02:00
IsseW
18659f7d09 Consumable sounds 2022-10-25 00:31:33 +02:00
IsseW
9a6a3a05a1 bat config 2022-10-25 00:31:04 +02:00
kitswas
6fe58d107c Update CHANGELOG.md 2022-10-24 22:05:53 +05:30
kitswas
9b692d072f Added checkbox in the settings for poisebar 
See [this message on Discord](https://discord.com/channels/449602562165833758/1014778601368997958/1033838446575370351).
 2022-10-24 22:05:11 +05:30
kitswas
b35225a13d Used constant POISEBAR_TICK_COLOR 
Should have done it earlier.
 2022-10-24 22:05:11 +05:30
kitswas
e472632426 Rebased and implemented a TODO 
Converted individual poise bar tick values to a list.

Co-authored-by: Samuel Keiffer <samuelkeiffer@gmail.com>
 2022-10-24 22:05:11 +05:30
kitswas
c83ec87d6a Code cleanup 2022-10-24 22:05:11 +05:30
kitswas
e29a9f4e36 Colour reflects old poise state 2022-10-24 22:05:11 +05:30
kitswas
6ff5f540bf Colour changes by poise state 2022-10-24 22:05:11 +05:30
kitswas
6b2a41ade7 Ticks at every threshold 2022-10-24 22:05:11 +05:30
kitswas
78ce257d87 Removed numbers from the poisebar 2022-10-24 22:05:11 +05:30
kitswas
4a8536672c Removed unused import 2022-10-24 22:05:11 +05:30
kitswas
b21764c99f Added tick mark for the upcoming threshold 2022-10-24 22:05:11 +05:30
kitswas
be586aa84f Extracted hard-coded poise thresholds to a constant 2022-10-24 22:05:11 +05:30
kitswas
202ac7ced8 Changed the poisebar's position 2022-10-24 22:05:11 +05:30
kitswas
65e6db9ef8 Separated the poise images 
The energy images were duplicated.
 2022-10-24 22:05:11 +05:30
kitswas
0f3d6b3e3e Poisebar for the player 2022-10-24 22:05:11 +05:30
Timothy Finnegan
cd5ae96424 Undid accidental/unnecessary changelog changes 2022-10-23 18:44:11 -07:00
Timothy Finnegan
3be4cede30 Merge remote-tracking branch 'origin/flaffwaffle/action_state_concurrent_states' into flaffwaffle/action_state_concurrent_states 2022-10-23 18:38:31 -07:00
Tim Finnegan
a21a674ed1 Merge branch 'master' into 'flaffwaffle/action_state_concurrent_states' 
# Conflicts:
#   CHANGELOG.md
 2022-10-24 01:35:25 +00:00
Timothy Finnegan
3677d27cbc Merge branch 'flaffwaffle/action_state_concurrent_states' of https://gitlab.com/veloren/dev/veloren into flaffwaffle/action_state_concurrent_states 2022-10-23 18:32:24 -07:00
Timothy Finnegan
498cb86be9 Updated enum names for consistency 2022-10-23 18:31:09 -07:00
Timothy Finnegan
ab4e46c533 Updated the changelog to include the changes. 2022-10-23 18:31:09 -07:00
Timothy Finnegan
5e5e1066eb Added support for multiple timers, conditions, and counters in a single action node. 2022-10-23 18:31:09 -07:00