Sam
|
da677e8ea6
|
Abilities can now be referred to by the asset id.
|
2021-11-10 17:30:19 -05:00 |
|
Sam
|
4309e1ff9b
|
Did voxygen stuff for ability pool.
|
2021-11-09 21:20:41 -05:00 |
|
Imbris
|
a7e1d3218f
|
Potential fix for leak when inventory is open
|
2021-11-09 01:21:45 -05:00 |
|
Jon Nettleton
|
836c948086
|
Update crate for keyboard-keynames
This revision includes a fix for supporting Aarch64 platforms
Signed-off-by: Jon Nettleton <jon@solid-run.com>
(cherry picked from commit a5e64af199)
|
2021-11-02 08:49:17 +00:00 |
|
Joshua Barretto
|
80c4e3de19
|
Merge branch 'tijnvdheuvel/newSFX' into 'master'
Merge "Tijnvdheuvel/new sfx" New Truffler & Fungome SFX
See merge request veloren/veloren!2977
|
2021-11-01 21:15:35 +00:00 |
|
jshipsey
|
c2b7d3bb44
|
good hat rendering
|
2021-10-30 23:42:16 -04:00 |
|
jshipsey
|
a05c1ea4c5
|
switch to new matcell variant
|
2021-10-30 23:42:15 -04:00 |
|
jshipsey
|
3915aa7aac
|
support for hollow voxels ty zesterer
|
2021-10-30 23:42:14 -04:00 |
|
jshipsey
|
5cc54b34bd
|
headbands
|
2021-10-30 23:42:13 -04:00 |
|
Sam
|
15a8c31383
|
Hack to make salvage go away when leaving station.
|
2021-10-29 13:25:38 -04:00 |
|
tijnvdheuvel
|
a36106eb22
|
Update mod.rs missed a comma
|
2021-10-29 13:09:21 +00:00 |
|
tijnvdheuvel
|
3dbd553997
|
Fixed bug truffler quadruped small
|
2021-10-28 17:37:29 +00:00 |
|
tijnvdheuvel
|
d4df012835
|
Added mod.rs entries for truffler and Fungome
|
2021-10-28 13:48:22 +00:00 |
|
Samuel Keiffer
|
fef9fd5893
|
Merge branch 'sam/crafting-tweaks' into 'master'
Better salvaging and other crafting tweaks
See merge request veloren/veloren!2903
|
2021-10-27 21:33:21 +00:00 |
|
Snowram
|
02930dd2ed
|
Uses a list for item tooltips
|
2021-10-27 17:02:36 -04:00 |
|
Sam
|
4b9e9c506b
|
Fixed opening salvaging station not showing salvage text.
|
2021-10-27 17:02:35 -04:00 |
|
Monty Marz
|
727295aec1
|
text and alignment WIP
|
2021-10-27 17:02:35 -04:00 |
|
Monty Marz
|
a97cc95496
|
crafting station model, explanatory text part 1
|
2021-10-27 17:02:34 -04:00 |
|
Sam
|
5707377565
|
Changed tooltips to take iterator. Tooltips also show original item as well as salvage output.
|
2021-10-27 17:02:34 -04:00 |
|
Snowram
|
2bf16aab63
|
Make item tooltip accept multiple items for salvage
|
2021-10-27 17:02:33 -04:00 |
|
Sam
|
e28ca15059
|
Salvaging now requires a salvaging station.
|
2021-10-27 17:02:33 -04:00 |
|
Monty Marz
|
7aae35f286
|
bench
|
2021-10-27 17:02:31 -04:00 |
|
Sam
|
5c3021bd0a
|
Inventory now highlights salvageable items when in salvage mode.
|
2021-10-27 17:02:31 -04:00 |
|
Sam
|
794b072d3e
|
Simple recipes now take a vec of slots to look in for the ingredients.
|
2021-10-27 17:02:30 -04:00 |
|
Sam
|
7a17863988
|
Salvage works by double clicking from inventory while salvage tab in crafting is open.
|
2021-10-27 17:02:30 -04:00 |
|
Sam
|
111abbc3bc
|
Added salvage tags to items, removed old salvage recipes from recipe book.
|
2021-10-27 17:02:29 -04:00 |
|
IsseW
|
2e27f7f84a
|
remove print
|
2021-10-27 23:01:41 +02:00 |
|
Joshua Barretto
|
30604788b9
|
Merge branch 'isse/loading-tip-fixes' into 'master'
Loading screen tip fixes
See merge request veloren/veloren!2961
|
2021-10-27 20:08:46 +00:00 |
|
Kemper
|
ff56804d8a
|
Show energy reward and speed as percentages in item tooltips
|
2021-10-26 23:07:37 +00:00 |
|
Joshua Barretto
|
37056e75f9
|
Merge branch 'demonic/shrubs' into 'master'
Added new Spots, Shrubs and Ships.
See merge request veloren/veloren!2953
|
2021-10-26 10:06:14 +00:00 |
|
IsseW
|
50d37bc2d4
|
run clippy
|
2021-10-26 01:30:27 +02:00 |
|
IsseW
|
3368f43a22
|
consider key layout
|
2021-10-26 00:42:30 +02:00 |
|
IsseW
|
047cda179f
|
Added keybinding shortcut in loading tips
|
2021-10-25 23:53:27 +02:00 |
|
Joshua Barretto
|
6362c0df32
|
Fixed non-character point lights
|
2021-10-25 12:00:02 +00:00 |
|
Forest Anderson
|
15185ef55e
|
Merge branch 'master' into 'master'
Fixes #819 - Prevent lantern from turning off on death
Closes #819
See merge request veloren/veloren!2955
|
2021-10-24 21:16:34 +00:00 |
|
Q-I-U
|
09028f3261
|
Add !health.is_dead() check to renderer
|
2021-10-24 22:28:23 +02:00 |
|
DemonicOnPc
|
b1476071b1
|
Added new Spots, Shrubs and Ships.
Spots
- Gnarling Tree
- Troll Cave
- Underwater Shipwreck second variation.
Shrubs added to biomes
- Savannah Shrubs
- Taiga Shrubs
- Temperate Shrubs
Galleon ship added
|
2021-10-24 08:10:44 -04:00 |
|
antoniomuso
|
cf8d995af7
|
formatted some tooltips floats
|
2021-10-24 10:14:54 +02:00 |
|
Samuel Keiffer
|
f92c6fbd49
|
Merge branch 'ubruntu/sneakwield-state' into 'master'
Sneak with weapons drawn
See merge request veloren/veloren!2917
|
2021-10-18 20:27:02 +00:00 |
|
Bryant Deters
|
b2bd43f4d3
|
Sneak with weapons drawn
|
2021-10-18 14:53:55 -05:00 |
|
Samuel Keiffer
|
1e61a279cc
|
Merge branch 'kaedr/pretty_printing_error_messages' into 'master'
Fixed obfuscation of error messages caused by previous MR (pretty printing error messages)
See merge request veloren/veloren!2935
|
2021-10-18 03:35:03 +00:00 |
|
Samuel Keiffer
|
e6a4e53ef3
|
Merge branch 'MHK/auto_search_in_crafting_menu' into 'master'
Add auto searching in crafting menu
See merge request veloren/veloren!2932
|
2021-10-17 15:16:21 +00:00 |
|
MohammadHasanKargar
|
40073413ae
|
Add hover effect to auto search in crafting menu
|
2021-10-17 15:27:27 +03:30 |
|
kaedr
|
cd5aa2d1d8
|
Fixed redundant to_string() call.
|
2021-10-16 20:41:13 -04:00 |
|
kaedr
|
c8a1d821e7
|
Added handling for connection errors that occur before client leaves login screen
|
2021-10-16 20:17:40 -04:00 |
|
kaedr
|
cc98ccc371
|
Added localization for server error message display on client
|
2021-10-16 20:17:38 -04:00 |
|
kaedr
|
eb02a4733d
|
Fixed obfuscation of error messages caused by previous commits
|
2021-10-16 20:17:37 -04:00 |
|
Joshua Barretto
|
ef33b2e3ab
|
Better ambiance slider
|
2021-10-16 15:12:07 +01:00 |
|
Joshua Barretto
|
3322eeb365
|
Aurora light tint
|
2021-10-16 14:32:18 +01:00 |
|
Joshua Barretto
|
b1a1cdde34
|
Fixed 'Empty' collectable sprite
|
2021-10-16 14:31:46 +01:00 |
|
Joshua Barretto
|
3357008601
|
Merge branch 'zesterer/small-fixes' into 'master'
Caverns
See merge request veloren/veloren!2763
|
2021-10-16 09:33:57 +00:00 |
|
MohammadHasanKargar
|
1d7ba57de7
|
Add auto searching in crafting menu
|
2021-10-15 23:57:04 +03:30 |
|
Henry Corse
|
e01ce2dcf4
|
Kaedr/pretty printing error messages
|
2021-10-14 18:37:51 +00:00 |
|
Marcel
|
a4cf875a54
|
Merge branch 'isse/crafted-from-item' into 'master'
use "input:____" for searching by recipe input
See merge request veloren/veloren!2893
|
2021-10-10 15:44:44 +00:00 |
|
Isidor Nielsen
|
f0864a7b0a
|
use "input:____" for searching by recipe input
|
2021-10-10 15:44:43 +00:00 |
|
Marcel
|
94439a4240
|
Merge branch 'jtriantafylos/background_fps' into 'master'
Fixes #1350 - Allow players to cap the game FPS when unfocused
Closes #1350
See merge request veloren/veloren!2890
|
2021-10-10 15:33:38 +00:00 |
|
James Triantafylos
|
99776a6ebd
|
Fixes #1350 - Allow players to cap the game FPS when unfocused
|
2021-10-10 15:33:31 +00:00 |
|
Monty Marz
|
14ed73ec12
|
cavern sprites
|
2021-10-10 13:41:56 +01:00 |
|
Joshua Barretto
|
bfc55d7b17
|
More cavern details
|
2021-10-10 13:41:56 +01:00 |
|
Joshua Barretto
|
5c0026f4a7
|
Performance improvements for terrain watcher
|
2021-10-10 13:41:56 +01:00 |
|
Joshua Barretto
|
1cfad833c7
|
Added caverns, fixed chunk load performance issue
|
2021-10-10 13:41:56 +01:00 |
|
CapsizeGlimmer
|
a723406df7
|
Prevent "Error setting/centering cursor position" message spam
|
2021-10-06 21:25:14 +00:00 |
|
Imbris
|
26c028975e
|
Remove map drag from the settings file since it is always reset when closing the map leaving little reason to persist it
|
2021-10-06 02:13:02 -04:00 |
|
Imbris
|
66076db7bb
|
Make map icons fade out quickly when near the edge of the map display
|
2021-10-06 01:37:11 -04:00 |
|
Treeco
|
305bdf94ef
|
Various map UI fixes for large worlds
changes `zoom` such that 1.0 means 1 Conrod unit = 1 chunk, rather than 1.0 meaning fully zoomed out
|
2021-10-06 02:26:58 +01:00 |
|
Marcel
|
a48b99560c
|
Merge branch 'imbris/fix-reset-scissor' into 'master'
Make sure ui draw commands are cleared if the renderer's resolution changes
Closes #1362
See merge request veloren/veloren!2898
|
2021-10-05 06:11:01 +00:00 |
|
ubruntu
|
0e2808a8fd
|
Interactable campfires
|
2021-10-05 00:55:29 +00:00 |
|
Joshua Barretto
|
bfbca3e517
|
Added sail boat
|
2021-10-05 00:02:03 +01:00 |
|
Imbris
|
645bd03142
|
Make sure ui draw commands are cleared if the renderer's resolution changes
|
2021-10-04 18:58:28 -04:00 |
|
Imbris
|
c8b55d3dcb
|
Improve the warning message when USERDATA_STRATEGY was not set during compilation and the binary was moved outside the workspace/crate that it was compiled from, show a warning when an invalid VELOREN_USERDATA_STRATEGY is used, and also actually make sure warnings from userdata selection are logged in voxygen (since the userdata folder needs to be selected to set up logging we have to rerun the selection after logging is set up so that any warnings will be logged).
|
2021-10-04 12:23:42 -04:00 |
|
Imbris
|
bb26008074
|
Remove explicit coreaudio-sys version since we no longer rely on having the older version pinned (in fact it was already updated to the latest version)
|
2021-10-04 11:15:26 -04:00 |
|
Joshua Barretto
|
4dca33a31f
|
Merge branch 'alphyr/update_assets_manager' into 'master'
Update `assets_manager` to `0.6.0`
See merge request veloren/veloren!2889
|
2021-10-04 11:40:41 +00:00 |
|
Imbris
|
f867991198
|
Merge branch 'imbris/credits' into 'master'
Add credits screen
Closes #1296
See merge request veloren/veloren!2872
|
2021-10-03 04:26:58 +00:00 |
|
Imbris
|
d2bd62733f
|
Add core devs to the contributors list in credits.ron and remove placeholder entries in empty art sections (in favor of displaying nothing)
|
2021-10-03 00:06:47 -04:00 |
|
Benoît du Garreau
|
ef1c51332d
|
Update assets_manager to 0.6.0
|
2021-10-01 21:13:01 +02:00 |
|
Imbris
|
4cfa6b71fc
|
Rework scaling to never use the logical size directly from the window as it can end up being inconsistent with the rendering target size (depending on timing)
|
2021-10-01 01:13:15 -04:00 |
|
Dominik Broński
|
382bc2f9da
|
Merge branch 'flo666/change-gamepad-mapping' into 'master'
change gamepad mapping
See merge request veloren/veloren!2841
|
2021-09-30 18:48:42 +00:00 |
|
flo
|
0f77ceaeef
|
change gamepad mapping
|
2021-09-30 18:48:42 +00:00 |
|
Imbris
|
ee42eaa515
|
Make gitlab hightlight syntax for ron files (using rust syntax highlighting). Update changelog for credits addition. Fix clippy large variant issue.
|
2021-09-30 03:01:24 -04:00 |
|
Imbris
|
691b61e22d
|
Add documentation to credits.ron and fill in fonts entries with actual data, add additional entries to Art credits for documenting information relevant to satifying attribution requirements for some licenses, add/rename license files for fonts, center credits text on the credits screen, added asset_path field to associate art credits with the actual asset files and wrote a unit test to ensure that these paths are valid.
|
2021-09-30 02:35:59 -04:00 |
|
Sylvain Migaud
|
9b41568881
|
Place date at the begining of the log file name
|
2021-09-30 06:09:30 +00:00 |
|
Imbris
|
40240a4005
|
Add basic credits screen to the main menu with some example data loaded from a ron file
|
2021-09-29 21:06:52 -04:00 |
|
Imbris
|
70f9134c3c
|
Deduplicate window resize events to remove redudant resizing of the swap chain and other render targets and to fix issues where resizing quickly can cause self reinforcing delays in tick completion
|
2021-09-29 10:25:59 -04:00 |
|
Imbris
|
44e526fbcc
|
Merge branch 'bafon/voxel-transparency' into 'master'
Fix voxel transparency
See merge request veloren/veloren!2885
|
2021-09-28 04:44:29 +00:00 |
|
Bafon
|
efb0e859f2
|
Fix voxel transparency
|
2021-09-28 04:44:29 +00:00 |
|
Imbris
|
ccbdbfe6aa
|
Make sure to regenerate textures when Ui::replace_graphic is used.
|
2021-09-27 23:35:14 -04:00 |
|
Snowram
|
91c7aef01a
|
Merge branch 'snowram/debug_background' into 'master'
Add a background to debug infos
See merge request veloren/veloren!2858
|
2021-09-26 22:15:52 +00:00 |
|
Snowram
|
95bc6e3b58
|
Add a background to debug infos
|
2021-09-26 23:58:38 +02:00 |
|
Marcel
|
cea927efb6
|
Merge branch 'xMAC94x/update-toolchain' into 'master'
update toolchain to `nightly-2021-09-24`
See merge request veloren/veloren!2862
|
2021-09-26 19:25:02 +00:00 |
|
Samuel Keiffer
|
ea2fa5f110
|
Merge branch 'sam/cr-weights' into 'master'
Changed weights of cr calculation and exp from cr formula.
See merge request veloren/veloren!2875
|
2021-09-26 18:21:56 +00:00 |
|
Imbris
|
67e3b87717
|
Add note on a clippy suppression pointing to relevant clippy issue
|
2021-09-26 11:24:30 -04:00 |
|
Sam
|
c62162c2d3
|
Changed weights of cr calculation and exp from cr formula.
|
2021-09-25 21:52:20 -04:00 |
|
Sam
|
942376f88c
|
Made poise a float at interface of module.
|
2021-09-25 14:07:47 -04:00 |
|
Samuel Keiffer
|
0af6969d19
|
Merge branch 'sam/energy-float' into 'master'
Changed energy to a float
See merge request veloren/veloren!2838
|
2021-09-25 06:51:21 +00:00 |
|
Marcel Märtens
|
e36eef99c8
|
apply some clippy fixes that comes with the new toolchain version
|
2021-09-24 23:18:18 +02:00 |
|
Marcel Märtens
|
2a82405df2
|
update toolchain to nightly-2021-09-24
|
2021-09-24 23:18:07 +02:00 |
|
Snowram
|
0b26f456f9
|
Merge branch 'bafon/toggle-hotkey-hints-setting' into 'master'
Add setting to disable hotkey hints
See merge request veloren/veloren!2849
|
2021-09-24 16:03:06 +00:00 |
|
Bafon
|
d53d2300a6
|
Add setting to disable hotkey hints
|
2021-09-24 16:03:05 +00:00 |
|
João Capucho
|
34eb58cded
|
Fix dir is empty check when setting WGPU_TRACE_DIR
|
2021-09-24 15:07:12 +01:00 |
|
Imbris
|
83fed7a2bc
|
Merge branch 'imbris/tex-cleanup' into 'master'
Remove old textures that aren't reused when calling replace_graphic
See merge request veloren/veloren!2869
|
2021-09-24 02:38:27 +00:00 |
|