Sam
5c241850f1
Added sfx. Addressed comments.
2021-05-04 08:45:12 -04:00
Sam
7ac1488181
Added kit for testing tier 4 dungeons.
2021-05-04 08:45:11 -04:00
Sam
164fd0de04
Particles for frenzy buff and ground cleave.
2021-05-04 08:45:10 -04:00
jshipsey
c886accaf1
anims
2021-05-04 08:45:08 -04:00
Sam
d1139c3b7c
Added frenzy ability to minotaur.
...
Added self-buff character state.
Added frenzied buff kind.
Added better comments on each buff kind.
2021-05-04 08:45:07 -04:00
Sam
160bd3ef0c
Crippling strike now functional. Crippled debuff added.
2021-05-04 08:45:05 -04:00
Illia Denysenko
f04a4f907a
Add possibility to translate buff outcomes
2021-05-03 23:02:59 +00:00
Samuel Keiffer
771a8db2a8
Merge branch 'slipped/oritweak' into 'master'
...
ori tweaks, animal adjusts
See merge request veloren/veloren!2234
2021-05-03 18:49:22 +00:00
Samuel Keiffer
610c529c42
Merge branch 'sam/ability-sets' into 'master'
...
Allow Specification of Custom Ability Sets per Weapon
See merge request veloren/veloren!2231
2021-05-03 17:50:11 +00:00
Avi Weinstock
be39054767
Make terrain compression a checkbox instead of a bandwidth (throughput?) heuristic.
2021-05-03 00:09:44 -04:00
James Melkonian
f553700e8c
Add map markers for lakes and mountains
2021-05-03 02:00:23 +00:00
jshipsey
dc5a38f1e8
ori addition to combomelee
2021-05-01 12:29:28 -04:00
Joshua Barretto
d0953fcab0
Added map marker
2021-05-01 16:26:13 +00:00
Sam
d500a00414
Made naming of fields more explicit.
2021-05-01 09:25:56 -04:00
Sam
d3d4ee8bb0
Formatting stuffs.
2021-05-01 09:25:53 -04:00
Sam
914d78b4a9
Removed clone in animations. Added GATs to animations to do so.
2021-05-01 09:25:53 -04:00
Sam
3cb0ee98c8
Removed all unique and simple tool kinds.
2021-05-01 09:25:51 -04:00
Sam
a35b8b4aad
Removed ability set as field on items.
2021-05-01 09:25:49 -04:00
DaforLynx
7334cce426
Poise (stun) SFX and fix for town music
2021-04-29 23:36:22 +00:00
DaforLynx
2e0272ce28
Town music
2021-04-28 05:07:59 +00:00
Marcel
aa963493e8
Merge branch 'james/sound-unwraps' into 'master'
...
Remove an unwrap and move outcome sfx to ron
See merge request veloren/veloren!2206
2021-04-27 21:01:06 +00:00
James Melkonian
2f00af83d8
Remove an unwrap and move outcome sfx to ron
2021-04-27 21:01:06 +00:00
Marcel
8af1b42dbf
Merge branch 'yusdacra/chore/nix' into 'master'
...
build(nix): update flake deps, switch buildPlatform to use crate2nix
See merge request veloren/veloren!2202
2021-04-27 20:55:55 +00:00
Ludvig Böklin
34660462e9
Glider physics
2021-04-27 14:41:48 +00:00
Yusuf Bera Ertan
685f4971ac
build(nix): switch to crate2nix
2021-04-27 05:18:12 +03:00
jshipsey
2c74a86170
skill adjustments, ori changes
2021-04-25 22:02:32 -04:00
Samuel Keiffer
3f451ef7b3
Merge branch 'juliancoffee/fix_campfire_heal_message' into 'master'
...
Fix campfire heal buff description
See merge request veloren/veloren!2165
2021-04-25 23:06:48 +00:00
Illia Denysenko
efd54021a7
Fix campfire heal buff description
2021-04-25 23:06:47 +00:00
Marcel
35584d0344
Merge branch 'xMAC94x/reduce_deps' into 'master'
...
remove some unused deps Yuri found
See merge request veloren/veloren!2197
2021-04-25 20:22:31 +00:00
Marcel Märtens
1842b2d6eb
remove some unused deps Yuri found
2021-04-25 20:18:20 +02:00
Sam
6848851dc3
Cleaned up tweaks in ui and allowed sfx choosing to scale to amount of sfx variants provided.
2021-04-25 13:09:10 -04:00
Monty
2e24fcf165
Add i18n, change SCT Blocked col and string
2021-04-25 13:09:09 -04:00
Sam
372eff2a02
Initial SCT implementation to display blocks.
2021-04-25 13:09:09 -04:00
Sam
d2d8d43410
Addressed testing feedback.
...
Particles better.
2021-04-25 13:09:08 -04:00
Sam
b9d6bd2fd2
Parrying no longer requires releasing the block button, and instead can parry if block happened in buildup.
2021-04-25 13:09:07 -04:00
alfy
9f79c80072
block and parry sounds added
2021-04-25 13:09:06 -04:00
Sam
288a6f3a82
Blocking now works if no weapon is equipped in main hand.
...
Added temp sfx for blocking and parrying.
Added temp particles for successful parry.
Tweaked values of default block ability.
2021-04-25 13:09:02 -04:00
jshipsey
fad31bd7ab
anim
2021-04-25 13:08:43 -04:00
Sam
91c6288213
Melee weapons can now block.
2021-04-25 13:08:42 -04:00
Samuel Keiffer
f31feff1aa
Merge branch 'juliancoffee/fix_buff_bar' into 'master'
...
Fix bug with missing Burning icon
See merge request veloren/veloren!2195
2021-04-25 15:55:43 +00:00
juliancoffee
94bfbe37ea
Fix Bug with missing Burning icon
2021-04-25 10:44:22 +03:00
juliancoffee
8fd1037bf3
Update doc-strings
2021-04-25 09:12:15 +03:00
Snowram
c16ec43938
Body specific beam offsets
2021-04-25 04:07:12 +02:00
Snowram
8f54a0bf31
More phoenix AI work
...
More phoenix AI work
2021-04-25 04:07:12 +02:00
Snowram
8cf8e51962
Phoenix npc + AI (WIP)
2021-04-25 04:07:11 +02:00
Snowram
ab26efa970
Improves bird_large anims
2021-04-25 04:07:09 +02:00
Snowram
fd177c9669
Breathe and stun anims
2021-04-25 02:14:50 +02:00
Snowram
eb98360183
Cockatrice bird_large conversion
2021-04-25 02:14:50 +02:00
Snowram
0f6b902924
Idle, run, vel/ori aware fly anims
2021-04-25 02:14:49 +02:00
Snowram
bc95484863
Swaps bird_small skeleton to a new bird_large
2021-04-25 02:14:49 +02:00
Samuel Keiffer
e4324a3481
Merge branch 'ygor/skillbar-account-for-skillset' into 'master'
...
Make skillbar buttons account for energy cost reduction
See merge request veloren/veloren!2185
2021-04-24 19:32:19 +00:00
Ada Lovegirls
01c30868eb
Add option to load English string as fallback if string missing
2021-04-24 14:39:35 +00:00
Ben Wallis
c6205875ee
Merge branch 'xvar/server-version-check' into 'master'
...
Added client/server version mismatch warnings
See merge request veloren/veloren!2184
2021-04-24 09:05:45 +00:00
Ben Wallis
2e08c2f76f
Added client/server version mismatch message when a network error is encountered during client init.
...
Added warning banner on character select when successfully connected to a server with a mismatched version.
2021-04-24 09:08:30 +01:00
Ygor Souza
4f71c621f4
Make skillbar buttons account for energy cost reduction
...
Previously, the buttons would compare the current energy to the base
cost of the ability, so they would sometimes be grayed out while the
ability was usable. Now they ajust the ability with the character
skillset before getting the energy cost for the purposes of setting
the skillbar icon color.
2021-04-24 03:45:58 +02:00
juliancoffee
dc8d306890
Fix off-by-one error in localization tests
...
BlameHunk lines start counting from 1, not 0. Comparing with `line + 1`
fix this.
2021-04-23 14:11:44 +03:00
Monty Marz
b69eb61e7b
Add handles to lanterns, fix cooking pot scale
2021-04-22 17:12:07 +00:00
Joshua Barretto
f987f4d628
Fixed broken crafting sprite requirement
2021-04-22 12:30:48 +01:00
jshipsey
19ce4ad531
comments
2021-04-22 00:04:39 -04:00
jshipsey
2f523f5aa0
formatting
2021-04-22 00:04:39 -04:00
jshipsey
0962fe72f2
fix for 1h on back
2021-04-22 00:04:39 -04:00
jshipsey
9d82b20891
remove 0.8, add snow's mixed_vel idea for other bodies
2021-04-22 00:04:39 -04:00
Imbris
1af4a04231
Revert "Merge branch 'revert-b10718c5' into 'master'"
...
This reverts merge request !2172
2021-04-21 17:10:13 +00:00
Joshua Barretto
880236f223
Merge branch 'zesterer/lanterns' into 'master'
...
Made characters carry lanterns higher when possible
See merge request veloren/veloren!2169
2021-04-21 16:40:20 +00:00
Joshua Barretto
81ba200e48
Improve dynamic light reflection for hill climbing
2021-04-21 17:10:53 +01:00
Joshua Barretto
2c95165c82
Improvements to lantern holding when sitting
2021-04-21 16:54:03 +01:00
Joshua Barretto
ed7cc12213
Made characters carry lanterns higher when possible
2021-04-21 15:59:29 +01:00
Imbris
fd672980c4
Revert "Merge branch 'imbris/agent-opt' into 'master'"
...
This reverts merge request !2024
2021-04-21 14:10:06 +00:00
Imbris
26222a0a2d
Rename common-sys to common-systems and rearrange common-state slightly
2021-04-20 15:25:04 -04:00
Ludvig Böklin
762c68cfbb
Basic fluid dynamics and physical properties for entities
2021-04-20 17:38:19 +02:00
Joshua Barretto
70c345eee9
Made crafting UI check exact crafting sprite
2021-04-20 15:23:52 +01:00
Monty Marz
abacdfc719
clippy
2021-04-20 02:48:17 +02:00
Monty
a4d56e7843
more sprite stuff and crafting UI update
...
fix item images
fix CR display
2021-04-20 02:46:06 +02:00
Joshua Barretto
1a0f6f03ef
Prevent crafting without station
2021-04-20 02:46:05 +02:00
Monty
a1fe7c12c3
fmt, add sprites
2021-04-20 02:46:04 +02:00
Joshua Barretto
5598d07944
Added crafting stations
2021-04-20 02:45:59 +02:00
Marcel Märtens
5862920f32
seperate sys/state
2021-04-20 01:30:17 +02:00
Imbris
8c9d4dc3dd
Merge branch 'capucho/inactive-master' into 'master'
...
Lower volume of window on focus loss
See merge request veloren/veloren!2150
2021-04-19 20:39:49 +00:00
João Capucho
7a9876760b
Voxygen: Allow zoom on minimap with kbd
2021-04-19 20:26:54 +01:00
João Capucho
f23b515dd8
Voxygen: Add master volume sliders to the settings
2021-04-19 19:58:14 +01:00
João Capucho
7589331785
Voxygen: Add support for map zoom with keybind
2021-04-19 11:56:58 +01:00
João Capucho
fd302b6975
Voxygen: Add inactive window volume
2021-04-19 10:24:31 +01:00
João Capucho
1d605c2dc8
Voxygen: Update ambient channels volume
2021-04-19 10:24:28 +01:00
João Capucho
05279872ce
Voxygen: Use the master volume setting
2021-04-19 10:20:42 +01:00
Samuel Keiffer
0b80e8ac5d
Merge branch 'capucho/stop-ambient' into 'master'
...
Stop ambient sounds on logout
See merge request veloren/veloren!2151
2021-04-18 23:38:10 +00:00
Sam
ce7581037c
Overhauled dash melee.
2021-04-18 18:36:12 -04:00
João Capucho
26c2738dc2
Voxygen: Stop ambient sounds on logout
2021-04-18 21:35:43 +01:00
Avi Weinstock
0404250300
Unlock dodge roll iframes and staff explosion by default.
2021-04-18 16:16:06 -04:00
Samuel Keiffer
bf6c22462f
Merge branch 'xvar/inventory-sorting' into 'master'
...
Implemented inventory sorting
See merge request veloren/veloren!2141
2021-04-17 22:57:56 +00:00
Ben Wallis
a4cdb89987
Implemented inventory sorting
2021-04-17 22:04:08 +01:00
Yusuf Bera Ertan
62844d816a
build(nix): switch to nix-cargo-integration
2021-04-17 21:37:57 +03:00
Yusuf Bera Ertan
198545f219
build: use git keyboard-keynames to fix nix build error
2021-04-17 21:37:22 +03:00
Imbris
30e34aad44
Use separate crate to compile anim as a cdylib to avoid compiling both all the time and improve voxygen pipelining
2021-04-16 21:58:59 -04:00
Samuel Keiffer
a1d9ba15d9
Merge branch 'DaforLynx/normalize' into 'master'
...
Normalize + shrink all sfx; tweaks to combat music; change footstep sounds
See merge request veloren/veloren!2120
2021-04-16 00:35:15 +00:00
DaforLynx
f441c8c206
Normalize + shrink all sfx; tweaks to combat music; change footstep sounds
2021-04-16 00:35:13 +00:00
Samuel Keiffer
c962c5f12e
Merge branch 'gGmMsS/Burning' into 'master'
...
Added burning debuff for Staff M2
See merge request veloren/veloren!2134
2021-04-15 23:51:33 +00:00
Imbris
85ee4c8cd1
Merge branch 'aweinstock/server-authoritative-physics' into 'master'
...
Aweinstock/server authoritative physics
See merge request veloren/veloren!2126
2021-04-15 22:24:00 +00:00
gGmMsS123
d5a887f195
m2 staff
2021-04-16 00:48:20 +03:00
gGmMsS123
e33961e1fa
M2 Staff Final Touch
2021-04-16 00:34:24 +03:00
Ben Wallis
1144eefa46
Fixed miscount in Overitem::prim_count causing the tutorial button to fly around when multiple overitem texts are drawn
2021-04-15 21:45:09 +01:00
gGmMsS123
0d956610ec
Added burning debuff for Staff M2
2021-04-15 23:34:28 +03:00
Justin Shipsey
803e67b1fb
Merge branch 'slipped/changes' into 'master'
...
combat tweaks
See merge request veloren/veloren!2131
2021-04-15 17:36:19 +00:00
jshipsey
8f20d17c9a
attacking movement tweaks
2021-04-15 12:13:50 -04:00
jshipsey
896d2a5b63
combat tweaks
2021-04-15 11:43:52 -04:00
Avi Weinstock
50d0314a75
Add a toggle to negotiate the use of server-authoritative physics.
2021-04-15 08:50:17 -04:00
Marcel
a386a27411
Merge branch 'hqurve/settings-cleanup' into 'master'
...
Settings changes from the ui are now wrapped into a single enum and handling was moved to session/settings_change.rs, also settings.rs was split up
See merge request veloren/veloren!2130
2021-04-15 09:06:10 +00:00
hqurve
6ac2b87006
Debug change visibility from settings_window works again
2021-04-14 19:24:28 -04:00
hqurve
9018ead8d0
Seem to have missed minimap again
2021-04-14 19:10:18 -04:00
hqurve
399795dbf1
simplified settings changing within hud and settings_window
2021-04-14 19:10:18 -04:00
hqurve
4503d5160c
forgot to add minimap to settings_change
2021-04-14 19:10:17 -04:00
hqurve
56deb5919f
cleaned up settings_change.rs
2021-04-14 19:10:17 -04:00
hqurve
df38dfbaf8
Wrapped settings changes from the ui into a single enum and handling moved to session/settings_change.rs
2021-04-14 19:10:17 -04:00
hqurve
732fe3bb40
Moved session.rs into session/mod.rs
2021-04-14 19:10:17 -04:00
hqurve
685eeb42d8
Split settings.rs into multiple files
2021-04-14 19:10:17 -04:00
hqurve
8effdb1773
Moved settings.rs to settings/mod.rs
2021-04-14 19:10:17 -04:00
Sam
c88df846a7
Fixes animation parameters so a 2h weapon in the offhand slot doesn't look wonky.
2021-04-14 17:38:37 -04:00
Samuel Keiffer
435b5d5912
Merge branch 'holychowders/resolve_issue_#978_extract_skillset_into_own_component' into 'master'
...
Resolve Issue #978 - Extract SkillSet Into Its Own Component
Closes #1065 and #978
See merge request veloren/veloren!2116
2021-04-14 15:35:35 +00:00
holychowders
568a8d9666
Resolve Issue #978 - Extract SkillSet Into Its Own Component
2021-04-14 15:35:34 +00:00
Ben Wallis
d6b3eb3784
Fixed initial creation of saves directory. Added path of old singleplayer saves directory to information logged when it is moved to the new userdata directory
2021-04-14 07:15:51 +01:00
jshipsey
808634aa75
addressing commments
2021-04-13 20:19:35 -04:00
jshipsey
a7f5b90f0e
2h/1h bug fix, staggers
2021-04-13 20:19:35 -04:00
jshipsey
ea9b871374
loot tables, clippy, animation tweaks
2021-04-13 20:18:59 -04:00
jshipsey
42460f7e65
spins, combos
2021-04-13 20:18:59 -04:00
jshipsey
97528b7954
leaps
2021-04-13 20:18:59 -04:00
jshipsey
529f8eb5a6
more setups. chargeswing/dash anims
2021-04-13 20:18:59 -04:00
jshipsey
9a26024acb
alpha attacks
2021-04-13 20:18:59 -04:00
Sam
0b10ffc715
You can now roll without a weapon equipped.
2021-04-13 20:18:58 -04:00
Sam
c594f67d47
Fixed offhand weapons, when nothing was in the mainhand
2021-04-13 20:18:58 -04:00
jshipsey
b53e1653f6
initial wield testing
2021-04-13 20:18:58 -04:00
Ben Wallis
1de94a9979
* Replaced diesel
with rusqlite
and refinery
...
* Added "migration of migrations" to transfer the data from the __diesel_schema_migrations table to the refinery_schema_history table
* Removed all down migrations as refinery does not support down migrations
* Changed all diesel up migrations to refinery naming format
* Added --sql-log-mode parameter to veloren-server-cli to allow SQL tracing and profiling
* Added /disconnect_all_players admin command
* Added disconnectall CLI command
* Fixes for several potential persistence-related race conditions
2021-04-13 22:05:47 +00:00
Adam Blanchet
0d7d069d41
Display keys based off of scancodes
...
Queries the OS to translate physical keyboard scancodes into
Strings that can be shown in the UI.
Addresses issues #861 and #354
2021-04-13 11:16:47 +02:00
Samuel Keiffer
522e89d57f
Merge branch 'mdx97/fix-diary-toggle' into 'master'
...
Fix diary toggling when escape menu is open.
See merge request veloren/veloren!2109
2021-04-13 06:07:01 +00:00
Illia Denysenko
d42c03d57e
Fix localization test bug which produced bunch of Unknown states
2021-04-12 21:29:45 +00:00
Samuel Keiffer
e1020945dd
Merge branch 'aweinstock/combat-music' into 'master'
...
Add combat music transitions based on number of enemies in player radius.
See merge request veloren/veloren!2077
2021-04-12 06:01:19 +00:00
Monty Marz
f7c8389f77
Merge branch 'hqurve/settings-ui' into 'master'
...
Cleanup of settings window: split each tab into its own file
See merge request veloren/veloren!2108
2021-04-12 04:11:06 +00:00
Avi Weinstock
df4f44d946
Address MR 2077 review comments.
2021-04-11 22:08:42 -04:00
Avi Weinstock
d401d00d94
Address MR2077 review comments: add comment about group::ENEMY
and remove trace statements, and fuse filtering loops.
2021-04-11 22:08:41 -04:00
Avi Weinstock
7c34a96934
Make fade timings configurable, and stop combat music on death.
2021-04-11 22:08:41 -04:00
Avi Weinstock
f1b022cdee
Add new version of combat soundtrack, and change details of how transitions between tracks work.
2021-04-11 22:08:41 -04:00
Avi Weinstock
0e16c23707
Only count enemy group members for combat music, and count bosses as high-intensity via an HP heuristic.
2021-04-11 22:08:41 -04:00
Avi Weinstock
5bfdd5f1af
Add combat music transitions based on number of enemies in player radius.
2021-04-11 22:08:40 -04:00
Marcel
54024ce401
Merge branch 'DaforLynx/more-music' into 'master'
...
Adds many new songs; re-adds many old ones; revamped song distribution; reorganized music folders; better biome parameters; accurate day and night; new sounds
See merge request veloren/veloren!2102
2021-04-12 00:43:08 +00:00
DaforLynx
9db290d4ea
Adds many new songs; re-adds many old ones; revamped song distribution; reorganized music folders; better biome parameters; accurate day and night; new sounds
2021-04-12 00:43:08 +00:00
mdx97
03abe234ee
Fix diary toggling when escape menu is open.
2021-04-11 18:53:45 -05:00
Marcel
5e7adc6767
Merge branch 'trade-help-tooltips' into 'master'
...
Show ctrl-click and shift-click usage in item tooltips during trades.
See merge request veloren/veloren!2101
2021-04-11 22:56:03 +00:00
Rickey Chamblee
8a25ebb59a
Show ctrl-click and shift-click usage in item tooltips during trades.
2021-04-11 22:56:02 +00:00
Joshua Yanovski
508dba61a1
Merge branch 'xMAC94x/deps' into 'master'
...
update deps
See merge request veloren/veloren!2095
2021-04-11 22:55:56 +00:00
hqurve
fd80a97f3d
Got rid of content setup macro
2021-04-11 17:36:02 -04:00
hqurve
690419ad90
Placed tabs in a loop and combined tab content chooser using macro
2021-04-11 17:36:02 -04:00
hqurve
469cb391d3
cleaned widget_ids
2021-04-11 17:36:02 -04:00
hqurve
04eea482ce
Moved settings window sections into separate files
2021-04-11 17:36:02 -04:00
hqurve
f2340105c1
Moved settings_window.rs to to settings_window/mod.rs
2021-04-11 17:36:02 -04:00
Vincent Foulon
de9d5b5e14
clean workspace
...
clean workspace (2)
clean workspace (2)
2021-04-11 16:35:24 +02:00
Vincent Foulon
7128c3d3f6
Asset reorganization + removed some unused and duplicates + reduce size of some images
2021-04-11 16:35:17 +02:00
Monty Marz
6772e71aaa
UI fixes and more
2021-04-11 03:49:47 +00:00
Joshua Yanovski
8b034ed56f
Merge branch 'sharp/sprites-in-background' into 'master'
...
Mesh sprites in background.
See merge request veloren/veloren!2098
2021-04-10 20:34:35 +00:00
Marcel
adb18ef645
Merge branch 'mdx97/default-names' into 'master'
...
Use username as default character name in multiplayer character creation.
See merge request veloren/veloren!2085
2021-04-10 16:41:47 +00:00
mdx97
eb4fb33f45
Use username as default character name in multiplayer character creation.
2021-04-10 16:41:46 +00:00
Joshua Yanovski
1bdf3b13a8
Mesh sprites in the background.
...
This makes the delay afetr selecting a character before logging into the
game much shorter, in the common case. It still doesn't handle things
perfectly (it blocks creating Terrain::new if it's not finished, and it
could be faster due to working in the background), but it's still a lot
better than it was before.
To improve sprite meshing performance, we also apply the terrain
flat_get optimizations to sprites. Though I didn't initially know how
much of an impact it would have, it feels significantly faster to me,
though being able to parallelize it would be ideal.
2021-04-10 17:51:42 +02:00
Marcel Märtens
655a35d128
update deps
2021-04-10 15:53:00 +02:00
Joshua Yanovski
af94753ad9
Remove panics and unwraps, part 1.
...
Also fixes various other miscellaneous bugs.
2021-04-10 10:03:21 +02:00
hqurve
be42cc60c4
Added search to crafting and social windows, added i18n support to crafting tabs, fixed social window offset when group open, removed tabs in social window
2021-04-07 20:24:22 +00:00
James Melkonian
16871208f2
Add topographic option to map
2021-04-06 09:16:17 -07:00
James Melkonian
f2ebbb7f7f
Map icon scaling
2021-04-06 08:42:09 -07:00
James Melkonian
8ee1fc4a0f
Add layers to minimap
2021-04-06 08:42:08 -07:00
James Melkonian
bacda06dba
Added map layers
2021-04-06 08:42:07 -07:00
James Melkonian
70ede7f34d
Topographic map
2021-04-06 08:42:06 -07:00
Joshua Barretto
de9ad0942f
Merge branch 'zesterer/follow-cam' into 'master'
...
Added auto camera setting
See merge request veloren/veloren!2071
2021-04-06 04:23:40 +00:00
Joshua Barretto
60e2ed3e7d
Added auto camera setting
2021-04-05 23:24:31 +01:00
Marcel
4dde9f84b0
Merge branch 'huntertparks/fix-cursor-not-locking' into 'master'
...
Fixes #520 and #840 - locks cursor to screen when menu is not open
Closes #840 and #520
See merge request veloren/veloren!2069
2021-04-05 21:40:24 +00:00
Hunter Parks
6af9662b03
Change cursor lock location to be center of screen
...
Changing the cursor coordinates to the middle of the screen had some
side effects. When a user would close a menu and re-open it back up
without moving the mouse, the cursor position would not change.
This commit takes care of that by changing how the HUD handles closing
menus via keyboard inputs.
2021-04-05 16:48:22 +02:00
Hunter Parks
7df0413be4
Fixes #520 and #840 - locks cursor to screen when menu is not open
...
Rather than lock the cursor to the middle of the screen, the cursor will
move to it's last known coordinates when a menu or the minimap is not
open.
2021-04-05 16:37:40 +02:00
Monty
b8c474057c
More cheese is less cheese
...
Update CHANGELOG.md
fmt
Update crafting.rs
2021-04-05 13:40:12 +02:00
Marcel
69891f0b70
Merge branch 'login-trim-username' into 'master'
...
login trim username, improve validation, social ordering #1040
Closes #1040
See merge request veloren/veloren!2042
2021-04-04 22:09:16 +00:00
Avi Weinstock
78f130a3b2
Add a cheese counter in the bag display.
2021-04-04 11:14:25 -04:00
Monty Marz
06bbb7f0ff
Crafting Tabs and more item tags
2021-04-04 13:02:27 +00:00
DaforLynx
6734198104
Adds on-hit combat sfx
2021-04-04 03:04:02 +00:00
Snowram
9a3f6d8261
Substitutes DPS for CR in item tooltip
2021-04-03 00:10:31 -04:00
Avi Weinstock
b7dbadc32f
Add colors for buy/sell tooltips based on site prices.
2021-04-02 17:44:02 -04:00
Marcel
42463d1fe0
Revert "Merge branch 'animtweaks' into 'master'"
...
This reverts merge request !2039
2021-04-01 18:45:03 +00:00
aljazerzen
08146f6a3a
login trim username, improve validation, social ordering
2021-04-01 16:43:27 +02:00
jshipsey
030e14f333
small anim tweaks
2021-04-01 03:08:33 -04:00
Avi Weinstock
0122dca3c3
Allow fast stacking into and out of a trade with {ctrl,shift} click.
...
Shift click goes 1 at a time, Ctrl click automatically balances the trade w.r.t. that quantity.
2021-03-30 18:39:10 -04:00
Marcel Märtens
ccb78eeb5c
move tracing code to own crate
2021-03-30 16:35:36 +02:00
Joshua Barretto
3c19713e63
Merge branch 'zesterer/sprite-text' into 'master'
...
Added text prompts to sprites
See merge request veloren/veloren!2034
2021-03-30 11:41:14 +00:00
Joshua Barretto
bed863c50c
Added indicator text to terrain sprites
2021-03-30 01:04:23 +01:00
Joshua Barretto
85237c7a32
Fixed training dummy hitbox
2021-03-29 21:52:05 +01:00
Joshua Barretto
8f3233365d
Improved hit particles
2021-03-29 21:52:05 +01:00
Joshua Barretto
b0acbda236
Improved archery with feedback sfx and particles
2021-03-29 21:52:04 +01:00
Snowram
6adaac8106
Addresses comments
2021-03-29 18:35:12 +02:00
Snowram
b8ac90d049
Changelog, cleanup, clippy
2021-03-29 18:35:10 +02:00
Snowram
5b99b7ca18
Skillbar uses item tooltip
2021-03-29 18:34:45 +02:00
Snowram
508e35ca17
Add several new i18n lines
2021-03-29 18:34:45 +02:00
Snowram
d1e734b9b1
Tooltip now use ItemDesc instead of Item
2021-03-29 18:34:45 +02:00
Snowram
2c09180189
Set the item tooltip for every bag slots
2021-03-29 18:34:45 +02:00
Snowram
b7dd2d6685
Use a dummy item for the new() function
2021-03-29 18:34:45 +02:00
Snowram
955008c3c1
Kinda working tooltip height but not really
2021-03-29 18:34:45 +02:00
Snowram
0405f04d53
More item tooltip UI layout
2021-03-29 18:34:45 +02:00
Snowram
aa71dcb9c7
Make the new tooltip item specific
2021-03-29 18:34:45 +02:00
Snowram
4786f84afd
New tooltip
2021-03-29 18:34:45 +02:00
Marcel Märtens
e7452aa7ab
do a clear teardown of tokio runtime
2021-03-29 10:34:33 +02:00
Marcel Märtens
614a0aac13
display error when rodio panic is fixed
2021-03-28 20:40:07 +02:00
Sam
0c19679406
Fixed offset of decayed health
2021-03-27 21:06:21 -04:00
Monty
345ef1ca22
decay display for groups and overhead bars
2021-03-27 21:05:17 -04:00
Sam
06bd7bd929
Removed experimental group health decay
2021-03-27 21:05:17 -04:00
jshipsey
558c82ee54
flayer anims
2021-03-27 21:05:16 -04:00
Sam
91ddcaa155
Particles for summoned minions
2021-03-27 21:05:15 -04:00
Monty Marz
345b725478
decayed health texture
2021-03-27 21:05:14 -04:00
Monty Marz
cc70560027
WIP animation
2021-03-27 21:05:13 -04:00
Sam
c0c6ff3063
Initial work to show decayed health in healthbars
2021-03-27 21:05:13 -04:00
Sam
4ec387af82
Added particles for lifesteal effect
2021-03-27 21:05:12 -04:00
Sam
71b847cabb
Particles for blink
2021-03-27 21:05:09 -04:00
Snowram
39c8efe11f
Adds husk npc
2021-03-27 21:05:09 -04:00
Sam
720482d994
Gave mindflayer AI.
...
Fixed particles and made them sync across network.
2021-03-27 21:05:06 -04:00
Sam
30da614e89
Added dimensional door ability for mindflayer
2021-03-27 21:05:05 -04:00
Sam
f1156c9ce5
Added necrotic vortex attack to mindflayer
2021-03-27 21:05:03 -04:00
Sam
0d3795112c
Added cursed flame attack to mindflayer
2021-03-27 21:05:03 -04:00
Marcel
79cc3af058
Merge branch 'swilliams/character-randomization-fix' into 'master'
...
Character Creation Randomization Fix
See merge request veloren/veloren!2004
2021-03-27 15:58:34 +00:00
Scott Williams
9ca0388561
Character Creation Randomization Fix
2021-03-27 15:58:34 +00:00
Louis Pearson
165065725e
Add build_area_list command
...
* Reworks CanBuild to use HashSet
* Removes player argument from build permission, use sudo instead
2021-03-27 07:54:02 -06:00
Louis Pearson
120a0cd9a7
Limit build mode to bounding box
2021-03-27 07:54:02 -06:00
Louis Pearson
eade0540b2
Add permit_build
command
...
This commit separates permission to build from building mode, allowing
build to become a NoAdmin command (since players will first need
permission from an Admin to enter build mode)
2021-03-27 07:54:02 -06:00
Marcel
da5c73c84b
Merge branch 'refactor-login' into 'master'
...
refactor handling of duplicate login #1015
Closes #1015
See merge request veloren/veloren!1992
2021-03-27 13:49:09 +00:00
Marcel
843850a4b8
Merge branch 'aweinstock/tradepricing' into 'master'
...
Get SitePricing information to clients, and use it to display coin-denominated...
See merge request veloren/veloren!1991
2021-03-26 00:17:39 +00:00
aljazerzen
0ea102dc9c
refactor handling of duplicate login
2021-03-25 12:33:56 +01:00
Avi Weinstock
8d90548331
Get SitePricing information to clients, and use it to display coin-denominated prices in voxygen on tooltips during a trade. Also boost merchant spawn rate slightly.
2021-03-25 02:11:58 -04:00
Snowram
0e259294d4
Allow Escape key to cancel trades
2021-03-25 01:42:14 +01:00
Avi Weinstock
6b343c2af9
Address MR 1962 review comments.
2021-03-23 18:41:13 -04:00
Avi Weinstock
4ec6b43693
Add a vertical camera clamp option and toggle to voxygen.
2021-03-23 18:22:32 -04:00
Joshua Barretto
21b20ea75e
Merge branch 'aweinstock/enable-rtsim-airships' into 'master'
...
Enable RtSim Airships.
See merge request veloren/veloren!1973
2021-03-23 14:29:43 +00:00
Avi Weinstock
49f39fb752
Make more systems work with an optional health component, to allow disabling health on rtsim airships (so that players can't hammer them out of the sky).
2021-03-23 10:44:32 +01:00
Sam
7ede94b4c9
Changelog
2021-03-22 23:53:00 -04:00
Marcel Märtens
6b23101fac
update toolchain to nightly-2021-03-22
2021-03-22 16:41:04 +01:00
Marcel Märtens
fdc40f52d9
give more threads a fixed name
2021-03-22 12:37:03 +01:00
Justin Shipsey
f57af6f776
Merge branch 'slipped/animtweaks' into 'master'
...
airship movement bits
See merge request veloren/veloren!1967
2021-03-22 08:49:04 +00:00
Joshua Barretto
6690854687
Merge branch 'zesterer/better-particle-emission' into 'master'
...
Smoother particle emission for moving objects
See merge request veloren/veloren!1965
2021-03-22 06:15:20 +00:00
Marcel
dc4570def5
Merge branch 'sharp/texture-atlases' into 'master'
...
Enable allocation of new textures on atlas allocation failure.
See merge request veloren/veloren!1949
2021-03-22 04:35:41 +00:00
jshipsey
31747d8ff1
airship movement bits
2021-03-21 21:43:49 -04:00
Joshua Barretto
7b736640f5
Smoother particle emission for moving objects
2021-03-22 00:23:25 +00:00
Joshua Barretto
7ae4230dc8
Merge branch 'zesterer/pick' into 'master'
...
Pickaxe
See merge request veloren/veloren!1959
2021-03-22 00:19:42 +00:00
Joshua Barretto
6ea5aa796b
Faster pick, less vibrant block selection
2021-03-21 20:38:08 +00:00
Joshua Barretto
fb3980e273
Outcome for block destruction, take select_pos from ControllerInputs
2021-03-21 20:10:05 +00:00
Sam
f342be71a1
Fixed pick animation
2021-03-21 15:29:17 -04:00
Marcel
983523c463
Merge branch 'vfoulon80/climbing-skill' into 'master'
...
Add climbing speed and cost
See merge request veloren/veloren!1950
2021-03-21 18:35:44 +00:00
Joshua Barretto
b1026296cb
Disabled block selection when not wielding
2021-03-21 16:29:13 +00:00
Joshua Barretto
347e1022a0
Initial implementation of pickaxe
2021-03-21 16:09:16 +00:00
Vincent Foulon
e06870702f
Add skill for swimming speed
2021-03-21 15:58:38 +01:00
RedlineTriad
606420c5e1
Sort the playerlist alphabetically
2021-03-21 10:22:33 +01:00
Vincent Foulon
d0aa68a9d2
Add climbing speed and cost
2021-03-20 17:17:28 +01:00
Joshua Yanovski
866cc79d2e
Enable allocation of new textures on atlas allocation failure.
...
This solves the problem of not being able to set the view distance too
high, especially in pathological cases like giant trees. For
simplicity, we just freeze any atlas where allocation failed and start
allocating to a new texture and atlas, letting reference counting
destroy the old one when there are no more references to it. Because of
the spatial locality of chunk allocations, chunks allocated together
will virtually always have similar lifetimes, so the odds of this
causing significant fragmentation are very low, meaning this simple
solution should not do much worse than a much fancier one.
2021-03-20 16:21:41 +01:00
Marcel Märtens
2733ba2e27
Change the version number to 0.9
2021-03-20 13:07:09 +01:00
Avi Weinstock
0ef42e3854
Address MR 1945 review comments.
2021-03-19 19:53:17 -04:00
Snowram
e5afb2fcf7
Various visual fixes
2021-03-18 22:53:06 +01:00
Vincent Foulon
80635004a4
Remove unwraps when asset loading fails
2021-03-18 12:56:17 +00:00
Vincent Foulon
eafa69ee4c
allow loading animations to be contributed from a manifest file
2021-03-17 23:41:28 +01:00
Vincent Foulon
62b945dab1
Add new random loading animations
2021-03-17 18:15:25 +01:00
Monty Marz
e9cbac387e
new loading bg, staff models
...
item images
fix paths
loot tables, adjustments
Update main.ron
2021-03-16 23:23:24 +00:00
Marcel Märtens
a286eb084a
create a wrapper around rayon, slowjobpool, that spawns on rayon but drop feed it
2021-03-16 13:31:04 +01:00
Joshua Barretto
6f10a56589
Optimised entity sync code, increased animation throttling distance
2021-03-16 02:49:33 +00:00
James Melkonian
6ea43cfd75
Various RtSim and Agent Interaction Fixes
2021-03-16 01:30:35 +00:00
Joshua Barretto
0312c06295
Fixed sliding when wielding
2021-03-15 14:18:56 +00:00
Marcel
5b21ee7200
Merge branch 'aweinstock/airship-mvp-rebased' into 'master'
...
Airships
See merge request veloren/veloren!1888
2021-03-15 11:37:12 +00:00
Forest Anderson
0049976da9
Merge branch 'aweinstock/tradefixes-20210314' into 'master'
...
Client-side trade fixes: update recipe cache and always put client on the same...
See merge request veloren/veloren!1904
2021-03-15 04:52:09 +00:00
Avi Weinstock
9304ecab3d
Address Imbris's MR 1888 comments, and add changelog entry.
...
- Use Ori::{new,to_quat} and make the field private.
- Update/capitalize/add various comments.
- Implicitly drop scope guards where applicable.
- Take !Copy colliders by reference instead of cloning.
- s/cylinder_voxel_collision/box_voxel_collision/
- Unindent some physics code with a continue.
2021-03-14 23:21:46 -04:00
Avi Weinstock
a32be4ac5a
Address MR 1888 review comments.
...
- Delete obsolete symbolic links.
- Add suggested comments.
- Remove dead code.
2021-03-14 23:17:28 -04:00
Avi Weinstock
aa56166c80
Fix fmt and clippy, and rename {psdr,psdw} to {read,write} in physics.
2021-03-14 23:17:26 -04:00
Joshua Barretto
afd99788b2
Made animations and friction ground-relative
2021-03-14 23:09:52 -04:00
Avi Weinstock
e9aab63a04
Account for model translation in the physics. The voxel collider still needs to be north-aligned for now.
2021-03-14 23:09:52 -04:00
Avi Weinstock
bcd3799395
Airship fixes: figure culling, player hitbox bounds w.r.t. airships, physics state unioning.
2021-03-14 23:09:51 -04:00
Avi Weinstock
5d85775dcf
Airship progress: now possessable, and physics kind of works (desyncs from the visuals by a shift + scale, and rotation isn't done at all yet, but the contours are correct).
2021-03-14 23:09:51 -04:00
Avi Weinstock
8b9e84972a
Draft of airships (spawn command, visuals, some physics refactoring, no collision yet).
2021-03-14 23:09:49 -04:00
Avi Weinstock
95992ead4d
Client-side trade fixes: update recipe cache and always put client on the same side of the screen as their inventory.
2021-03-14 21:41:47 -04:00
Marcel
5570b57282
Merge branch 'sam/yeet-inputs' into 'master'
...
Reworked Controller Inputs to use Control Actions
See merge request veloren/veloren!1900
2021-03-15 01:32:02 +00:00
Imbris
a558d42da7
Merge branch 'snowram/new-npcs' into 'master'
...
Snowram/new npcs
See merge request veloren/veloren!1896
2021-03-15 00:10:46 +00:00
Sam
ecff675cc4
Wielding now works again
...
Rolling now resumes combo states correctly again
Cleanup
2021-03-14 17:26:55 -04:00
Sam
ac6e192db4
Completely purged old method of inputs
2021-03-14 17:26:55 -04:00
Sam
b5d501199d
Secondary input now fully functional
2021-03-14 17:26:53 -04:00
Sam
c6d8daaae3
Primary input now activated from control actions.
...
Moved a lot of key_state to a HashSet so that it is handled automatically.
2021-03-14 17:26:51 -04:00
Snowram
60dd47cdea
Theropod charge attack
2021-03-14 18:10:40 +01:00
PersianKnight
b87514266d
Bug fix debug info hotkey and axe skill tree text
2021-03-14 20:16:54 +03:30
Snowram
9d7e8957bb
Add new npcs
2021-03-14 14:24:35 +01:00
Christof Petig
15b11d9154
Implement /price_list (work in progress), stub for /buy and /sell
...
remove outdated economic simulation code
remove old values, document
add natural resources to economy
Remove NaturalResources from Place (now in Economy)
find closest site to each chunk
implement natural resources (the distance scale is wrong)
cargo fmt
working distance calculation
this collection of natural resources seem to make sense, too much Wheat though
use natural resources and controlled area to replenish goods
increase the amount of chunks controlled by one guard to 50
add new professions and goods to the list
implement multiple products per worker
remove the old code and rename the new code to the previous name
correctly determine which goods guards will give you access to
correctly estimate the amount of natural resources controlled
adapt to new server API
instrument tooltips
Now I just need to figure out how to store a (reference to) a closure
closures for tooltip content generation
pass site/cave id to the client
Add economic information to the client structure
(not yet exchanged with the server)
Send SiteId to the client, prepare messages for economy request
Make client::sites a HashMap
Specialize the Crafter into Brewer,Bladesmith and Blacksmith
working server request for economic info from within tooltip
fully operational economic tooltips
I need to fix the id clash between caves and towns though
fix overlapping ids between caves and sites
display stock amount
correctly handle invalid (cave) ids in the request
some initial balancing, turn off most info logging
less intrusive way of implementing the dynamic tool tips in map
further tooltip cleanup
further cleanup, dynamic tooltip not fully working as intended
correctly working tooltip visibility logic
cleanup, display labor value
separate economy info request in a separate translation unit
display values as well
nicer display format for economy
add last_exports and coin to the new economy
do not allocate natural resources to Dungeons (making town so much larger)
balancing attempt
print town size statistics
cargo fmt (dead code)
resource tweaks, csv debugging
output a more interesting town (and then all sites)
fix the labor value logic (now we have meaningful prices)
load professions from ron (WIP)
use assets manager in economy
loading professions works
use professions from ron file
fix Labor debug logic
count chunks per type separately
(preparing for better resource control)
better structured resource data
traders, more professions (WIP)
fix exception when starting the simulation
fix replenish function
TODO:
- use area_ratio for resource usage (chunks should be added to stock, ratio on usage?)
- fix trading
documentation clean up
fix merge artifact
Revise trader mechanic
start Coin with a reasonable default
remove the outdated economy code
preserve documentation from removed old structure
output neighboring sites (preparation)
pass list of neighbors to economy
add trade structures
trading stub
Description of purpose by zesterer on Discord
remember prices (needed for planning)
avoid growing the order vector unboundedly
into_iter doesn't clear the Vec, so clear it manually
use drain to process Vecs, avoid clone
fix the test server
implement a test stub (I need to get it faster than 30 seconds to be more useful)
enable info output in test
debug missing and extra goods
use the same logging extension as water, activate feature
update dependencies
determine good prices, good exchange goods
a working set of revisions
a cozy world which economy tests in 2s
first order planning version
fun with package version
buy according to value/priority, not missing amount
introduce min price constant, fix order priority
in depth debugging
with a correct sign the trading plans start to make sense
move the trade planning to a separate function
rename new function
reorganize code into subroutines (much cleaner)
each trading step now has its own function
cut down the number of debugging output
introduce RoadSecurity and Transportation
transport capacity bookkeeping
only plan to pay with valuable goods, you can no longer stockpile unused options
(which interestingly shows a huge impact, to be investigated)
Coin is now listed as a payment (although not used)
proper transportation estimation (although 0)
remove more left overs uncovered by viewing the code in a merge request
use the old default values, handle non-pileable stocks directly before increasing it
(as economy is based on last year's products)
don't order the missing good multiple times
also it uses coin to buy things!
fix warnings and use the transportation from stock again
cargo fmt
prepare evaluation of trade
don't count transportation multiple times
fix merge artifact
operational trade planning
trade itself is still misleading
make clippy happy
clean up
correct labor ratio of merchants (no need to multiply with amount produced)
incomplete merchant labor_value computation
correct last commit
make economy of scale more explicit
make clippy happy (and code cleaner)
more merchant tweaks (more pop=better)
beginning of real trading code
revert the update of dependencies
remove stale comments/unused code
trading implementation complete (but untested)
something is still strange ...
fix sign in trading
another sign fix
some bugfixes and plenty of debugging code
another bug fixed, more to go
fix another invariant (rounding will lead to very small negative value)
introduce Terrain and Territory
fix merge mistakes
2021-03-14 03:18:32 +00:00
Imbris
fcdd7f1c8b
Merge branch 'imbris/tracy-tweaks' into 'master'
...
Improvements for tracy server analysis and other misc tweaks
See merge request veloren/veloren!1891
2021-03-13 22:26:26 +00:00
Imbris
0127832172
Fix tracy not working in certain areas, add span to chunk gen, missing fmt, remove extra span, make voxygen use INFO level instead of TRACE in tracy mode
2021-03-13 13:30:20 -05:00
PersianKnight
7c0fe70453
Improve default value of windows_size in Graphics and Help Windows in Interface Settings.
2021-03-13 19:09:38 +03:30
PersianKnight
42d57ccb92
The appearance of the reset buttons has improved.
2021-03-13 17:42:52 +03:30
PersianKnight
e3c0ceb9fa
Fixed Toggle Debug Info from Settings
2021-03-13 17:38:34 +03:30
Imbris
8d0b776f18
Move server-cli commands to separate file, tracy profiling par_join improvements, misc improvements
...
- remove overwritten logging setting in server-cli
- add server-cli command to load a random area for testing without a client
- make admin add/remove commands modify ingame players instead of needing to reconnect
- add spans to par_join jobs
- added test command that loads up an area of the world
- add tracy-world-server alias
- set debug directives to info for logging
2021-03-13 02:28:59 -05:00
Samuel Keiffer
4022937da7
Merge branch 'PersianKnight/InterfaceSettings' into 'master'
...
Separated InterfaceSettings from GameplaySettings
See merge request veloren/veloren!1887
2021-03-13 01:55:18 +00:00
DaforLynx
99261bf105
Many small changes to audio code, mainly sfx - changelog in MR
2021-03-12 15:00:09 -08:00
PersianKnight
dcb32a7ff1
Separated InterfaceSettings from GameplaySettings
2021-03-12 22:45:44 +03:30
jshipsey
49f496e290
intitial values
2021-03-12 00:58:12 -05:00
Marcel
93cab075f8
Merge branch 'xMAC94x/non_blocking_register' into 'master'
...
Auth requests are now done async, the register system is fetching it, via a PendingLogin component
See merge request veloren/veloren!1875
2021-03-11 21:51:55 +00:00
Joshua Barretto
a9bcaf0a37
Merge branch 'PersianKnight/Reset_to_Defaults_Buttons' into 'master'
...
Add Reset to Default Buttons for Interface, Gameplay and Sound Settings
See merge request veloren/veloren!1877
2021-03-11 21:29:11 +00:00
PersianKnight
3b3ffe30e9
Add Reset to Default Buttons for Interface, Gameplay and Sound Settings
2021-03-11 22:09:30 +03:30
Joshua Barretto
f479231b15
Merge branch 'glowy-shiny-pretty' into 'master'
...
Glowy shiny pretty
See merge request veloren/veloren!1874
2021-03-11 17:37:33 +00:00
Samuel Keiffer
9b198b5cda
Merge branch 'sam/sceptre-overhaul' into 'master'
...
Overhaul sceptre
Closes #768
See merge request veloren/veloren!1845
2021-03-11 16:47:50 +00:00
Marcel Märtens
728bff610b
Allow HTTP auth servers again.
...
only `localhost` are allowed in a release build.
when debug assertions are on, others are also allowed.
This change undoes the changes to the settings, so compared to master, there is no effect
2021-03-11 17:24:52 +01:00
Marcel Märtens
381bb5eef0
fix tracy
2021-03-11 17:05:17 +01:00
Marcel Märtens
a98e72c391
Auth requests are now done async, the register system is fetching it, via a PendingLogin component
...
The auth server no longer allows the protocol to be specified. we enforce `https` for the auth server, so DO NOT provide a auth url with `https://` but without.
correct is now `auth.veloren.net`
incorrect is: `https://auth.veloren.net `
2021-03-11 17:05:02 +01:00