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
10,034 Commits 151 Branches 18 Tags 2.1 GiB
df1aab877b
Commit Graph

1125 Commits

Author SHA1 Message Date
Monty Marz
ae6d1b7924 fixes 2021-08-28 14:53:30 +01:00
Monty Marz
b085b02ff9 fixes 2021-08-28 14:53:30 +01:00
Joshua Barretto
287e4d91bc Better entity placement for spots 2021-08-28 14:53:30 +01:00
Joshua Barretto
b32dcd5203 Fixed missing sprites 2021-08-28 14:53:30 +01:00
Monty Marz
771a380e6c witch stuff 2021-08-28 14:53:30 +01:00
Joshua Barretto
328fc190d1 Reduced leaf noise for spots 2021-08-28 14:53:30 +01:00
Monty Marz
df0ab43bb8 taiga and savannah definitions 2021-08-28 14:53:30 +01:00
Joshua Barretto
cb0f10b754 Removed quirky tree-like structures 2021-08-28 14:53:30 +01:00
Monty Marz
a22c0ab48f lion rock 
fixes
 2021-08-28 14:53:30 +01:00
Joshua Barretto
4b244ac1ba Prevented trees spawning near spots 2021-08-28 14:53:30 +01:00
Monty Marz
936600a08a Update spot.rs 2021-08-28 14:53:30 +01:00
Monty Marz
c22eb19f55 More spots 2021-08-28 14:53:30 +01:00
Joshua Barretto
5091d45c01 Added random units for spots 2021-08-28 14:53:30 +01:00
Monty Marz
14ff95409f more spawning rules 
Update spot.rs
 2021-08-28 14:53:30 +01:00
Joshua Barretto
95dce5a1ac Prevented spots spawning on sites 2021-08-28 14:53:30 +01:00
Joshua Barretto
06d85b8b10 Added index customisation for world structure models 2021-08-28 14:53:30 +01:00
Gemu Peachems
b0a067fc8d Gnarling Totem 2021-08-28 14:53:30 +01:00
Joshua Barretto
62f95c4a0f No spots in sites 2021-08-28 14:53:30 +01:00
Monty Marz
1278020c88 dwarf grave 2021-08-28 14:53:30 +01:00
Joshua Barretto
00c44be2da Added SpotConfig for easier spot creation 2021-08-28 14:53:30 +01:00
Joshua Barretto
76ba3496a1 sync 2021-08-28 14:53:30 +01:00
Joshua Barretto
4064872b9a Better spot altitude 2021-08-28 14:53:30 +01:00
Joshua Barretto
8b8adcc1b8 More block particles, changes ore vein colour 2021-08-28 14:53:30 +01:00
Joshua Barretto
bbcd842208 Test spot entity spawning 2021-08-28 14:53:30 +01:00
Joshua Barretto
3025f043d3 Initial spot implementation 2021-08-28 14:53:30 +01:00
juliancoffee
771df2f0f1 Don't chose room kinds with dynamic_rng 2021-08-09 18:19:35 +03:00
juliancoffee
fadf53a6ba Nerf pillars 
* make platforms one block high
 2021-08-05 21:07:45 +03:00
Avi Weinstock
60a5373b04 Avoid duplicate work across chunks when blitting site2 primitives. 2021-07-27 19:12:51 -04:00
Imbris
1a081cdc5b Merge branch 'james/map-ui' into 'master' 
Reduce number of map layers and remove unneeded alpha channel

See merge request veloren/veloren!2676
 2021-07-25 17:24:50 +00:00
Avi Weinstock
edad38098f Revert "Resolve all '#[allow(clippy::excessive_precision)]' error supressions" 
This reverts commit 0247ae2bf6.
 2021-07-25 12:29:21 -04:00
Avi Weinstock
516ad1c772 Revert "Resolve all '#[allow(clippy::identity_op)]' error supressions" 
This reverts commit 63eff216f0.
 2021-07-25 12:28:25 -04:00
Jonathan Berglin
cd2992afd3 Tygyh/resolve clippy error supressions 2021-07-25 15:35:14 +00:00
James Melkonian
54eb97b9de Reduce number of map layers and remove unneeded alpha channel 2021-07-24 19:54:40 -07:00
Dr. Dystopia
72058ef32e Resolve unused '#[allow(clippy::eval_order_dependence)]' error supressions 2021-07-24 20:24:57 +02:00
Jonathan Berglin
b15f426ee5 Resolve all approved error supressions 2021-07-18 17:11:46 +00:00
Samuel Keiffer
37147e2a83 Merge branch 'juliancoffee/overworld_assetization' into 'master' 
Wildlife assetization

See merge request veloren/veloren!2591
 2021-07-18 13:43:32 +00:00
Imbris
251c201604 Merge branch 'revert-eb08b6a1' into 'master' 
Revert "Resolve all '#[allow(clippy::approx_constant)]' error supressions" and re-address the lint using just the PI constant

See merge request veloren/veloren!2639
 2021-07-18 08:00:43 +00:00
Marcel
ecdd95ee49 Merge branch 'tygyh/Resolve-all-'#-allow(clippy--logic_bug)]'-error-supressions' into 'master' 
Resolve all '#[allow(clippy::logic_bug)]' error supressions

See merge request veloren/veloren!2624
 2021-07-17 23:46:28 +00:00
Imbris
9c72333741 Revert "Merge branch..." 
This reverts merge request !2608
 2021-07-17 22:04:59 +00:00
Marcel
aac3a3a5f7 Merge branch 'tygyh/Resolve-all-'#-allow(clippy--print_literal)]'-error-supressions' into 'master' 
Resolve all '#[allow(clippy::print_literal)]' error supressions

See merge request veloren/veloren!2627
 2021-07-17 20:29:35 +00:00
Imbris
d44702ef20 Merge branch 'tygyh/Resolve-all-'#-allow(clippy--clone_on_copy)]'-error-supressions' into 'master' 
Resolve all '#[allow(clippy::clone_on_copy)]' error supressions

See merge request veloren/veloren!2623
 2021-07-17 20:00:29 +00:00
Dr. Dystopia
353c4411c7 Resolve all '#[allow(clippy::print_literal)]' error supressions 2021-07-17 17:32:00 +02:00
Dr. Dystopia
52b4192dbd Resolve all '#[allow(clippy::logic_bug)]' error supressions 2021-07-17 17:27:44 +02:00
Dr. Dystopia
beed7b81f9 Resolve all '#[allow(clippy::clone_on_copy)]' error supressions 2021-07-17 17:26:23 +02:00
Dr. Dystopia
a98edaace9 Resolve all '#[allow(clippy::useless_conversion)]' error supressions 2021-07-17 16:55:11 +02:00
juliancoffee
ccaacdd166 Better naming & comments 2021-07-17 15:37:31 +03:00
juliancoffee
c999720dbf adress review 2021-07-17 15:37:31 +03:00
juliancoffee
fa34739ed6 clippy 2021-07-17 15:37:31 +03:00
juliancoffee
80f61e34a5 Move spawn_manifest to Index 2021-07-17 15:37:31 +03:00
juliancoffee
23a020f602 Add Automatic NameKind to EntityConfig 
+ add animal entities for wildlife spawns
 2021-07-17 15:37:31 +03:00
juliancoffee
6403ee0634 Merge None-loot in EntityConfig to LootKind 2021-07-17 15:37:31 +03:00
juliancoffee
7401d74aa6 Add wildlife assetization support 
+ add asset tests
+ migrate tundra animals
+ migrate taiga animals
+ declare temperate zone (animals yet to be created)
+ declare jungle zone (animals yet to be created)
+ declare tropical zone (animals yet to be created)
+ declare desert zone (animals yet to be created)
+ declare water (river inhabitants) zones (animals yet to be created)
 2021-07-17 15:37:30 +03:00
juliancoffee
d920f911a2 Add Exact body field for EntityConfig 
Add Alignment field to EntityConfig

+ Migrate to specifying alignment and body in entity assets
+ Make Body required field (with Uninit if you want to specify it later)
 2021-07-17 15:37:30 +03:00
Imbris
eb999b2821 Merge branch 'aweinstock/fix-waypoint' into 'master' 
Spawn players aboveground when using `/site` or when their waypoint is underground.

See merge request veloren/veloren!2612
 2021-07-16 23:18:33 +00:00
Avi Weinstock
c417e8c5b9 Defer repositioning until after chunks are generated normally, to reduce latency and avoid duplicate work. 2021-07-16 15:42:50 -04:00
Marcel
423b87316e Merge branch 'xMAC94x/experiment_ci' into 'master' 
fix/cleanup ci

See merge request veloren/veloren!2595
 2021-07-16 00:33:35 +00:00
Avi Weinstock
7555be0e25 Spawn players aboveground when using /site or when their waypoint is underground. 2021-07-15 17:54:29 -04:00
Jonathan Berglin
b88c23e74f Resolve all '#[allow(clippy::if_same_then_else)]' error supressions 2021-07-15 21:07:55 +00:00
Jonathan Berglin
c1c331d59e Resolve all '#[allow(clippy::approx_constant)]' error supressions 2021-07-15 16:56:55 +00:00
Marcel
ad2cf88e33 Merge branch 'tygyh/Resolve-all-'#-allow(clippy--int_plus_one)]'-error-supressions' into 'master' 
Resolve all '#[allow(clippy::int_plus_one)]' error supressions

See merge request veloren/veloren!2606
 2021-07-15 13:35:28 +00:00
Dr. Dystopia
5cc2fc8182 Resolve all '#[allow(clippy::or_fun_call))]' error supressions 2021-07-15 13:49:59 +02:00
Dr. Dystopia
d10cb2f161 Resolve all '#[allow(clippy::int_plus_one)]' error supressions 2021-07-15 12:47:57 +02:00
Marcel Märtens
07c044f2e5 extract relevant code in a script in order to remove duplicate coding with docker-ci repo 
export VELOREN_ASSETS without pwd to keep caching working
 2021-07-14 20:57:08 +02:00
Marcel Märtens
9a2c2b300a alternative to packaged_simd, as coverage does not compile withit, and it was left out in the simd feature 2021-07-14 14:53:27 +02:00
Marcel Märtens
468cfe84e7 clippy fixes in tests 2021-07-12 13:35:26 +02:00
Marcel Märtens
9b3b21f368 fix clippy warnings 2021-07-12 12:09:09 +02:00
Marcel Märtens
98800c5424 update depednencies 2021-07-08 12:21:02 +02:00
Snowram
5dfef5a563 Spawn dungeon entrances depending on the Site origin biome 2021-07-07 00:35:50 +02:00
juliancoffee
2c714dadad (fix) spawn HaniwaSentry in T3 2021-07-05 18:49:25 +03:00
juliancoffee
1ed9d8d455 (fix) Use backpack item for merchant's ingredients 2021-07-05 18:49:25 +03:00
juliancoffee
dd2d0a98fb 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
c751ec1381 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
f9c263faf6 Add benchmark for color quantization using the rtree crate. 2021-07-01 13:41:37 -04:00
juliancoffee
f2f50c88dc Split room enemy generation to separate functions 2021-06-30 03:52:51 +03:00
juliancoffee
7ff62275bf 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
63a9ceda29 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
47b3b5e5d9 Generate palette info from block statistics, and benchmark how well it compresses. 2021-06-28 22:11:19 -04:00
Avi Weinstock
3f3f8a40c5 Use SQL transactions in world_block_statistics to try to speed it up. 2021-06-28 15:50:58 -04:00
Avi Weinstock
024b6c52ef Add block statistics generator to world/examples. 2021-06-28 15:02:57 -04:00
Avi Weinstock
957ba5d218 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
1cba7db9b6 Update assets_manager to 0.5 2021-06-26 12:05:40 +02:00
Joshua Barretto
768e1c0d31 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
0ac6305dfc Rename difficulty to dungeon_difficulty. 2021-06-25 18:18:27 -04:00
Avi Weinstock
524dd02f45 Tweaks to dungeon pillars. 2021-06-25 15:54:42 -04:00
Avi Weinstock
7328b71243 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
6af988b806 Fix tests and examples to point to site2 dungeons. 2021-06-24 23:21:49 -04:00
Avi Weinstock
19979413d5 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
ef6d6563ea Ajust new npcs from feedback 2021-06-25 03:26:32 +02:00
Snowram
8760b69345 Husk brute animations 2021-06-24 19:31:19 +02:00
Snowram
fef0f407d3 Removes warlord and warlock armours 2021-06-24 19:30:11 +02:00
Avi Weinstock
033dbbf02a Add pillars and wall sconces to site2 dungeons. 2021-06-23 23:22:14 -04:00
Avi Weinstock
c68d79315e 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
c8383aba38 Traverse the dungeon tile structure to create the rooms, and align the stairs. 2021-06-23 23:22:14 -04:00
Avi Weinstock
c6bb61f2e6 Add Primitive::Prefab and Fill::Prefab for coloring dungeon entrances. 2021-06-23 23:22:14 -04:00
Avi Weinstock
95214649db Get structures loading via sampling primitive. 2021-06-23 23:22:14 -04:00
Avi Weinstock
df4f536523 Progress on converting dungeons to site2. Adds Sampling and Translate primitives. 2021-06-23 23:22:14 -04:00
Dominik Broński
8356e2ffca Merge branch 'aweinstock/lava' into 'master' 
Lava

See merge request veloren/veloren!2482
 2021-06-21 20:49:44 +00:00
Marcel
b0574b4ddc 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
b046541b69 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
79d7e79776 Accelerate econsim using arrays instead of hashmaps 2021-06-20 16:00:37 +00:00