Sam
19948ad6fd
Animation for defensive combo
2022-10-27 20:06:46 -04:00
Sam
0dea91e57f
Animation for cleaving dive
2022-10-27 20:06:46 -04:00
Sam
d907cd5e51
Animation for cleaving finisher
2022-10-27 20:06:45 -04:00
Sam
83829d1e1b
Animation for cleaving spin
2022-10-27 20:06:45 -04:00
Sam
8d252b7168
Cleaving combo animation
2022-10-27 20:06:44 -04:00
Sam
36287b7469
Animation for crippling strike
2022-10-27 20:06:44 -04:00
Sam
43b2e6bb70
Crippling gouge animation
2022-10-27 20:06:44 -04:00
Sam
4bbd7da929
Crippling finisher animation
2022-10-27 20:06:43 -04:00
Sam
919e515098
Animation for crippling combo
2022-10-27 20:06:43 -04:00
Sam
2bfc222793
Offensive finisher animation
2022-10-27 20:06:42 -04:00
Sam
894710d8c6
Offensive advance animation
2022-10-27 20:06:42 -04:00
Sam
1e959706a5
Animation for offensive combo
2022-10-27 20:06:41 -04:00
Sam
a64895d8c5
Animations for balanced abilities
2022-10-27 20:06:41 -04:00
Sam
da21e1cb02
Removed air slash stance and abilities
2022-10-27 20:06:40 -04:00
Sam
67fa03dc23
Fixed unintentional recovery from preceding strikes
2022-10-27 20:06:40 -04:00
jshipsey
1ae230c194
anim testing
2022-10-27 20:06:39 -04:00
Sam
4f2b1d37f8
Fixed consecutive strikes carrying animation over
2022-10-27 20:06:39 -04:00
Sam
c4987c3c48
Animations should use the state from the previous strike
2022-10-27 20:06:38 -04:00
jshipsey
0c054837f9
animation setup
2022-10-27 20:06:38 -04:00
Sam
ea287136cf
Hot anim fix
2022-10-27 20:06:37 -04:00
Sam
2116842d30
Bin program to generate dot files for skill trees
2022-10-27 20:06:37 -04:00
IsseW
20dea211d1
Riposte anim
2022-10-27 20:06:36 -04:00
Sam
2fcd876e3f
Air slash abilities
2022-10-27 20:06:35 -04:00
Sam
500e0ae3d0
Heavy abilities
2022-10-27 20:06:34 -04:00
Sam
8a578bf3f6
Parrying abilities
2022-10-27 20:06:34 -04:00
Sam
ec03bd7032
Cleaving abilities
2022-10-27 20:06:33 -04:00
Sam
fd05795b4c
Titles and descriptions for each ability.
2022-10-27 20:06:31 -04:00
Sam
66f9cf22fc
Balanced abilities and insert ability id into animations.
2022-10-27 20:06:30 -04:00
Sam
1e0dfe003d
Rolling can now only interrupt abilities when in buildup
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
Joshua Barretto
5634d63759
Fixed window scale reset bug
2022-10-27 13:31:32 +01:00
DaforLynx
926c1bc533
Halloween soundtrack with automatic functionality
2022-10-27 06:56:39 +00:00
Joshua Barretto
29d40cf509
Added graphics presets
2022-10-27 01:15:40 +01:00
Joshua Barretto
f29b1da583
Implemented FxUpscale
2022-10-27 01:15:20 +01:00
Marcel
51d4c8dd51
Merge branch 'halloween' into 'master'
...
Halloween event
See merge request veloren/veloren!3668
2022-10-25 21:37:34 +00:00
IsseW
9a6a3a05a1
bat config
2022-10-25 00:31:04 +02:00
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
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
Joshua Barretto
428816c65e
Addressed review comments
2022-10-23 23:54:55 +01:00
Joshua Barretto
40e47b4f3e
Added reflection mode settings
2022-10-23 20:03:21 +01:00
flo666
586d0f6dd8
add bat (created by Gemu)
2022-10-23 20:05:39 +02:00
Joshua Barretto
b85fd11443
Added refraction
2022-10-23 15:15:25 +01:00
Joshua Barretto
c072dc4082
Place puddle details behind extra experimental shader
2022-10-23 01:42:01 +01:00
Joshua Barretto
5c4090f099
Updated README
2022-10-23 01:42:01 +01:00
Joshua Barretto
0a5e257b77
Remove close-up camera jitter
2022-10-23 01:42:01 +01:00
Joshua Barretto
0561a168de
Added tracing to SSR
2022-10-23 01:42:00 +01:00
Joshua Barretto
daef86d813
Make screen-space reflections an experimental shader
2022-10-23 01:42:00 +01:00
Joshua Barretto
f00cc5f2de
The worst SSR
2022-10-23 01:42:00 +01:00
Joshua Barretto
db4cc21ec3
Fixed seams
2022-10-23 01:42:00 +01:00
Joshua Barretto
3f2efea4f2
Experimental river velocity in shaders
2022-10-23 01:42:00 +01:00
flo
050150e7e8
floppy_instruments_foot_animation_fix
2022-10-22 22:47:25 +00:00
flo
698a00bae3
savannah_pit
2022-10-22 19:48:50 +00:00
4ydx
4ae332b8d1
Fix int overflows causing crash when using /goto
2022-10-13 13:58:02 +00:00
Marcel
3d8cd6fb04
Merge branch 'juliancoffee/fix-i18n' into 'master'
...
Follow-up from i18n-helpers MR
See merge request veloren/veloren!3643
2022-10-01 16:01:23 +00:00
juliancoffee
9dc07a38db
Follow-up from i18n-helpers MR
2022-10-01 18:35:36 +03:00
Avi Weinstock
c62bc0dd0d
Allow pets to be traded with.
2022-09-30 14:51:49 -04:00
Marcel Märtens
0fe0192a2d
get rid of string replacements in template strings
2022-09-29 17:33:53 +02:00
Marcel Märtens
81cdcfc1a0
move voxygen/i18n to client/i18n to indicate that it can be used by more frontends if they want to make use of our helpers
2022-09-27 14:09:20 +02:00
Marcel Märtens
7f46bc5b78
switch name to i18n-helpers
2022-09-27 13:46:13 +02:00
Marcel Märtens
ba260e8419
translate MOD and YOU messages
2022-09-27 13:46:12 +02:00
Marcel Märtens
cc3fcfce8c
initial approach of utelising chat-i18n crate by chat-cli bot
2022-09-27 13:46:12 +02:00
Marcel Märtens
a0ef3be9ac
remove hardcoded localisation from client
2022-09-27 13:46:12 +02:00
Marcel
17c940e0f8
Merge branch 'xMAC94x/update_toolchain' into 'master'
...
update toolchain to `2022-09-23`
See merge request veloren/veloren!3615
2022-09-25 19:44:58 +00:00
Marcel Märtens
1e1ee5031f
remove enum_iterator with strum, fixes #1723
2022-09-25 16:09:46 +02:00
Marcel Märtens
cf6a764aa4
update toolchain to 2022-09-23
2022-09-25 15:58:32 +02:00
Marcel Märtens
c2b453f6f1
update toolchain to 2022-09-08
...
This reverts commit 6c9deee491a32b269252
2022-09-24 00:04:40 +02:00
Marcel Märtens
29d0f5b25d
update dependencies
2022-09-22 11:57:55 +02:00
Samuel Keiffer
59d8d287d9
Merge branch 'seachapel_npc_work' into 'master'
...
seachapel npc work
See merge request veloren/veloren!3599
2022-09-22 01:04:01 +00:00
flo
a37e1f8d99
seachapel npc work
2022-09-22 01:04:01 +00:00
Joshua Yanovski
57ea753bff
Merge branch 'sharp/parallel-ingame' into 'master'
...
Parallelize ingame messages.
See merge request veloren/veloren!3627
2022-09-21 19:44:40 +00:00
Joshua Yanovski
1c14ec7ee1
Parallelize ingame messages.
2022-09-21 10:25:57 -07:00
Joshua Yanovski
67231aff90
Remove persistence loading error from SkillSet.
...
This is needed (for now) in order to parallelize ingame_chat, because
one of the handled messages updates this value on the server. It turns
out that the value is not actually used on the server, only the client,
so this was mostly a matter of threading this back to the correct place.
Additionally, we took the opportunity to modify the UI to not log you
into the game until your character was confirmed to be loaded, which
was a todo item that lets us simplify some error handling logic and
remove stuff from global state.
2022-09-21 09:29:25 -07:00
Marcel
f590e68f7e
Merge branch 'mckol/mute-keybinds' into 'master'
...
Mute audio keybinds (and respective buttons in settings)
See merge request veloren/veloren!3361
2022-09-21 09:22:45 +00:00
Samuel Keiffer
188db01a7b
Merge branch 'sam/hot-agent' into 'master'
...
Agent combat tactics hot reloading
See merge request veloren/veloren!3629
2022-09-21 02:44:51 +00:00
Imbris
1b48a3008c
Merge branch 'Couls/TestBed' into 'master'
...
Extend item pickup UI to group members
Closes #1402
See merge request veloren/veloren!3521
2022-09-20 22:13:50 +00:00
Couls
4a4c061b55
Extend item pickup UI to group members
2022-09-20 22:13:50 +00:00
Koboo
bb0382e76c
Koboo/update de de
2022-09-18 18:58:34 +00:00
LunarEclipse
2d092635ed
Moved some code around to put it in logical order
2022-09-17 12:48:38 +02:00
Sam
3d6c9a780d
Removed redundant package parameter from init function of hot reloading
2022-09-17 00:55:28 -04:00
Sam
cfeb197f85
Removed duplicate crates added so there could be dynamic crates, now compiled with crate type specified instead.
2022-09-17 00:50:59 -04:00
Sam
23c51af437
Consolidated voxygen and server dynlibs into a common dynlib
2022-09-16 23:43:26 -04:00
LunarEclipse
22c99af9d1
Now when master volume is muted other volume icons are grayed out.
2022-09-16 21:30:31 +02:00
Ben Wallis
7aa1feea22
Merge branch 'xvar/better-voxygen-panic-messages' into 'master'
...
Reworked panic dialog to support displaying the likely cause of common panics
See merge request veloren/veloren!3589
2022-09-16 09:59:02 +00:00
Joshua Yanovski
e9a463d459
Revert "Merge branch 'xMAC94x/update-deps' into 'master'"
...
This reverts merge request !3608
2022-09-15 18:51:48 +00:00
Joshua Yanovski
f481e8cd4f
Unrevert fix to shaderc.
2022-09-15 17:24:47 +01:00
Joshua Yanovski
cafdcad8ce
Merge branch 'sharp/improve-msg' into 'master'
...
Improve some server system performance
See merge request veloren/veloren!3614
2022-09-15 04:30:31 +00:00
Joshua Yanovski
2c15d0af56
Reduce overhead of messaging systems.
2022-09-14 21:04:53 -07:00
Marcel
725fd09ed7
Merge branch 'yusdacra/nix' into 'master'
...
!2951 with fixed runtime panic
See merge request veloren/veloren!3605
2022-09-14 10:12:07 +00:00
flo
dc688bccb9
fix_salamander_and_elbst
2022-09-13 17:32:53 +00:00
Ben Wallis
f1a2031f22
Reworked panic dialog to support displaying the likely cause of common panics
2022-09-12 21:03:30 +01:00
Joshua Yanovski
aea4aca057
Merge branch 'xmac94x/steal-sharps-clippy-improvements' into 'master'
...
Xmac94x/steal sharps clippy improvements
See merge request veloren/veloren!3612
2022-09-11 19:56:35 +00:00
Marcel Märtens
6c9deee491
revert wgpu/shaderc changes
2022-09-11 16:38:08 +02:00
Marcel Märtens
a32b269252
steal sharps clippy improvements to the old nightly
2022-09-11 16:10:56 +02:00
Samuel Keiffer
513b135d58
Merge branch 'floppy_instrument_sample_edits' into 'master'
...
add guitar & instrument sample edits
See merge request veloren/veloren!3574
2022-09-10 17:23:38 +00:00
flo
e43608ce80
add guitar & instrument sample edits
2022-09-10 17:23:38 +00:00
Joshua Barretto
b3b2f404e5
Fixed FXAA at non-1.0x scales
2022-09-10 13:33:38 +01:00
Joshua Barretto
80fa0baf09
Added HQX anti-aliasing
2022-09-10 10:56:22 +01:00
Joshua Barretto
03e8eb42ad
Added experimental BetterAA shader
2022-09-09 11:59:40 +01:00
LunarEclipse
796a5f2f90
Added the possibility to toggle muting of any volume category via a keybind
2022-09-09 11:39:27 +02:00
Joshua Yanovski
986d104faa
Update Rust toolchain.
2022-09-08 15:43:53 -07:00
Marcel Märtens
d9e6f10688
update dependencies
2022-09-08 23:29:08 +02:00
Joshua Yanovski
5bb27d9292
Fix swallowed network error messages.
2022-09-08 04:00:46 -07:00
Yusuf Bera Ertan
58e74a26cd
Revert "Merge branch 'revert-441acd3e' into 'master'"
...
This reverts commit f170da4da6aa7569061b
2022-09-08 12:28:56 +03:00
Joshua Yanovski
e55b541bcc
Revert "Merge branch 'yusdacra/chore/nix' into 'master'"
...
This reverts merge request !2951
2022-09-08 08:33:35 +00:00
Samuel Keiffer
aa7569061b
Merge branch 'juliancoffee/more-buffs' into 'master'
...
Add Golden Cheese debug potion
See merge request veloren/veloren!3597
2022-09-08 01:01:18 +00:00
Joshua Yanovski
c95c08ee54
Merge branch 'sharp/fix-full-server' into 'master'
...
Allow mods/admins to log in when server is full.
See merge request veloren/veloren!3600
2022-09-07 05:21:08 +00:00
Joshua Yanovski
f5aee1d2a7
Allow mods/admins to log in when server is full.
...
As a side effect, this moves the initial game server sync message into
the login code, since that's the first place we can check for admin
permissions and we want to avoid sending large messages to users who are
not authenticated (especially if the player cap has been reached;
previously, the player cap check limited the damage that could be done
by unauthenticated players).
Some fallout from this is that we don't synchronize the Player component
anymore, which had some minor effects on voxygen. This update also
breaks Torvus, since Client::new now expects the username and password
to be provided from the getgo--an accompanying MR will be submitted to
fix it.
2022-09-06 21:42:31 -07:00
Imbris
441acd3e48
Merge branch 'yusdacra/chore/nix' into 'master'
...
build(nix): refactor and update nix flake
See merge request veloren/veloren!2951
2022-09-07 03:42:28 +00:00
juliancoffee
34c5e95d8a
Add Energy regen buff
...
* Fix broken i18n keys for health and energy increases
* Better handle buff descriptions
Calculate infobox lines for item stats to set correct infobox frame
dimensions
2022-09-06 15:50:04 +03:00
Isse
7ea720b2ef
Merge branch 'creature_model_updates' into 'master'
...
Creature model updates
See merge request veloren/veloren!3584
2022-09-06 10:35:11 +00:00
flo
e4a3671345
Creature model updates
2022-09-06 10:35:10 +00:00
Imbris
9dbff4c342
[voxygen] Disable editing server address if it is supplied via CLI and hide server list button (with an unlock button to re-enable editing)
2022-09-03 20:24:50 -04:00
Imbris
1888863915
Add CLI argument to voxygen that allows specifying a value to place into the server field in the main menu.
2022-09-03 17:26:07 -04:00
LunarEclipse
be9e0497d1
Fixed the ambience volume ui element positions
2022-09-03 21:56:25 +02:00
LunarEclipse
24c50fab3b
Updated the code to use the new hover icons
2022-09-03 21:56:25 +02:00
LunarEclipse
36167f2e3a
Renamed some files, added missing img_ids.
2022-09-03 21:56:25 +02:00
Mckol
e9ba3ffa4a
Added the possibility to not assign a default keybind to a GameInput
2022-09-03 21:56:00 +02:00
Mckol
e4b213cac5
Added a keybind for muting the music [F8]
2022-09-03 20:33:08 +02:00
Mckol
6605c2657f
Added mute buttons for all of the audio sliders in settings
2022-09-03 20:31:04 +02:00
Yusuf Bera Ertan
7a2d647400
build(nix): wrap veloren-voxygen in wrapper derivation
2022-09-03 07:12:18 +03:00
Yusuf Bera Ertan
1ca6ebdda0
build(nix): add missing library for voxygen
2022-09-03 03:34:10 +03:00
Yusuf Bera Ertan
5b901d9775
build(nix): update flake lock, fix stuff
2022-09-02 21:13:57 +03:00
flo
6c89cd8fbf
put Organ under Toolkind Instrument
2022-08-30 16:55:02 +00:00
juliancoffee
b892e00699
Fix hud-skill-sc_wardaura_duration key
2022-08-30 00:49:40 +03:00
Marcel
60f05f45a7
Merge branch 'juliancoffee/better-i18n-keys' into 'master'
...
Remake price-tips internationalization
See merge request veloren/veloren!3571
2022-08-29 12:18:36 +00:00
Samuel Keiffer
52ce12f383
Merge branch 'floppy-music-instruments' into 'master'
...
Music Instruments
See merge request veloren/veloren!3535
2022-08-28 18:48:18 +00:00
flo
9339971032
Music Instruments
2022-08-28 18:48:18 +00:00
Joshua Yanovski
6032dbd22a
Merge branch 'seachapel_fixes' into 'master'
...
seachapel_fixes
See merge request veloren/veloren!3572
2022-08-27 08:03:04 +00:00
flo666
eae1c5ff69
set difficulty indicator to 4
2022-08-27 08:11:35 +02:00
juliancoffee
76cd36b179
Remake price-tips internationalization
2022-08-26 17:56:32 +03:00
Imbris
e626519ec0
Replace "Present Mode" options with more user friendly terms:
...
'Fifo' -> 'Vsync capped'
'Mailbox' -> 'Vsync uncapped'
'Immediate' -> 'Vsync off'
2022-08-25 23:24:43 -04:00
Imbris
37caab539c
Replace uses of "65" with client::MAX_SELECTABLE_VD in client and
...
voxygen crates.
2022-08-25 23:24:43 -04:00
Imbris
334937568e
Add an entity view distance setting that allows limiting the distance
...
entities are synced from and displayed in.
NOTE: Syncing entities work at the granularity regions which are
multi-chunk squares but the display of entities in voxygen is limited in
a circle with the radiues of the supplied distance.
Additional details and changes:
* Added `ViewDistances` struct in `common` that contains separate
terrain and entity view distances (the entity view distance will be
clamped by the terrain view distance in uses of this).
* View distance requests from the client to the server now use this
type.
* When requesting the character or spectate state the client now passes
its desired view distances. This is exposed as a new parameter on
`Client::request_character`/`Client::request_spectate`. And the client
no longer needs to send a view distance request after entering these
states. This also allows us to avoid needing to initialize `Presence`
with a default view distance value on the server.
* Removed `DerefFlaggedStorage` from `Presence` and `RegionSubscription` since the
change tracking isn't used for these components.
* Add sliders in voxygen graphics and network tabs for this new setting.
Show the clamped value as well as the selected value next to the
slider.
* Rename existing "Entities View Distance" slider (which AFAIK controls
the distance at which different LOD levels apply to figures) to
"Entities Detail Distance" so we can use the former name for this new
slider.
2022-08-25 23:24:43 -04:00
Imbris
895d6a2d8b
Impove UX of server limits on the view distance
...
* When client gets its view distance set by the server it stores that as
the max view distance allowed by the server.
* This is used to avoid skip sending requests if `set_view_distance` is
called with larger values.
* This is then also displayed in the UI via greying out the slider when
it goes past the limit and drawing another slide at the limit.
* The server clamping the client's view distance no longer leads to
edits in voxygen's view distance settings (the view distance setting
is instead preserved).
2022-08-25 23:24:43 -04:00
flo666
b1176aa9d3
set difficulty indicator to 3
2022-08-25 16:32:31 +02:00
Ben Wallis
a00a92def1
Merge branch 'juliancoffee/fix-i18n-keys' into 'master'
...
Fix i18n keys
See merge request veloren/veloren!3567
2022-08-25 14:15:21 +00:00
juliancoffee
49e8cec5eb
Fix i18n keys
2022-08-25 16:30:26 +03:00
