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

9925 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Samuel Keiffer
9118206dc1 Merge branch 'heydabop/1339-attack-cancel-interaction' into 'master' 
Fixes #1339 - Allow attacks and abilities to interrupt sprite interaction

Closes #1339

See merge request veloren/veloren!2864
 2021-09-23 16:28:49 +00:00
heydabop
7087ffde7c
Fixes #1339 - Allow attacks and abilities to interrupt sprite interaction 2021-09-23 10:05:12 -05:00
Joshua Barretto
6b198044fe Merge branch 'zesterer-master-patch-65668' into 'master' 
Fixed crash caused by invalid health, stated current <= maximum invariant more clearly

See merge request veloren/veloren!2871
 2021-09-23 12:18:36 +00:00
Joshua Barretto
2417a40afd Fixed crash caused by invalid health, stated current <= maximum invariant more clearly 2021-09-23 12:36:03 +01:00
Joshua Barretto
8db22ecfd9 Merge branch 'imbris/bloom-suppress-nans' into 'master' 
Avoided black hexagons when bloom is enabled by suppressing NaN/Inf pixels

See merge request veloren/veloren!2870
 2021-09-23 10:47:03 +00: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
Joshua Barretto
1d38cd733a Merge branch 'snowram/omit-rtsim-wyvern' into 'master' 
Removes flame wyvern from RTsim pool until proper introduction

See merge request veloren/veloren!2868
 2021-09-22 19:50:22 +00:00
Snowram
4c74899143 Removes flame wyvern from RTsim pool until proper introduction 2021-09-22 20:59:04 +02: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