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
9,997 Commits 151 Branches 18 Tags
Commit Graph

3871 Commits

Author SHA1 Message Date
Imbris
58c690f1d2 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
2983ab60ed Make map icons fade out quickly when near the edge of the map display 2021-10-06 01:37:11 -04:00
Treeco
fa2486b3d6 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
9579acc3ae 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
e80079ed99 Interactable campfires 2021-10-05 00:55:29 +00:00
Joshua Barretto
59c8ee3c70 Added sail boat 2021-10-05 00:02:03 +01:00
Imbris
25ec696ad1 Make sure ui draw commands are cleared if the renderer's resolution changes 2021-10-04 18:58:28 -04:00
Imbris
dee4f787b9 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
a4d7df1c1d 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
e027e4b320 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
6f28f80e16 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
d77a0779ca 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
dda54e6ee2 Update assets_manager to 0.6.0 2021-10-01 21:13:01 +02:00
Imbris
e6e5219104 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
ca4e9a3436 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
2955f75be1 change gamepad mapping 2021-09-30 18:48:42 +00:00
Imbris
7fca34668a 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
4e9007b45a 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
0cb5551ce2 Place date at the begining of the log file name 2021-09-30 06:09:30 +00:00
Imbris
065654f451 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
0c214baf9b 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
aa2695e88f 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
5fb53ddf4e Fix voxel transparency 2021-09-28 04:44:29 +00:00
Imbris
1fa61691ce Make sure to regenerate textures when Ui::replace_graphic is used. 2021-09-27 23:35:14 -04:00
Snowram
82e98b4faf 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
e7b70e68de Add a background to debug infos 2021-09-26 23:58:38 +02:00
Marcel
64a8e3c5df 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
d7a89bf944 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
ec5204af37 Add note on a clippy suppression pointing to relevant clippy issue 2021-09-26 11:24:30 -04:00
Sam
14cdb2b803 Changed weights of cr calculation and exp from cr formula. 2021-09-25 21:52:20 -04:00
Sam
d0c78c3d63 Made poise a float at interface of module. 2021-09-25 14:07:47 -04:00
Samuel Keiffer
fcd865a3c7 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
96bd27db62 apply some clippy fixes that comes with the new toolchain version 2021-09-24 23:18:18 +02:00
Marcel Märtens
8c0c86b192 update toolchain to nightly-2021-09-24 2021-09-24 23:18:07 +02:00
Snowram
e9a9f0a278 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
f5c90911ec Add setting to disable hotkey hints 2021-09-24 16:03:05 +00:00
João Capucho
40432b5c83
Fix dir is empty check when setting WGPU_TRACE_DIR 2021-09-24 15:07:12 +01:00
Imbris
c0e0d2080d 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
1c7b84040e Remove old textures that aren't reused when calling replace_graphic 2021-09-23 21:50:37 -04:00
Sam
961782851f 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
51bda3f52b 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
cde6126fb7 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
e2f8468016 Add crafting station icon to crafting menu sidebar 2021-09-22 13:54:32 +00:00
Snowram
8d88a29a4b Adds Xtilt to BirdLarge skeleton 2021-09-21 15:31:46 +02:00
Snowram
46021c31bd Bird large beam offset hack 2021-09-21 15:31:43 +02:00
jshipsey
7978b16820 animation tweaks 2021-09-21 15:30:43 +02:00
Snowram
cfdcf59844 Split wyvern anims from the other birdlarge anims 2021-09-21 15:30:43 +02:00
jshipsey
be53c407cb wyvern walk 2021-09-21 15:30:43 +02:00
Snowram
298c1fbccb More wyvern anim work 2021-09-21 15:30:42 +02:00
Snowram
7384868c57 Adds flame wyvern npc 2021-09-21 15:30:42 +02:00