1812 Commits

Author SHA1 Message Date
Imbris
c51a167eeb Add skybox 2021-06-02 23:59:48 -04:00
Capucho
ad7f1fe18f Reenable terrain rendering
Refractor col lights
2021-06-02 23:59:48 -04:00
Capucho
9a5bc12d3c Fix the orientation of the rendering
Reenable the rendering of the player
2021-06-02 23:59:47 -04:00
Capucho
9924d15dc8 Renable the figure and terrain drawing code (not working yet) 2021-06-02 23:59:47 -04:00
Capucho
6530fe99db Remove the depth buffer from the Third drawer 2021-06-02 23:59:47 -04:00
Capucho
85296c1bb5 Shader fixes 2021-06-02 23:59:47 -04:00
Imbris
dd15e7e7d9 Almost make clouds/postproccess run 2021-06-02 23:59:47 -04:00
Imbris
67d3f7fe08 Render Ui 2021-06-02 23:59:45 -04:00
Imbris
5af935a218 fixed validation errors when creating pipelines 2021-06-02 23:56:43 -04:00
Imbris
940d60d888 Made shaders compile by adding locations and bindings and splitting textures and samplers out into two things and adding guards for double including shaders 2021-06-02 23:56:43 -04:00
Samuel Keiffer
8e278a2124 Merge branch 'aweinstock/price-equality' into 'master'
Add a manifest for making different items count as the same item for the purpose of pricing.

See merge request veloren/veloren!2360
2021-06-02 23:48:45 +00:00
Samuel Keiffer
92f150bf5b Merge branch 'tygyh/default-loadout' into 'master'
LoadoutBuilder refactoring

See merge request veloren/veloren!2361
2021-06-02 23:42:39 +00:00
Avi Weinstock
489fe930ac Add a manifest for making different items count as the same item for the purpose of pricing. 2021-06-02 19:12:51 -04:00
juliancoffee
3e88df129f Decompose LoadoutBuilder::from_asset_expect
- Introduce apply_asset_expect() to mutate passed builder and complete it
from asset
- Remove runtime panic from choosing item
- Rewrite defaults() to load from asset
2021-06-02 17:17:19 +03:00
Dr. Dystopia
d67d6773f0 Replace object initialization with read from file 2021-06-02 17:17:19 +03:00
Dr. Dystopia
bc6192b457 Create 'default.ron' file 2021-06-02 17:17:19 +03:00
Avi Weinstock
75cca1c02e Address MR 2301 review comments.
- Replace tabs with spaces in map-related i18n.
- Use `retain` in `remove_unloaded_chunks`.
2021-06-02 00:39:58 -04:00
Avi Weinstock
d637250501 Add toggle for minimap, fix scaling formula, reduce minimap VD for better performance, and add changelog entry. 2021-06-02 00:39:04 -04:00
Adam Whitehurst
7f2fa4181d fix: commas 2021-05-30 14:47:42 -07:00
Adam Whitehurst
524bb4d7c7 feat: add frozen debuff icon, en strings 2021-05-30 08:49:32 -07:00
Avi Weinstock
202646787d Fix economy data not properly being used to price trades, resulting in default prices being applied at most towns.
Also add an exporter from econsim results to sqlite to aid in debugging the economy (which revealed this bug).
2021-05-28 15:09:29 -04:00
Justin Shipsey
285904a850 Merge branch 'sam/rework-bow' into 'master'
Bow Rework

See merge request veloren/veloren!2310
2021-05-26 04:44:09 +00:00
juliancoffee
e36e63825d fmt 2021-05-25 01:23:32 +03:00
juliancoffee
0fada1cfde Unique loot tables for each dungeon chest 2021-05-25 00:42:43 +03:00
juliancoffee
9bc15c3adf Overhaul loot tables 2021-05-25 00:20:18 +03:00
juliancoffee
718c5b88f4 Adding different chests for each dungeon 2021-05-24 23:00:44 +03:00
juliancoffee
f01b700c88 Add tests for validation assets 2021-05-23 22:27:33 +03:00
juliancoffee
9ed030442b Switch to using EquipSlot key instead of String 2021-05-23 21:37:41 +03:00
juliancoffee
53cd3ccfec Remove unused LoadoutConfig-s 2021-05-23 19:19:20 +03:00
juliancoffee
95dedc0e4e Add directory hierarchy 2021-05-23 19:19:20 +03:00
juliancoffee
e8c0f62c60 Move loadout config handling to .ron files 2021-05-23 19:19:20 +03:00
juliancoffee
23b566dbf8 Add support for .ron loadouts 2021-05-23 19:19:20 +03:00
Samuel Keiffer
7988f50259 Merge branch 'juliancoffee/dungeon_mobs' into 'master'
Dungeon rebalance

See merge request veloren/veloren!2333
2021-05-22 22:38:21 +00:00
juliancoffee
d584da11d6 Move fireworks into own table 2021-05-23 01:04:11 +03:00
juliancoffee
2f568235d9 Adjust mob numbers and add /kit tier-0 2021-05-23 01:04:11 +03:00
juliancoffee
6027f2ffa3 Adjust loot tables
- Add regular drop to T5 miniboss
- Fixup cultist loot table
- Give own loot table to Deadwood in T0
2021-05-23 01:04:11 +03:00
hqurve
36aae8b34b Item pickups are shown in separate window and "inventory-full" messages are shown above the item attempted to be picked up 2021-05-22 20:47:08 +00:00
Sam
7a40a04f16 Balance tweaks. 2021-05-22 15:00:05 -05:00
Illia Denysenko
e91d0c4dbd update uk ua 2021-05-22 18:58:11 +00:00
Samuel Keiffer
e64f4b8e9a Merge branch 'juliancoffee/boss_armour' into 'master'
Boss armor

See merge request veloren/veloren!2327
2021-05-22 17:42:27 +00:00
Sam
62e21e5961 Various tweaks. 2021-05-22 12:41:47 -05:00
juliancoffee
b6570d3151 Fix skill presets, add tests 2021-05-22 12:33:22 -05:00
Sam
0bc059513e Made new skills for reworked bow.
Created migration to reset bow skills.
2021-05-22 12:33:21 -05:00
Sam
74f4556349 Reworked bow 2021-05-22 12:33:20 -05:00
Monty Marz
20faacd04f Ferocious armour for t5-dungeon minibosses 2021-05-22 10:55:36 +00:00
juliancoffee
4f83a4fa4a Add placeholders for bosses armour 2021-05-22 00:20:56 +03:00
Samuel Keiffer
beee857cf7 Merge branch 'juliancoffee/boss_loot_tables' into 'master'
Improve dungeon loot tables

See merge request veloren/veloren!2324
2021-05-21 21:05:14 +00:00
Samuel Keiffer
083f67dbb2 Merge branch 'sam/extra-equip-slots' into 'master'
Added Extra Loadout Slots

See merge request veloren/veloren!2295
2021-05-21 20:28:53 +00:00
juliancoffee
5201de7192 Fixing loot tables
- Use quad_low and quad_medium loot table for corresponding mobs in
dungeons
- Remove cultist loot table from T3-T4 loot tables
- Use resize instead of vec[obj; len] to create different loot and not
duplicated for miniboss_1
2021-05-21 11:31:39 +03:00
juliancoffee
12c42cc1ad Give bosses own creation function and loot table
- Make goose miniboss fallback to differentiate bosses and minibosses
2021-05-21 11:01:47 +03:00