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,109 Commits 151 Branches 18 Tags
Commit Graph

1011 Commits

Author SHA1 Message Date
Marcel Märtens
2cb27be0c6 clippy fixes in tests 2021-07-12 13:35:26 +02:00
Marcel Märtens
7153e8879d fix clippy warnings 2021-07-12 12:09:09 +02:00
Marcel Märtens
e2e1f15cff update depednencies 2021-07-08 12:21:02 +02:00
Snowram
6d122c6ade Spawn dungeon entrances depending on the Site origin biome 2021-07-07 00:35:50 +02:00
juliancoffee
a33900437f (fix) spawn HaniwaSentry in T3 2021-07-05 18:49:25 +03:00
juliancoffee
1f800f2b9b (fix) Use backpack item for merchant's ingredients 2021-07-05 18:49:25 +03:00
juliancoffee
4a10800de8 Improve Merchant inventory from UX perspective 
Changes:
- Make it use red bags with 18 slots (2 rows * 9)
- Sort items by quality
- Stack ingredients, food, potions
- Move coins to ingedients bag and put it first
- Filter unconsumed good (case when you saw 16 rugged shirts)

Refactoring:
- Split bag creation to separate functions
 2021-07-03 22:16:06 +03:00
Marcel
426ed0a8cc Merge branch 'aweinstock/blockstats' into 'master' 
Add block statistics generator to world/examples.

See merge request veloren/veloren!2526
 2021-07-02 17:10:26 +00:00
Avi Weinstock
058a832d37 Add benchmark for color quantization using the rtree crate. 2021-07-01 13:41:37 -04:00
juliancoffee
def73d4425 Split room enemy generation to separate functions 2021-06-30 03:52:51 +03:00
juliancoffee
8a8a3f9318 Add RoomKind enum, address comments 
- enum RoomKind {Peaceful, Fight, Boss, Miniboss} to specify type of
generated room.
 2021-06-30 03:52:51 +03:00
juliancoffee
d339fc4343 More deterministic dungeon fights 
- Spawn fixed number of enemies (2-4) in a room with any size. 1-3 enemies for T5 dungeon.
 2021-06-30 03:52:50 +03:00
Avi Weinstock
7b0dcad68f Generate palette info from block statistics, and benchmark how well it compresses. 2021-06-28 22:11:19 -04:00
Avi Weinstock
09a68510f2 Use SQL transactions in world_block_statistics to try to speed it up. 2021-06-28 15:50:58 -04:00
Avi Weinstock
b04e820bc4 Add block statistics generator to world/examples. 2021-06-28 15:02:57 -04:00
Avi Weinstock
7a5388b8bb Use new dungeons in dungeon_voxel_export, remove old dungeon sampling function, and add more of world/examples to CI. 2021-06-27 15:35:43 -04:00
Benoît du Garreau
ab3c8cf764 Update assets_manager to 0.5 2021-06-26 12:05:40 +02:00
Joshua Barretto
9c746f7867 Merge branch 'aweinstock/site2dungeon' into 'master' 
Convert dungeons to site2.

See merge request veloren/veloren!2499
 2021-06-25 23:06:24 +00:00
Avi Weinstock
7b2adc0e22 Rename difficulty to dungeon_difficulty. 2021-06-25 18:18:27 -04:00
Avi Weinstock
98a1034167 Tweaks to dungeon pillars. 2021-06-25 15:54:42 -04:00
Avi Weinstock
2221825533 Add comments to dungeon code. Fix the radius calculation (which lead to dungeons getting truncated), and fix sprites spawning above staircases. 2021-06-25 14:08:23 -04:00
Avi Weinstock
97d0be5a15 Fix tests and examples to point to site2 dungeons. 2021-06-24 23:21:49 -04:00
Avi Weinstock
f74506038d Convert dungeon lights to CSG, tweak pillars, convert the magic circle from lava to glowing rock, make enemies spawn in dungeons, and fix clippy warnings. 2021-06-24 23:03:24 -04:00
Snowram
3b393a9c5c Ajust new npcs from feedback 2021-06-25 03:26:32 +02:00
Snowram
38c9ff5225 Husk brute animations 2021-06-24 19:31:19 +02:00
Snowram
78afaf32a2 Removes warlord and warlock armours 2021-06-24 19:30:11 +02:00
Avi Weinstock
ce67498083 Add pillars and wall sconces to site2 dungeons. 2021-06-23 23:22:14 -04:00
Avi Weinstock
3981099f30 Add wall contours and sprites to site2 dungeon. Also add septagon decal in boss rooms. 2021-06-23 23:22:14 -04:00
Avi Weinstock
9b7181e5ab Traverse the dungeon tile structure to create the rooms, and align the stairs. 2021-06-23 23:22:14 -04:00
Avi Weinstock
fc2d0225d3 Add Primitive::Prefab and Fill::Prefab for coloring dungeon entrances. 2021-06-23 23:22:14 -04:00
Avi Weinstock
1da3f8a83b Get structures loading via sampling primitive. 2021-06-23 23:22:14 -04:00
Avi Weinstock
382a783d40 Progress on converting dungeons to site2. Adds Sampling and Translate primitives. 2021-06-23 23:22:14 -04:00
Dominik Broński
1d55cb9c15 Merge branch 'aweinstock/lava' into 'master' 
Lava

See merge request veloren/veloren!2482
 2021-06-21 20:49:44 +00:00
Marcel
1de3dd515c Merge branch 'imbris/tracy' into 'master' 
Refactor Client message handling, improve use of tracy, increase coverage of profiling spans in voxygen

See merge request veloren/veloren!2479
 2021-06-20 23:17:08 +00:00
Dominik Broński
eb44d4b7d8 Merge branch 'christof/trade_optimization' into 'master' 
Accelerate econsim using arrays instead of hashmaps

See merge request veloren/veloren!2216
 2021-06-20 16:00:37 +00:00
Christof Petig
11d9b93684 Accelerate econsim using arrays instead of hashmaps 2021-06-20 16:00:37 +00:00
juliancoffee
5491902a1c Create distribution map for dungeons 
* tl;dr T0 - 27%, T1/T2 - 22%, T3/T4 - 11%, T5 - 5%.
Before every dungeon had 16% chance to be created.
 2021-06-20 00:14:54 +03:00
Avi Weinstock
a831a4fb69 Make lava solid w.r.t. rendering while still being liquid w.r.t. physics. 2021-06-19 16:52:21 -04:00
Avi Weinstock
e09c5adc02 Add lava to caves, which sets you on fire if you swim in it. Currently requires uncommenting #define LAVA in the shaders, and only looks good with cheap fluid mode. 2021-06-19 16:31:21 -04:00
juliancoffee
7a03c689f6 Add config file for dungeon distribution 
- Now you can specify probability of "spawn" of dungeon with specific
difficulty
 2021-06-19 23:26:13 +03:00
Imbris
156e2e86b5 Remove tracy features that are no longer needed now that macros have been fixed 2021-06-19 04:27:50 -04:00
juliancoffee
0fecde103d Don't spawn enemies in boss room 2021-06-19 10:47:45 +03:00
jshipsey
85fdf467fd basilisk tweaks 2021-06-16 23:28:25 -04:00
jshipsey
a98734d609 buffs to stretch progression 2021-06-16 20:50:46 -04:00
Avi Weinstock
a5ff4be601 Make tornado (and empty models in general) work on WGPU. 2021-06-15 09:49:13 +02:00
Snowram
3df69ba11d Add troll variants and roc npcs 2021-06-15 09:49:13 +02:00
Marcel
c0fec35f7a Merge branch 'dungeon_voxel_export' into 'master' 
Add dungeon shape to MagicaVoxel export example

See merge request veloren/veloren!2412
 2021-06-14 15:07:25 +00:00
Marcel
f41bedc02c Merge branch 'juliancoffee/asset_entity' into 'master' 
EntityInfo assetization.

See merge request veloren/veloren!2382
 2021-06-14 12:56:28 +00:00
Vincent Junge
f724123694 Added dungeon shape to MagicaVoxel export example 2021-06-14 14:43:00 +02:00
Marcel Märtens
d291a71f79 Change the version number to 0.10 2021-06-12 10:14:07 +02:00