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
8,842 Commits 151 Branches 18 Tags 2.1 GiB
9e20b090c4
Commit Graph

3545 Commits

Author SHA1 Message Date
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
Joshua Barretto
6e0807f3f5 Cheaper and less broken material reflection/glow 2021-03-11 13:56:11 +00:00
omm
ef7b215f07 File structure for lang es_ES aligned with EN 2021-03-11 12:08:37 +00:00
Joshua Barretto
09e32cb952 Initial implementation of glow/shininess 2021-03-10 18:58:25 +00:00
Marcel Märtens
b151a246c3 update specs to get rid of old deps 2021-03-10 13:22:17 +01:00
Bryan Quigley
506adb4eec Stop requiring specfici euc version (was done to hold back vek version) 
Then ran cargo update
 2021-03-09 15:53:24 -08:00
Sam
de5ef03ac4 Auras will now refresh buffs if a buff was already present that had a lesser duration. 
Attack effects can now have multiple requirements.
Fix for sceptre heal not requiring energy.
Nerfed warding aura protection.
Added icon for warding aura.
Changelog.
 2021-03-09 18:03:06 -05:00
Sam
16222948a3 Sceptre skill tree and migration. 2021-03-09 18:02:07 -05:00
Sam
c13e84aff5 Aura duration separated from cast duration in aura state 
Healing beam now requires combo > 0 to enter character state
Removed last vestiges of old sceptre abilities
Combo extended to most other attacks
Cast aura state renamed to basic aura
 2021-03-09 18:02:00 -05:00
Sam
d711c77468 Aura particles. 2021-03-09 17:59:45 -05:00
Monty Marz
935aec743d cleanup, icons 2021-03-09 17:59:45 -05:00
Monty
49fcd6ee13 adjusted combo counter anim 2021-03-09 17:59:43 -05:00
Sam
940b4b5de7 Combo counter now uses outcomes. 2021-03-09 17:59:42 -05:00
Monty
c29cb037e7 better combo indicator animation 2021-03-09 17:59:41 -05:00
Sam
398370ca51 Changed lifesteal beam particles to look better. 
Warding aura now just provides damage reduction instead of invulnerability. Also with a longer duration and less movespeed penalty.
 2021-03-09 17:59:41 -05:00
Monty
53100b6f37 combo point display 2021-03-09 17:59:40 -05:00
Sam
c5f74e528d Animation for cast aura, combo information passed to skillbar. 2021-03-09 17:59:40 -05:00
Sam
b6f4543a14 Fixed beam offsets, told healing beam to use beam animation. 2021-03-09 17:59:40 -05:00
Sam
c6a222340e Particles for lifesteal beam. Changed how frontend recognized beams. 2021-03-09 17:59:39 -05:00
Marcel Märtens
d7df741671 update dependencies, including removal of some tracy deps as they are get through common/tracy 2021-03-09 20:17:29 +01:00
Marcel
ee0ab197da Merge branch 'updated_spanish_es_strings' into 'master' 
Updated strings Added missing translations in Spanish es_ES and retrieving localized text

See merge request veloren/veloren!1866
 2021-03-09 12:59:03 +00:00
tukilo
cea895ea24 Updated strings Added missing translations in Spanish es_ES and retrieving localized text 2021-03-09 12:30:53 +01:00
Marcel
d229ab1eb9 Merge branch 'aweinstock/critical-stats' into 'master' 
Add critical chance and critical multiplier stats to weapons.

See merge request veloren/veloren!1864
 2021-03-09 10:55:36 +00:00
Marcel
8c868aebc7 Merge branch 'xMAC94x/common_ecs' into 'master' 
Move Specs code to own common_ecs create, put tracy and macros into common_base

See merge request veloren/veloren!1863
 2021-03-09 09:48:53 +00:00
Avi Weinstock
d8f0a1c426 Add critical chance and critical multiplier stats to weapons. 2021-03-08 23:27:25 -05:00
Marcel Märtens
4ebfbdde0f Move Specs code to own common_ecs create, put tracy and macros into common_base 2021-03-09 00:54:01 +01:00
Adam Blanchet
16b66f9cd6 Add reset button to graphics settings 2021-03-08 18:48:38 +01:00
Marcel Märtens
f353f14703 change Name from VSystem to System 2021-03-08 13:15:00 +01:00
Marcel Märtens
6b88545481 restructure server metrics 
- get rid of old SysTimers for each system in favour of VSystem tracking
 - move metrics generation from lib.rs to own system
 - code cleanup
 - remove time tracking in common::sys
 2021-03-08 11:51:13 +01:00
Marcel Märtens
c515fece28 Implement a VSystem trait that can be implemented by Systems. 
It will autodo some things, like track start and time and export those in system metrics
Add a origin and implement it for all Systems in Veloren
 2021-03-08 11:51:04 +01:00
Marcel
e29964ead1 Merge branch 'sarrakitty/fireworks' into 'master' 
added a white firework

See merge request veloren/veloren!1856
 2021-03-07 18:37:35 +00:00
Joshua Barretto
36d20e6990 Better docs, faster terrain meshing 2021-03-07 14:25:07 +00:00
Joshua Barretto
911acdd9db Fixed clippy warnings and fmt 2021-03-07 14:25:07 +00:00
Joshua Barretto
db573f6b2d Turn giant trees into proper sites 2021-03-07 14:25:07 +00:00
Monty
b6ac4e46fb tree icon UI works and hover icon 2021-03-07 14:25:07 +00:00
Joshua Barretto
862cd5fe49 fmt 2021-03-07 14:25:03 +00:00
Joshua Barretto
a229d65932 Static light improvements, fixed lighting update bug 2021-03-07 14:25:02 +00:00
Joshua Barretto
120cb86c0d Switched back to simd repr 2021-03-07 14:25:02 +00:00
Joshua Barretto
427e0af73c Reverted to repr_c vek 2021-03-07 14:25:02 +00:00
Joshua Barretto
1d16f14dd5 Small fixes 2021-03-07 14:25:02 +00:00
Joshua Barretto
f537f82b17 Updated vek, fixed house wall bugs 2021-03-07 14:25:02 +00:00
Joshua Barretto
7b807ed34c Removed dead code 2021-03-07 14:25:02 +00:00
Monty
8214c9df82 PoI icon 2021-03-07 14:25:01 +00:00
Joshua Barretto
717bbbf23e Better static light propagation between translucent objects 2021-03-07 14:25:01 +00:00
Joshua Barretto
9e09c96a2a Fixed static light directionality 2021-03-07 14:25:01 +00:00
Joshua Barretto
31832e1245 Fixed wall leaking with dynamic light ambiance 2021-03-07 14:25:01 +00:00
Joshua Barretto
aabe1d7cfd Point light ambiance for less harsh shadows 2021-03-07 14:25:01 +00:00
Joshua Barretto
100cafa91b Directional baked lights for figures 2021-03-07 14:25:01 +00:00
Joshua Barretto
6fc7d2a906 Faster More interesting giant trees, better oaks, hives on branches 2021-03-07 14:25:01 +00:00
Joshua Barretto
7d526da735 Experimental giant mother trees 2021-03-07 14:25:01 +00:00
Sarra
db3bc1b9bb added a white firework 2021-03-07 03:48:50 -05:00
Imbris
575301c763 Merge branch 'Quibble/item-buff-tooltips' into 'master' 
Tooltips use item stats for buff information

See merge request veloren/veloren!1820
 2021-03-05 22:00:24 +00:00
Marcel
cb305536e8 Merge branch 'vfoulon80/skilltree-icons' into 'master' 
implement the new skilltree icons

See merge request veloren/veloren!1794
 2021-03-04 18:37:33 +00:00
Vincent Foulon
fb953cc7f4 implement the new skilltree icons 2021-03-04 18:37:32 +00:00
Marcel
a68afa1fad Merge branch 'aweinstock/stack-trading' into 'master' 
Allow using stack splitting into or out of a trade.

See merge request veloren/veloren!1850
 2021-03-04 14:34:05 +00:00
Joshua Yanovski
2dd7089e52 Bring vek up to date so we can bump rustc (hopefully). 2021-03-04 05:46:59 +01:00
Avi Weinstock
0472956b5c Allow using stack splitting into or out of a trade. 2021-03-03 18:19:10 -05:00
Lippy13
d9d3c1f55b Make the BuffKind match expression exhaustive 2021-03-03 21:10:41 +00:00
Lippy13
59594a8b60 Check if duration exists instead of defaulting to zero and clean up code 2021-03-03 20:39:14 +00:00
Marcel Märtens
a55ec20c74 fix #46 🥳 2021-03-03 12:37:09 +01:00
Lippy13
48f974bf01 Address comments on passing effects 2021-03-03 00:25:15 +00:00
Lippy13
a7c30b6721 Account for no duration being possible 2021-03-03 00:25:14 +00:00
Lippy13
ffd0c01bbd Fix Clippy errors 
Fix code formatting

Add descriptions for other potential buffs for consumables
 2021-03-03 00:25:13 +00:00
Lippy13
5e3a1b203f Add buff information to item tooltips 2021-03-03 00:25:11 +00:00
Snowram
f4278840c6 Fixes light offset for objects 2021-03-02 19:28:33 +01:00
ccgauche
7f4411ba1f Merge branch 'master' into 'ccgauche/plugin-player-join-event' 
# Conflicts:
#   CHANGELOG.md
 2021-03-02 09:45:15 +00:00
Justin Shipsey
9ad8804b60 Merge branch 'armor-org' into 'master' 
armor org

See merge request veloren/veloren!1835
 2021-03-02 01:29:46 +00:00
Ben Wallis
0f7ff21c20 Merge branch 'item-stacking-and-splitting' into 'master' 
Implement stacking and splitting

Closes #904

See merge request veloren/veloren!1802
 2021-03-02 00:08:47 +00:00
Jesus Bracho
c0573cca44 Implement stacking and splitting 2021-03-02 00:08:46 +00:00
jshipsey
308045cfc9 final asset corrections, fix glider anim 2021-03-01 17:37:47 -05:00
heydabop
bfc82f7236 Fixes #974 - convert tool/weapon equip time to floating point seconds 2021-03-01 15:06:39 -06:00
ccgauche
9628dfaf99 Fixed comments 2021-03-01 21:29:18 +01:00
ccgauche
dbd4d70b79 Lots of improvement in pointer management (switched from i32 to u64) + New event implemented 2021-03-01 19:00:44 +01:00
Samuel Keiffer
0497a437a4 Merge branch 'sam/invulnerability-buff' into 'master' 
Invulnerability Buff

Closes #965

See merge request veloren/veloren!1834
 2021-03-01 05:46:46 +00:00
Samuel Keiffer
537efdd47e Merge branch 'aweinstock/trade-requestitem' into 'master' 
During a trade, allow requesting items from the counterparty's inventory...

See merge request veloren/veloren!1829
 2021-03-01 02:39:36 +00:00
Sam
6ab4e2264e Buff icon 2021-02-28 17:31:35 -05:00
Sam
531c38c3ad Factored formatting of buff text out to a single function. 2021-02-28 16:04:33 -05:00
Sam
a88ad7b971 Added invulnerability debuff. Currently tied to campfire spawned with '/campfire' command. 2021-02-28 15:02:03 -05:00
Imbris
b7bd0306e6 Merge branch 'Lerg/Issue_#976' into 'master' 
Issue #976 Some inputs are missing the ability to be rebound

See merge request veloren/veloren!1832
 2021-02-28 18:23:30 +00:00
Justin Shipsey
13df691f69 Merge branch 'heydabop/966-controller-y-invert' into 'master' 
#966 - Setting to invert controller Y axis

See merge request veloren/veloren!1817
 2021-02-28 18:02:04 +00:00
Lerg
94bd1f2605 Issue #976 Some inputs are missing the ability to be rebound because they are missing from the input iterator 2021-02-28 19:02:32 +03:00
Avi Weinstock
7e458ecd40 During a trade, allow requesting items from the counterparty's inventory (prequisite for NPC trading). 2021-02-28 10:13:49 -05:00
Samuel Keiffer
cb267ac3ee Merge branch 'sam/combo-comp' into 'master' 
Combo now persists as a compnent, rather than a field on a state

See merge request veloren/veloren!1828
 2021-02-28 02:42:40 +00:00
Sam
b25a376995 Re-allowed for what stage you were on to persist through a roll 2021-02-27 19:24:18 -05:00
Sam
404c7f0905 Combo melee now checks combo 2021-02-27 18:24:28 -05:00
Snowram
7f2276324e Reduces the instances of f64 in anims 2021-02-27 23:21:03 +01:00
jshipsey
b4627dfe19 look-based anims 2021-02-27 16:19:33 -05:00
Monty Marz
e5273e3a8e reroute the F1 key to open the controls settings, removed loading screen tips about levels and the stats button 2021-02-27 19:02:26 +00:00
Justin Shipsey
d2fffa1a92 Merge branch 'slipped/gremlins' into 'master' 
dungeon enemy overhaul part 1

See merge request veloren/veloren!1697
 2021-02-27 17:00:52 +00:00
Samuel Keiffer
fa809fc292 Merge branch 'Lerg/Accumulate_Damage_Floaters' into 'master' 
Issue #836 - Declutter the scrolling combat text

See merge request veloren/veloren!1823
 2021-02-27 16:18:18 +00:00
jshipsey
16720a6826 weapon/manifest tweaks 2021-02-27 10:44:55 -05:00
Lerg
3fe5f4484e Issue #836 - Declutter the scrolling combat text 2021-02-27 15:10:47 +03:00
Sam
238fcaf5f1 Particle rebase fixes 2021-02-27 01:42:47 -05:00
jshipsey
0a353576dc address comments 2021-02-27 01:42:47 -05:00
Snowram
17112926e7 Adds harvester npc 2021-02-27 01:42:47 -05:00
jshipsey
51bc74b2a5 visual weapon variation, adjust minotaur dash, keyframed golem quake 2021-02-27 01:42:47 -05:00
jshipsey
16a44cd532 minotaur moves, added claygolem 2021-02-27 01:42:47 -05:00
jshipsey
417f4638ed balance pass 2 2021-02-27 01:42:47 -05:00
jshipsey
79ec9115f5 rebase, yeti in dungeon 2021-02-27 01:42:47 -05:00
jshipsey
e06ebf3507 initial balance 2021-02-27 01:42:47 -05:00
Snowram
858fbe1a6c Adds yeti npc 2021-02-27 01:42:46 -05:00
jshipsey
30af3a4493 dash, spin, jump changes 2021-02-27 01:42:46 -05:00
Snowram
1b9815dc34 Adds 3 new npcs, tusk ram new design 2021-02-27 01:42:46 -05:00
Sam
53b0ba286a Ice particles for Wendigo 2021-02-27 01:42:46 -05:00
jshipsey
ce3b2141e1 theropod retrofit, some more moves 2021-02-27 01:42:46 -05:00
jshipsey
5792faa992 some new moves, combine biped weapons into one file 2021-02-27 01:42:46 -05:00
jshipsey
57d5e90ddd full bipedsmall armor swaps 2021-02-27 01:42:46 -05:00
Sam
df70976ff5 Fixed particles. 2021-02-27 01:42:46 -05:00
jshipsey
cb59c8017e anim tweaks, more loadout setup 2021-02-27 01:42:46 -05:00
jshipsey
130d51786a golem retrofit 2021-02-27 01:42:46 -05:00
Timo Kösters
a4513fe09d Improve particles 2021-02-27 01:42:46 -05:00
jshipsey
952a77f94d speedier weapons initial testing 2021-02-27 01:42:45 -05:00
jshipsey
aa4237b019 BL improvements, various fixes 2021-02-27 01:42:45 -05:00
jshipsey
e4e25e20c9 rebase 2021-02-27 01:42:45 -05:00
jshipsey
0dc8b2e482 rendering 2021-02-27 01:42:45 -05:00
jshipsey
ca3248cc93 new dungeon setups, new npcs, weapon specific loadouts, anims 2021-02-27 01:42:45 -05:00
jshipsey
ac16a8900d bow 2021-02-27 01:42:45 -05:00
jshipsey
66664f3f89 the stabs 2021-02-27 01:42:45 -05:00
jshipsey
6a57dd25d0 wielding 2021-02-27 01:42:45 -05:00
jshipsey
31208e29ee run anim tweaks 2021-02-27 01:42:45 -05:00
unknown
559ece5ede More npcs work 2021-02-27 01:42:45 -05:00
unknown
6f18d16aa2 Add new quadmeds npcs with rough offsets 2021-02-27 01:42:44 -05:00
Snowram
ebfb59f041 Trims skeletal attributes 2021-02-27 01:42:44 -05:00
Snowram
f48fea57f4 Sahagin, Adlet npcs 2021-02-27 01:42:43 -05:00
jshipsey
7cf723bb9d gnome 2021-02-27 01:42:43 -05:00
jshipsey
266986626d biped_small setup 2021-02-27 01:42:43 -05:00
Samuel Keiffer
8e07174c1d Merge branch 'aweinstock/coin-item' into 'master' 
Add a coin item and make amounts visible on dropped items.

See merge request veloren/veloren!1821
 2021-02-26 04:17:12 +00:00
Samuel Keiffer
6af9e58965 Merge branch 'add-gemu-models' into 'master' 
Add sword and bow models from backlog

See merge request veloren/veloren!1818
 2021-02-26 02:59:51 +00:00
Avi Weinstock
7d2e8f72eb Add a coin item and make amounts visible on dropped items. 2021-02-25 21:31:30 -05:00
Avi Weinstock
e1484c28c0 Finish plumbing MaterialStatsManifest. Fix issue with speed clamping when recursing through components. Improve statblocks in item tooltips. 2021-02-25 15:26:49 -05:00
Sam
b0b4a07b9e Bows 2021-02-24 20:37:43 -05:00
Sam
ee5c9d78ca Swords 2021-02-24 18:54:06 -05:00
heydabop
d4e3a3f29f #966 - Add setting to invert controller camera Y axis 2021-02-24 10:39:44 -06:00
Avi Weinstock
78014d7d3b Put material stats in their own manifest, and multiply a form's stats by the weighted average of the material multipliers. 2021-02-23 15:49:34 -05:00
Avi Weinstock
4e57678f34 Support modular weapon components made from a tagged material using the material as a multiplier. 2021-02-23 15:31:51 -05:00
Snowram
14c252d8b2 Merge branch 'snowram/turret' into 'master' 
Object animation, beam fixes, turret implementation

See merge request veloren/veloren!1805
 2021-02-23 20:16:56 +00:00
Samuel Keiffer
e1be8dbcd9 Merge branch 'aweinstock/quickfix-sword-spin-speed' into 'master' 
Fix description for the sword spin speed skill tree upgrade (previously it was...

See merge request veloren/veloren!1814
 2021-02-23 03:14:44 +00:00
Imbris
f33d3873b4 Merge branch 'aweinstock/modular-weapon-rigging' into 'master' 
Support modular weapon voxel meshes being made by assembling their components.

See merge request veloren/veloren!1806
 2021-02-23 00:45:26 +00:00
Avi Weinstock
c3ac8a1b51 Support modular weapon voxel meshes being made by assembling their components. 2021-02-23 00:45:26 +00:00
Avi Weinstock
ada4ca39f7 Fix description for the sword spin speed skill tree upgrade (previously it was a copy of damage's description). 2021-02-22 19:37:20 -05:00
Marcel
72bd0f42fc Merge branch 'xMAC94x/prot_improvements' into 'master' 
xMAC94x/prot_improvements

See merge request veloren/veloren!1796
 2021-02-22 22:47:43 +00:00
Marcel Märtens
e3ef4422b6 cleanup ClientConnArgs 2021-02-22 21:07:20 +01:00
Snowram
684961b15c Adds look_dir to anims, humanoid heads pivot fixes 2021-02-22 20:00:06 +01:00
Marcel Märtens
3f5c64bec0 Client::new can now resolve DNS requests, better networking error messages 2021-02-22 17:35:19 +01:00
Marcel Märtens
1a7c179bbb share tokio Runtime between Client and Server, name rayon Threadpool 2021-02-22 17:35:06 +01:00
Marcel Märtens
514d5db038 Update Network Protocol 
- now last digit version is compatible 0.6.0 will connect to 0.6.1
 - the TCP DATA Frames no longer contain START field, as it's not needed
 - the TCP OPENSTREAM Frames will now contain the BANDWIDTH field
 - MID is not Protocol internal

Update network
 - update API with Bandwidth

Update veloren
 - introduce better runtime and `async` things that are IO bound.
 - Remove `uvth` and instead use `tokio::runtime::Runtime::spawn_blocking`
 - remove futures_execute from client and server use tokio::runtime::Runtime instead
 - give threads a Name
 2021-02-22 17:34:55 +01:00
Snowram
4078eeb877 Various fixes to object animation, cleanup 2021-02-21 19:56:46 +01:00
Snowram
f25b2b1500 Various fixes to beam, body based interp 2021-02-21 19:17:56 +01:00
Sam
11050a05ce Beam particles now determined from beam segment rather than character state. 2021-02-21 19:17:56 +01:00
Snowram
e7bbf3981d Object animation 2021-02-21 19:17:44 +01:00
Avi Weinstock
8bdbf4f7c9 Implement modular weapons. 
- Add ItemKind::ModularComponent, Item::components.
- Add tool::StatKind::{Direct,Modular} for the modular weapons themselves.
- Move ItemConfig from ItemDesc to Item, so components' stats can be taken into account.
- Crafting stores into the components field.
- Components/recipes/placeholders are created dynamically.
- Show which components a modular weapon contains in the tooltip in voxygen.

Squashed fixes:
- `Item::duplicate` components in `Item::new_from_item_def`.
- Speed of 1.0 for now.
 2021-02-20 14:30:39 -05:00
Marcel
a330d4b05c Merge branch 'clangdo/fix_macos_build' into 'master' 
Backdate coreaudio-sys for OSX cross toolchain compatibility

See merge request veloren/veloren!1799
 2021-02-20 09:58:59 +00:00
Samuel Keiffer
479cf9fc4e Merge branch 'sam/dual-wielding' into 'master' 
Dual wielding backend

See merge request veloren/veloren!1787
 2021-02-20 05:12:17 +00:00
Sam
eaf3e02e39 Addressed comments 
Fixed audio test
 2021-02-19 19:55:23 -05:00
Caelan
82c33d9ccb Backdate coreaudio-sys for OSX cross toolchain compatibility 
See https://github.com/RustAudio/coreaudio-sys/issues/48
 2021-02-19 15:46:36 -08:00
Sam
d5ccc33abc Factored out duplicate code into closures, consolidated ability handling logic to a single function. 2021-02-19 18:45:48 -05:00
Sam
411b4083b1 Added 1h hammers. 
Fixed audio tests.
 2021-02-19 17:30:24 -05:00
Sam
12545dd372 Added handedness to weapon tooltips. 2021-02-19 17:30:23 -05:00
Sam
8f0cca074d Dual wielding now uses skillbar abilities from multiple weapons. 2021-02-19 17:30:22 -05:00
Sam
6f6a37faf2 Wielding a 1 handed weapon now correctly uses abilities when the second weapon is not also a 1 handed weapon. 2021-02-19 17:30:22 -05:00
Sam
f50fa25467 ItemConfig now stores AbilitySet directly instead of each individual ability. 2021-02-19 17:30:21 -05:00
Sam
582c3f8459 Check for prerequisite skill in using an ability is no longer hardcoded. 2021-02-19 17:30:21 -05:00
Sam
d4f509b3d0 Added hands field onto weapons. 2021-02-19 17:30:20 -05:00
Avi Weinstock
559ad7b7f5 Client-side trade improvements. 
- Add item tooltips in trade.
- More localization support.
- Fix bindings (R for trade, B for bag).
 2021-02-19 15:20:27 -05:00
Marcel
c6d69d1196 Merge branch 'xMAC94x/network_tokio' into 'master' 
xMAC94x/network_tokio switch from `async_std` to `tokio`

See merge request veloren/veloren!1789
 2021-02-17 22:47:11 +00:00
Samuel Keiffer
95fdd0fcc3 Merge branch 'cherry-pick-2ef5fb90' into 'master' 
Fix missing controller actions

See merge request veloren/veloren!1786
 2021-02-17 21:10:14 +00:00
Ada Lovegirls
96b8a582fe Fixed missing controller actions 
(cherry picked from commit 2ef5fb90e89bf3f8f0acc84e269f6948c696c196)
 2021-02-17 21:10:14 +00:00
Marcel Märtens
ea8ab1ce7a Great improvements to the codebase: 
- better logging in network
 - we now notify the send of what happened in recv in participant.
 - works with veloren master servers
 - works in singleplayer, using a actual mid.
 - add `mpsc` in whole stack incl tests
 - speed up internal read/write with `Bytes` crate
 - use `prometheus-hyper` for metrics
 - use a metrics cache
 2021-02-17 16:15:00 +01:00
Marcel Märtens
9884019963 COMPLETE REDESIGN of network crate 
- Implementing a async non-io protocol crate
    a) no tokio / no channels
    b) I/O is based on abstraction Sink/Drain
    c) different Protocols can have a different Drain Type
       This allow MPSC to send its content without splitting up messages at all!
       It allows UDP to have internal extra frames to care for security
       It allows better abstraction for tests
       Allows benchmarks on the mpsc variant
       Custom Handshakes to allow sth like Quic protocol easily
 - reduce the participant managers to 4: channel creations, send, recv and shutdown.
   keeping the `mut data` in one manager removes the need for all RwLocks.
   reducing complexity and parallel access problems
 - more strategic participant shutdown. first send. then wait for remote side to notice recv stop, then remote side will stop send, then local side can stop recv.
 - metrics are internally abstracted to fit protocol and network layer
 - in this commit network/protocol tests work and network tests work someway, veloren compiles but does not work
 - handshake compatible to async_std
 2021-02-17 12:39:47 +01:00
Marcel Märtens
5aa1940ef8 get rid of async_std::channel 
switch to `tokio` and `async_channel` crate.
I wanted to do tokio first, but it doesnt feature Sender::close(), thus i included async_channel
Got rid of `futures` and only need `futures_core` and `futures_util`.

Tokio does not support `Stream` and `StreamExt` so for now i need to use `tokio-stream`, i think this will go in `std` in the future

Created `b2b_close_stream_opened_sender_r` as the shutdown procedure does not need a copy of a Sender, it just need to stop it.

Various adjustments, e.g. for `select!` which now requieres a `&mut` for oneshots.

Future things to do:
 - Use some better signalling than oneshot<()> in some cases.
 - Use a Watch for the Prio propergation (impl. it ofc)
 - Use Bounded Channels in order to improve performance
 - adjust tests coding

bring tests to work
 2021-02-17 12:38:53 +01:00
Marcel Märtens
1b77b6dc41 Initial switch to tokio for network, minimum working example. 2021-02-17 12:37:59 +01:00
Caelan
dda4931f46 Clean and update dependencies 
* Remove tweak feature
 * Remove const-tweaker
 * Update tiny_http
 * Update bitvec to 0.21.0
 * Downgrade euc to avoid conflict with vek 0.12.0
 * Require exactly vek 0.12.0
 * Update all other dependencies automatically based on these changes
 * Update gilrs to latest at the request of Ada Lovegirls
 * Update meshing benchmarks to new criterion API
 2021-02-17 01:27:06 -08:00
Imbris
1a3e015da7 Merge branch 'huettner94/minimap_settings_persistence' into 'master' 
Persist minimap settings

See merge request veloren/veloren!1785
 2021-02-17 00:57:07 +00:00
Joshua Barretto
4d19308612 Merge branch 'lboklin/quat-ori' into 'master' 
Redefine Ori as a quaternion

See merge request veloren/veloren!1755
 2021-02-16 22:39:11 +00:00
Felix Huettner
589ffd2a97 Persist minimap settings 
This change persists the open/close state as well as the facing-north
state of the minimap to the settings file.
 2021-02-16 23:16:16 +01:00
Imbris
c2af25e1f6 Merge branch 'huettner94/minimap_rotation' into 'master' 
Allow minimap to always face north

See merge request veloren/veloren!1784
 2021-02-16 22:04:48 +00:00
Imbris
1352d7ad9c Merge branch 'quellus/max-name-length' into 'master' 
Limit character name length

Closes #528

See merge request veloren/veloren!1774
 2021-02-16 21:29:45 +00:00
Quellus
8b4230db61 Limit character name length 2021-02-16 21:29:45 +00:00
Felix Huettner
b8d5b812e1 Allow minimap to always face north 
Some players prefer their minimap to always face north for better
orientation.
 2021-02-16 19:57:19 +01:00
Ada Lovegirls
06575f601e Merge branch 'master' into 'ada/improve-controller-bindings' 
# Conflicts:
#   CHANGELOG.md
 2021-02-16 15:30:46 +00:00
Avi Weinstock
03d28f7d93 Implement tags for items, allowing a crafting recipe to take any item with that tag as input. 
- Added a recipe that turns any of the cloth equipment dropped by villagers into 1x cloth scraps.
- Animate placeholder items for tagged crafting.
 2021-02-16 01:05:54 +00:00
Ludvig Böklin
0f1227ca7d Use nlerp for interpolating rotations in animation 2021-02-15 11:01:59 +01:00
AdaLovegirls
390812f54e Improve controller keybindings 2021-02-14 21:31:31 -06:00
Avi Weinstock
c984035976 MR 1775 review fixes. 
- Separate `invite` machinery from `group_manip` into it's own thing (includes renaming `group_invite` to `invite` where applicable).
- Move some invite/trade machinery to `ControlEvent`.
- Make `TradePhase` a proper enum instead of a bunch of bools.
- Make `TradeId` a proper newtype.
- Remove trades from `Trades` on accept (previously was only on decline).
- Typo fixes/misc cleanup.
- Add bullet point for trading to the changelog.
 2021-02-14 11:13:56 -05:00
Avi Weinstock
232ddb0860 Polish trading implementation and address review comments. 
- Fix item swapping edge case
- Document more assumptions/edge cases
- fmt and clippy
- s/ServerGeneral::GroupInvite/ServerGeneral::Invite/
- Use `Client::current` in `Client::is_dead`
 2021-02-14 11:11:35 -05:00
Ludvig Böklin
84990553e0 Use Ori for base rotation matrix 2021-02-13 11:02:50 +01:00
Avi Weinstock
f6db8bb7c4 Implement actual inventory-manipulation part of trading server side. 2021-02-12 18:43:10 -05:00
Avi Weinstock
abb5684883 Trade implementation progress. 
- Accept/decline buttons that submit the proper messages
- A phase2 screen that renders the (item, quantity) pairs as text
- More checks in the trade state machine server-side.
 2021-02-12 18:43:10 -05:00
Avi Weinstock
e2b55e0706 Implement enough of a trade UI that dragging & dropping items into it round-trips between clients. 2021-02-12 18:43:09 -05:00
Avi Weinstock
aeb2398fc6 Trade implementation progress. 
- Server messages now bring up the trade window.
- When a trade is declined, it closes the window on both clients.
 2021-02-12 18:43:09 -05:00
Avi Weinstock
ae528124fc Trade implementation progress. 
- State machine for modifying trades.
- ServerGeneral/ClientGeneral messages.
 2021-02-12 18:43:09 -05:00
Avi Weinstock
e9b811b62b Plumb trade requests through the group invite UI, such that they can be accepted/declined without impacting the counterparty's movement. 2021-02-12 18:43:09 -05:00
Avi Weinstock
250391656f Initial draft of trade UI (creates a placeholder window that acts like crafting in terms of bringing up the bag, defaulting to the "r" key). 2021-02-12 18:43:09 -05:00
DaforLynx
ebbb06a400 Added crickets blocktype, added 3 new cricket sounds, made crickets chirp consistently, made frogs more sporadic 2021-02-12 00:54:42 +00:00
Justin Shipsey
44a9d8dc71 Merge branch 'nward/chat-input-color-icon-rebased' into 'master' 
Rebase  !1447  Chat input color and icon reflect channel message is sent to.

See merge request veloren/veloren!1769
 2021-02-10 19:42:59 +00:00
Quellus
63952875d9 Rebase !1447 Chat input color and icon reflect channel message is sent to. 2021-02-10 19:42:59 +00:00
Imbris
3e98e18c46 Merge branch 'aweinstock/sort-crafting' into 'master' 
Crafting UI: sort items lexicographically by craftability and then alphabetically.

See merge request veloren/veloren!1767
 2021-02-10 04:04:42 +00:00
Avi Weinstock
5d0c18efeb Crafting UI: sort items lexicographically by craftability and then alphabetically. 2021-02-09 19:30:54 -05:00
Snowram
477bdfdfe7 Adresses some comments, various visual tweaks 2021-02-10 00:30:23 +01:00
Ludvig Böklin
065e260e78 Code quality 2021-02-09 14:06:27 +01:00
Ludvig Böklin
fa78674840 Encourage migration towards using quaternion in animations 2021-02-09 13:52:44 +01:00
Ludvig Böklin
582ddfc3cd Ori: add tests, rename to_vec() => look_vec(); Dir: add methods, normalize on rot 2021-02-09 13:52:03 +01:00
Imbris
357cb26e05 Update native_dialog to 0.5.2 2021-02-07 00:48:57 -05:00
Ludvig Böklin
a1ff9ab83f Redefine Ori as a quaternion 2021-02-05 09:33:14 +01:00
Pascal Fuhrmann
9f7637ab21 Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts 2021-02-05 01:39:12 +00:00
James Melkonian
23b1df3cdd Add basic NPC interaction and fix NPC chat spamming 2021-01-31 20:29:50 +00:00
Joshua Barretto
60c16e57b1 Added snow particles 2021-01-31 15:15:17 +00:00
DaforLynx
b906473f4e Aughihopethisworks 2021-01-30 22:27:12 -08:00
Marcel
b88f04215e Merge branch 'DaforLynx/small-sound-fixes' into 'master' 
Small audio fixes; addresses #939 and #940

Closes #940 and #939

See merge request veloren/veloren!1739
 2021-01-29 11:37:10 +00:00
DaforLynx
c6e262c4ce Small audio fixes; addresses #939 and #940 2021-01-29 11:37:10 +00:00
jiminycrick
a02444825d Address some comments 
Eliminated extra stagger state

Responding to more comments

Move poise character state changes to character behavior system

Move poise out of JoinTuple/Data

Finish up comments (various fixes)
 2021-01-28 17:31:05 -08:00
jiminycrick
152156d065 Fix rebase and scrub poise from UI 2021-01-28 17:22:39 -08:00
jshipsey
d456271921 animal stuns 
Fix rebase
 2021-01-28 17:22:39 -08:00
jiminycrick
661764f4aa Some preliminary balancing 
Fix rebase
 2021-01-28 17:22:39 -08:00
jshipsey
29732bb763 starting stun anim 
stagger anim, mirroring, bettern walk anim

wielding with stuns/stagger

Knockback fix

Added Poise documentation/comments
 2021-01-28 17:22:37 -08:00
jiminycrick
8b97199245 Update rand dependency 2021-01-26 20:35:08 -08:00
Entropy9s
1f6cf7e155 StaminaPlus buff, modifying stamina via buffs 
trying to fix this, coming back to this later

please remember to change potion back future self!

this ALMOST works. maybe MR ready, kinda jank tho

so close, and yet so far...

IT WORKS IT WORKS IT WORKS IT WORKS IT WORKS IT WO

did the same with health, ill fix this garbage l8r

think we're basically done here

whoops forgot to change the food back

fixing and cleaning up part 1

fixed everything part 2 now with buff images

ran clippy + fmt, fixed items that i modified

bracket bulldozing, boldly

hopefully this should be good?

need to rebase real quick

please let me be done

StaminaPlus buff, modifying stamina via buffs

trying to fix this, coming back to this later

please remember to change potion back future self!

this ALMOST works. maybe MR ready, kinda jank tho

so close, and yet so far...

IT WORKS IT WORKS IT WORKS IT WORKS IT WORKS IT WO

did the same with health, ill fix this garbage l8r

think we're basically done here

whoops forgot to change the food back

fixing and cleaning up part 1

fixed everything part 2 now with buff images

ran clippy + fmt, fixed items that i modified

hopefully this should be good?

cargo clippy fmt stuff

deleted an extraneous file?? how did that even...?
 2021-01-26 22:47:55 +00:00
Scott Williams
0cde434e3b All gems make a sound. 2021-01-25 22:53:23 +00:00
Scott Williams
157e56d8ca Removed Shiny Gem, Added migration to change shiny gems to diamonds. Changed shiny gem recipes to diamonds 2021-01-24 16:40:22 +00:00
Justin Shipsey
5117edcff9 Merge branch 'pfau/sceptres' into 'master' 
6 new sceptres, add DPS display to tooltips

See merge request veloren/veloren!1724
 2021-01-24 03:14:32 +00:00
Marcel
82147653df Merge branch 'torvus-quick-fix' into 'master' 
Fix torvus

See merge request veloren/veloren!1720
 2021-01-23 22:31:15 +00:00
Monty
7cbf946a65 6 new sceptres, add DPS display to tooltips 2021-01-23 23:10:36 +01:00
Samuel Keiffer
39d1c9e885 Merge branch 'sam/skill-balancing-1' into 'master' 
Skill balancing

See merge request veloren/veloren!1716
 2021-01-23 21:12:35 +00:00
Sam
77312ccdd4 Move outcome vec from being defined in frontend and server to common. 2021-01-23 15:17:36 -05:00
Imbris
47bd74469b Merge branch 'imbris/update-winit' into 'master' 
Update winit and iced

See merge request veloren/veloren!1717
 2021-01-23 09:22:58 +00:00
Imbris
7cbbb70c42 Merge branch 'pizzaluc/unlimited_FPS' into 'master' 
Implemented #896 - Added option for Unlimited FPS

Closes #896

See merge request veloren/veloren!1713
 2021-01-23 08:34:38 +00:00
Lucas Vulpius
43b5559325 Implemented #896 - Added option for Unlimited FPS 2021-01-23 08:34:38 +00:00
Justin Shipsey
fb09d14725 Merge branch 'Rotsuoy/SavannaGrass' into 'master' 
Rotsuoy/savanna grass

See merge request veloren/veloren!1711
 2021-01-23 07:46:54 +00:00
Rotsuoy
994677a4d0 Rotsuoy/savanna grass 2021-01-23 07:46:54 +00:00
Imbris
adaea096d2 Update winit and iced 2021-01-23 01:09:33 -05:00