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,954 Commits 151 Branches 18 Tags 2.1 GiB
dee4f787b9
Commit Graph

9954 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
88f5ccd305 Merge branch 'ubruntu/par-entity-sync' into 'master' 
Parallelize EntitySync

See merge request veloren/veloren!2891
 2021-10-03 20:30:48 +00:00
Imbris
4ca992b73e Merge branch 'imbris/credits-tweaks' into 'master' 
Tweaks to the credits.ron file

See merge request veloren/veloren!2896
 2021-10-03 20:21:18 +00:00
Imbris
e5442c3f20 Tweaks to the credits.ron file 2021-10-03 16:06:09 -04: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
Imbris
d375a04393 Merge branch 'imbris/fix-text-offset' into 'master' 
Rework scaling to never use the logical size directly from the window as it can end up inconsistent with the size used by the renderer depending on the timing

Closes #1360

See merge request veloren/veloren!2888
 2021-10-02 13:20:09 +00:00
Bryant Deters
b2d384b436 using par_join.for_each as if I know what I'm doing 2021-10-01 18:05:52 -05:00
Imbris
2cc2db3186 Merge branch 'ubruntu/trade-fix-part3' into 'master' 
Trade fix (with hashmap awareness)

See merge request veloren/veloren!2877
 2021-10-01 21:17:19 +00:00
ubruntu
241fbc47dd Trade fix (with hashmap awareness) 2021-10-01 21:17:19 +00:00
Benoît du Garreau
dda54e6ee2 Update assets_manager to 0.6.0 2021-10-01 21:13:01 +02:00
Samuel Keiffer
984ea6008d Merge branch 'sam/loot' into 'master' 
Refactored loot table selection on entity death

See merge request veloren/veloren!2879
 2021-10-01 07:06:10 +00: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
Imbris
3473b9e9ae Merge branch 'sylvain_m/log-naming' into 'master' 
Place date at the begining of the log file name

See merge request veloren/veloren!2880
 2021-09-30 06:09:30 +00: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
6924db15d5 Merge branch 'imbris/deduplicate-resize' into 'master' 
Deduplicate window resize events to fix a few issues

See merge request veloren/veloren!2886
 2021-09-29 14:46:20 +00: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
e4d6cdf6ad Merge branch 'imbris/robust-texid-usage' into 'master' 
Make sure to regenerate textures when Ui::replace_graphic is used.

See merge request veloren/veloren!2884
 2021-09-28 04:08:57 +00:00
Imbris
1fa61691ce Make sure to regenerate textures when Ui::replace_graphic is used. 2021-09-27 23:35:14 -04:00
juliancoffee
e5d6fd2887 Cleaning 2021-09-27 23:21:57 +03:00
juliancoffee
7df22ceaec Make ItemDrop component with Item again 2021-09-27 20:36:18 +03:00
juliancoffee
b423faa32c Fix csv tools for loot tables 2021-09-27 15:09:22 +03:00
juliancoffee
3c0211bf0b Adress review 
- Added comments on why Waypoint branch of NpcData is unreachable.
- Added comments on signature of get_adhoc_loadout.
 2021-09-27 15:09:22 +03:00
juliancoffee
e9e63997e8 Adress review 
- Mention failed loot specifier during getting item from lottery
 2021-09-27 15:09:22 +03:00
juliancoffee
98382ea012 Make Rtsim entity config work 2021-09-27 15:09:22 +03:00
Sam
9a57b218ed Rtsim now uses entity configs. 2021-09-27 15:09:22 +03:00
Sam
482194decb Cave now uses entity configs. 2021-09-27 15:09:22 +03:00
Sam
99e19dc5d0 Format fixes. 2021-09-27 15:09:22 +03:00
juliancoffee
bc962f707d Refactor cave supplement to more symmetric code 2021-09-27 15:09:22 +03:00
juliancoffee
8f84e00e7e Hardened Loot handling part two 
+ clippy advices
+ use LootSpec::Nothing for basic_summon explicitly
 2021-09-27 15:09:22 +03:00
juliancoffee
38c004d494 Move loot tables to entity configs 2021-09-27 15:09:22 +03:00
juliancoffee
b53643e12a Hardened loot table handling 
- Rename LootSpec::None to LootSpec::Nothing to not confuse with Option
- Warn on invalid item paths in loot tables
 2021-09-27 15:09:22 +03:00
Sam
06f3e04034 Changed ItemDrop to use LootSpec 2021-09-27 15:09:22 +03: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
Marcel
e86b426b22 Merge branch 'update-cz_CZ' into 'master' 
update-cz_CZ

See merge request veloren/veloren!2881
 2021-09-26 19:02:45 +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
Sam
f74bb6d70a Condense assignment of variables 2021-09-26 13:51:27 -04:00
Jakub Janeček
8334556c6c Update assets/voxygen/i18n/cz_CZ/hud/bag.ron, assets/voxygen/i18n/cz_CZ/hud/crafting.ron, assets/voxygen/i18n/cz_CZ/hud/char_window.ron, assets/voxygen/i18n/cz_CZ/hud/chat.ron, assets/voxygen/i18n/cz_CZ/hud/map.ron, assets/voxygen/i18n/cz_CZ/hud/misc.ron, assets/voxygen/i18n/cz_CZ/hud/sct.ron, assets/voxygen/i18n/cz_CZ/hud/settings.ron, assets/voxygen/i18n/cz_CZ/hud/skills.ron, assets/voxygen/i18n/cz_CZ/buff.ron, assets/voxygen/i18n/cz_CZ/char_selection.ron, assets/voxygen/i18n/cz_CZ/common.ron, assets/voxygen/i18n/cz_CZ/gameinput.ron, assets/voxygen/i18n/cz_CZ/main.ron files 2021-09-26 17:15:31 +00:00
Imbris
ec5204af37 Add note on a clippy suppression pointing to relevant clippy issue 2021-09-26 11:24:30 -04:00