Commit Graph

3864 Commits

Author SHA1 Message Date
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
Imbris
f1c44e1f1d Remove old textures that aren't reused when calling replace_graphic 2021-09-23 21:50:37 -04:00
Sam
0e5e2b46f2 Changed energy to internally use an integer with a high resolution, and externally to use a float. 2021-09-23 14:11:09 -04:00
Imbris
5217b5090c Avoided black hexagons when bloom is enabled by suppressing NaN/Inf pixels during the first bloom blur pass 2021-09-22 21:58:36 -04:00
Marcel
d5b4c5549b Merge branch 'bafon/crafting-station-icons' into 'master'
Add crafting station icon to crafting menu sidebar

See merge request veloren/veloren!2848
2021-09-22 13:54:33 +00:00
Bafon
0375b973db Add crafting station icon to crafting menu sidebar 2021-09-22 13:54:32 +00:00
Snowram
3c2de422db Adds Xtilt to BirdLarge skeleton 2021-09-21 15:31:46 +02:00
Snowram
7a73e4240b Bird large beam offset hack 2021-09-21 15:31:43 +02:00
jshipsey
1ad107f4a7 animation tweaks 2021-09-21 15:30:43 +02:00
Snowram
299ca581ea Split wyvern anims from the other birdlarge anims 2021-09-21 15:30:43 +02:00
jshipsey
aedb2e9d2b wyvern walk 2021-09-21 15:30:43 +02:00
Snowram
9acae9fca0 More wyvern anim work 2021-09-21 15:30:42 +02:00
Snowram
834749353a Adds flame wyvern npc 2021-09-21 15:30:42 +02:00
Marcel Märtens
88685cc016 update crates 2021-09-20 14:39:01 +02:00
Ben Wallis
d665ce329d * Added new Admin Commands window to egui, including Give Items and Kits sections
* Added widgets.rs to egui for reusable widgets
* Added filterable_list egui widget
* Reworked DebugShapeAction to be a more generic EguiAction which now allows for ChatCommands (used by admin tools) as well as DebugShape drawing requests.
* Fixed egui event handling so that typing/clicking within egui windows now correctly doesn't pass these events onto the game itself
* Removed /give_item limit for stackable items
2021-09-18 16:17:42 +01:00
anomaluridae
d0bd1ddb24 remove unneeded mut, provide default_select_pos to secondry key event handler, and use the is_filled() over the is_opaque() to be reader friendly 2021-09-17 10:34:20 -07:00
anomaluridae
82f3c3c3e8 is_solid() detects both solid rock and sprites (e.g. mineable ore). when in build mode, would like to be able to still mine if user cursor is over a mineable ore. so need to properly cast the build ray to use opaque (not fillable) blocks to get the proper position, vs the mineable block which may be nearer 2021-09-17 10:34:20 -07:00
anomaluridae
aa86c86cb6 choose nearest target, from a specific subset of targets, for scene highlighting vs interactable vs game primary/secondary key input 2021-09-17 10:34:20 -07:00
anomaluridae
6362df4ffc keep MAX_TARGET_RANGE within voxygen 2021-09-17 10:34:20 -07:00
anomaluridae
b4d12b7995 intentional use of terrain targeting and select_pos as passed to the event handler. select_pos is None when not needed. 2021-09-17 10:34:20 -07:00