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

9938 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Ben Wallis
91906cee37 Merge branch 'reduce-duplication-in-asset-identifiers' into 'master' 
Reduce duplication in glider asset identifiers

Closes #942

See merge request veloren/veloren!2876
 2021-09-26 13:49:50 +00:00
Seth
f99211d482 Reduce duplication in glider asset identifiers 2021-09-26 13:49:49 +00:00
Samuel Keiffer
aa6b2e041b Merge branch 'sam/poise-float' into 'master' 
Made poise a float

See merge request veloren/veloren!2878
 2021-09-26 04:35:50 +00:00
Sam
14cdb2b803 Changed weights of cr calculation and exp from cr formula. 2021-09-25 21:52:20 -04:00
Imbris
22f4a73fa8 Bump to fresh CI image with the new toolchain 2021-09-25 14:58:34 -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
Marcel Märtens
43a946bb08 update toolchain to nightly-2021-09-24 2021-09-24 23:17:54 +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
Samuel Keiffer
4d67f88cea Merge branch 'juliancoffee/loot_table_fix' into 'master' 
Don't drop quad_low loot from quad_small fur

See merge request veloren/veloren!2874
 2021-09-24 15:59:26 +00:00
juliancoffee
faf0a47d31 Don't drop quad_low loot from quad_small fur 2021-09-24 18:03:26 +03:00
Imbris
bf9ad043ae Merge branch 'capucho/wgpu-trace' into 'master' 
Fix dir is empty check when setting WGPU_TRACE_DIR

See merge request veloren/veloren!2873
 2021-09-24 14:38:41 +00:00
João Capucho
40432b5c83
Fix dir is empty check when setting WGPU_TRACE_DIR 2021-09-24 15:07:12 +01:00