Monty Marz
33e643fbfd
fmt
2023-04-02 01:21:10 +02:00
Monty Marz
d1f6db9da6
different site name col
2023-04-02 00:55:21 +02:00
Joshua Barretto
33ebb0a4a3
Make clippy happy
2023-04-01 22:55:45 +01:00
Sam
2e6d55a78b
Use topographic map for town selection screen.
2023-04-01 17:10:44 -04:00
Monty Marz
ca18da8061
UI tweaks
2023-04-01 21:54:48 +02:00
Joshua Barretto
19db823092
Proper next/prev site buttons
2023-04-01 12:34:58 +01:00
Joshua Barretto
0d7ee4479b
Limit starter sites to towns
2023-03-31 21:31:01 +01:00
Joshua Barretto
6add1b851d
Simplified map drawing
2023-03-31 20:44:59 +01:00
Joshua Barretto
0f7648aadb
Better use of space on char create screen
2023-03-31 18:08:12 +01:00
Joshua Barretto
c28e61383d
Added target to starting site map
2023-03-31 16:25:24 +01:00
Joshua Barretto
45644da98a
Don't display the world map on character edit
2023-03-31 14:36:30 +01:00
Joshua Barretto
acec45b756
Initial implementation of starting site choice
2023-03-31 14:24:14 +01:00
Monty Marz
d1a7884ac8
Merge branch 'more_spot_things' into 'master'
...
grave models, spot fixes, sword overlay
See merge request veloren/veloren!3842
2023-03-31 02:57:39 +00:00
Isse
c34e5ad4ed
Small fixes
2023-03-29 23:11:59 +00:00
Monty Marz
e4c5e50fb2
grave models, spot fixes, sword overlay
2023-03-29 13:10:49 +02:00
Sam
c9af470cc7
Final tweaks
2023-03-28 20:55:21 -04:00
Sam
cdaf9e5c0e
Ability changes
2023-03-26 21:41:22 -04:00
Monty Marz
3e37586ba5
icons
2023-03-21 20:18:32 -04:00
Sam
610d47f787
Effect power now affects more than just poise
2023-03-21 20:16:55 -04:00
Sam
acde417ca7
Abilities that require a particular stance will be greyed out when not in that stance.
2023-03-21 20:08:21 -04:00
Sam
7386257854
Appease CI
2023-03-21 20:07:37 -04:00
Sam
3caa9dc529
Stances can now be left by interacting with the buff bar.
2023-03-21 20:03:22 -04:00
Sam
e31668b188
Fixed dynlib features to not have UB when allocating.
2023-03-21 20:03:20 -04:00
Sam
7365fcb530
Rolls cancel recover at the cost of additional energy, sitting ends active stances.
2023-03-21 20:03:15 -04:00
Monty Marz
6b5ae2b6fe
Update sword_bg.png
...
positioning, wording, more icons
positioning, first icons
2023-03-21 19:59:06 -04:00
Sam
39b30b3458
Decontextualized some sword abilities, added UI for sword skill tree.
2023-03-21 19:59:05 -04:00
Sam
f43d25d3fe
Ability icons
2023-03-21 19:59:04 -04:00
Sam
86dfa34ec9
Cleaving stance required abilities
2023-03-21 19:59:00 -04:00
Sam
c3026d388a
Defensive stance required abilities
2023-03-21 19:58:11 -04:00
Sam
fce9211d49
Secondaries for all stances
2023-03-21 19:39:39 -04:00
Sam
ed0de15a5a
Heavy stance skill abilities.
2023-03-21 19:39:35 -04:00
Sam
61f0b424b9
Old sword mostly torn out, new sword framework in place
2023-03-21 19:39:22 -04:00
Sam
7ec9a7677f
Stances change secondary abilities now. Contextual abilities try to fallback to no context if skill not owned for contextual ability.
2023-03-21 19:38:18 -04:00
Sam
b376228d45
Primary and secondary abilities can now be contextual. BasicStance character state added.
2023-03-21 19:38:15 -04:00
Sam
9875008efa
Added stance component that persists even after sheathing weapon (does not yet work with M1 replacement).
2023-03-21 19:29:34 -04:00
Imbris
61cb0ad39b
Merge branch 'imbris/small-tweaks' into 'master'
...
Various small tweaks / fixes
Closes #1475
See merge request veloren/veloren!3817
2023-03-18 00:52:20 +00:00
Imbris
94dd8c2b70
Address review on 3817
2023-03-17 20:17:46 -04:00
Imbris
ebffe9317c
Merge branch 'catb0t/zoom-defaultbind' into 'master'
...
Remove default binding for Camera Zoom Lock
See merge request veloren/veloren!3823
2023-03-13 06:15:49 +00:00
cat stevens (catb0t)
e99d2e7ca3
Remove default binding for Camera Zoom Lock
2023-03-13 06:15:49 +00:00
Ben Wallis
45c8934b79
Merge branch 'xvar/queue-char-deletes' into 'master'
...
Changed character deletion to go via batch update
See merge request veloren/veloren!3562
2023-03-12 23:21:54 +00:00
Ben Wallis
6eedc02286
Changed character deletion to go via batch update
2023-03-12 23:21:53 +00:00
Sam
42388976d7
Fixed issue with max health change over time buff being reset if re-applied. Addressed review comments.
2023-03-12 16:37:02 -04:00
Imbris
6b8e22d6cc
Improvements and fixes for interacting/collecting
...
* Inert entities like arrows no longer block interactions like picking
up items! Logic looking for the closest entity will skip them.
* When pickaxe is not equipped and wielded we now show "Needs Pickaxe"
as the hint text for mineable blocks.
* Mineable blocks that aren't pointed at now show the mining text hint
instead of the text hint used for regular collectible blocks.
* Fixed recent bug where all interactables were showing the open text hint.
* Split `BlockInteraction` out of the `Interaction` enum in voxygen
since we were using this enum for two different things.
2023-03-11 21:17:27 -05:00
Sam
4c79936c07
Added wrapper type to durations related to buffs and auras.
2023-03-11 16:47:11 -05:00
Sam
663db06844
Made auras no longer need to be mutably accessed every tick.
2023-03-11 16:45:12 -05:00
Sam
89aa934c3c
Initial work
2023-03-11 16:45:10 -05:00
Monty Marz
277a402781
Initial quest window work, spot fixes
2023-03-10 22:16:26 +00:00
Marcel
9396fa9741
Merge branch 'Thegaming_Life/replacing_all_map2_with_RECT_SIZE_with_cpos_to_wpos_and_wpos_to_cpos' into 'master'
...
replaced CHUNK_SIZE by RECT_SIZE everywhere, and change the use (and remove...
See merge request veloren/veloren!3807
2023-03-06 21:03:35 +00:00
Thegaming Life
5ddc55be52
replaced CHUNK_SIZE by RECT_SIZE everywhere, and change the use (and remove...
2023-03-06 21:03:35 +00:00
Cat Stevens
83e4cdfe76
Allow locking camera zoom
...
Allow the camera's zoom to be locked by a keybind
or a Gameplay setting. The zoom lock
behavior can be changed between Toggle
and Auto, where Auto only locks the camera
zoom while specific movement/combat inputs
are being pressed. (closes !1528 )
A temporary fading notification is shown at the
top of the screen, informing the player of
the setting change (when the keybind is
used) or that the zoom is locked (when
the player might have forgotten the zoom
is locked, and is trying to zoom).
i18n strings are added for English and German,
but no other languages.
To implement the simplistic fading text, the
behavior was extracted into an impl
called `ChangeNotification`, where
reasons are quantified by `NotificationReason`.
2023-03-05 11:30:27 -05:00
