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
7,866 Commits 151 Branches 18 Tags 2.1 GiB
624183e3f3
Commit Graph

3215 Commits

Author SHA1 Message Date
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