Joshua Barretto
6284fa0ecd
Tree trunk color differences
2021-10-05 00:02:02 +01:00
Joshua Barretto
4267a7b7dd
Improved tree hanging and cedar distribution
2021-10-05 00:02:02 +01:00
Joshua Barretto
3f7e0a5e52
Added shrub layer with example shrub
2021-10-05 00:02:02 +01:00
Joshua Barretto
263f02dc11
Improved grass scatter
2021-10-05 00:02:02 +01:00
Imbris
84e4e17ff5
Merge branch 'imbris/small-fixes' into 'master'
...
Some small fixes
Closes #1155 and #870
See merge request veloren/veloren!2897
2021-10-04 16:46:59 +00: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
17accd3839
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
67a1f4669f
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
86bb6f8ef5
Tweaks to the credits.ron file
2021-10-03 16:06:09 -04: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
Imbris
0bfd2e2c5a
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
8b557f0e2e
using par_join.for_each as if I know what I'm doing
2021-10-01 18:05:52 -05:00
Imbris
396604f6d8
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
ddd98de72f
Trade fix (with hashmap awareness)
2021-10-01 21:17:19 +00:00
Benoît du Garreau
ef1c51332d
Update assets_manager to 0.6.0
2021-10-01 21:13:01 +02:00
Samuel Keiffer
f7161c1859
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
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
Imbris
8455e8acbe
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
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
5da9f93ff7
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
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
d2d997a00c
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
ccbdbfe6aa
Make sure to regenerate textures when Ui::replace_graphic is used.
2021-09-27 23:35:14 -04:00
juliancoffee
68aba856ec
Cleaning
2021-09-27 23:21:57 +03:00
juliancoffee
7291d32209
Make ItemDrop component with Item again
2021-09-27 20:36:18 +03:00
juliancoffee
943e7cd0e1
Fix csv tools for loot tables
2021-09-27 15:09:22 +03:00
juliancoffee
7576f632a8
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
9c2fc0d962
Adress review
...
- Mention failed loot specifier during getting item from lottery
2021-09-27 15:09:22 +03:00
juliancoffee
8af4cf1a37
Make Rtsim entity config work
2021-09-27 15:09:22 +03:00
Sam
27823ce8fa
Rtsim now uses entity configs.
2021-09-27 15:09:22 +03:00
Sam
70c2e9bebe
Cave now uses entity configs.
2021-09-27 15:09:22 +03:00
Sam
56b17e7141
Format fixes.
2021-09-27 15:09:22 +03:00
juliancoffee
80ccda6583
Refactor cave supplement to more symmetric code
2021-09-27 15:09:22 +03:00
juliancoffee
ac5ea0cfe8
Hardened Loot handling part two
...
+ clippy advices
+ use LootSpec::Nothing for basic_summon explicitly
2021-09-27 15:09:22 +03:00
juliancoffee
2475b97918
Move loot tables to entity configs
2021-09-27 15:09:22 +03:00
juliancoffee
b056cccb0c
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
09dd9b4813
Changed ItemDrop to use LootSpec
2021-09-27 15:09:22 +03: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
