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
11,175 Commits 151 Branches 18 Tags 2.1 GiB
40d5920ca2
Commit Graph

284 Commits

Author SHA1 Message Date
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
Dr. Dystopia
72058ef32e Resolve unused '#[allow(clippy::eval_order_dependence)]' error supressions 2021-07-24 20:24:57 +02: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
9c72333741 Revert "Merge branch..." 
This reverts merge request !2608
 2021-07-17 22:04:59 +00:00
juliancoffee
ccaacdd166 Better naming & comments 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
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
Snowram
5dfef5a563 Spawn dungeon entrances depending on the Site origin biome 2021-07-07 00:35:50 +02: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
Avi Weinstock
f1a1160b80 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
2226a4c6a9 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
jshipsey
a42e6e20b8 basilisk tweaks 2021-06-16 23:28:25 -04:00
jshipsey
0941f03608 buffs to stretch progression 2021-06-16 20:50:46 -04:00
Avi Weinstock
cb0566299a Make tornado (and empty models in general) work on WGPU. 2021-06-15 09:49:13 +02:00
Snowram
97ce50e5d4 Add troll variants and roc npcs 2021-06-15 09:49:13 +02:00
Joshua Barretto
358f9f268d Prevent creatures spawning in the ground 2021-06-11 07:09:58 +01:00
jshipsey
acf9111141 mig fix 2021-06-07 08:32:59 -04:00
jshipsey
4deeb42155 cave adjustments 2021-06-07 11:02:34 +02:00
jshipsey
1d23b7aebf finalize stats 
t
 2021-06-07 11:02:03 +02:00
jshipsey
9034d0f25d comment addressing, cave tweaks 2021-06-07 11:01:46 +02:00
jshipsey
7a573efab7 proper recipes, tanning racks, various fixes 2021-06-07 11:00:14 +02:00
jshipsey
8acd3832e3 more loot tables, overworld ores, more items 2021-06-07 11:00:00 +02:00
jshipsey
05de96c94b ore deposits, flower drops 2021-06-07 10:59:50 +02:00
jshipsey
1c17d8fe5e cave changes 2021-06-07 10:59:44 +02:00
Snowram
ab26efa970 Improves bird_large anims 2021-04-25 04:07:09 +02:00
Snowram
bd84677906 Day period dependant wildlife spawns 2021-04-25 02:14:51 +02:00
Snowram
fd177c9669 Breathe and stun anims 2021-04-25 02:14:50 +02:00
Snowram
eb98360183 Cockatrice bird_large conversion 2021-04-25 02:14:50 +02:00
Ludvig Böklin
1708b8b4cc Space wildlife group spawns apart to prevent spawnplosions 2021-04-22 08:50:20 +00:00
Joshua Barretto
bb9725548f Made twigs/stones slightly more common 2021-04-19 21:33:52 +01:00
Sam
27f178286d Removed all rng matches in code to determine loot tables, and moved to loot tables specific for each sprite, creature, or dungeon. 2021-04-02 23:24:55 -04:00
Snowram
606dd64741 Fix a staff icon, some offset fixes, lower wolf spawn rate 2021-03-30 00:27:03 +02:00
Snowram
e5afb2fcf7 Various visual fixes 2021-03-18 22:53:06 +01:00
Joshua Barretto
fadf5ee1ec Reduced frequency of bee hives 2021-03-17 21:43:08 +00:00
Snowram
60dd47cdea Theropod charge attack 2021-03-14 18:10:40 +01:00
Snowram
9d7e8957bb Add new npcs 2021-03-14 14:24:35 +01:00
Joshua Barretto
549f89f590 Addressed pine tree criticism by improving generation 2021-03-08 10:51:06 +00:00
Joshua Barretto
9910398917 Fixed snow biome trees 2021-03-07 14:25:07 +00:00
Joshua Barretto
911acdd9db Fixed clippy warnings and fmt 2021-03-07 14:25:07 +00:00
Joshua Barretto
db573f6b2d Turn giant trees into proper sites 2021-03-07 14:25:07 +00:00
Joshua Barretto
862cd5fe49 fmt 2021-03-07 14:25:03 +00:00
Joshua Barretto
02d86f0fb0 Switched to 6x6 tiles, more natural paths 2021-03-07 14:25:02 +00:00
Joshua Barretto
9875e2c025 Began work on CSG-based primitive tree site structure generation system 2021-03-07 14:25:02 +00:00
Joshua Barretto
e5b02ff7da Better water/cave/cliff interaction 2021-03-07 14:25:01 +00:00
Joshua Barretto
c7e82aea26 Began work integrating new sites into the world 2021-03-07 14:25:01 +00:00
Joshua Barretto
6af0e77efd Better stairs 2021-03-07 14:25:01 +00:00
Joshua Barretto
b07c942aef Added staircase to giant trees 2021-03-07 14:25:01 +00:00
Joshua Barretto
284d061068 Added staircases to giant trees 2021-03-07 14:25:01 +00:00
Joshua Barretto
0c302bb020 Lanterns in trees 2021-03-07 14:25:01 +00:00
Joshua Barretto
6fc7d2a906 Faster More interesting giant trees, better oaks, hives on branches 2021-03-07 14:25:01 +00:00
Joshua Barretto
185b1c3053 Specialised giant trees 2021-03-07 14:25:01 +00:00
Joshua Barretto
7d526da735 Experimental giant mother trees 2021-03-07 14:25:01 +00:00
Joshua Barretto
e30c625d81 More tree variety, denser forests 2021-03-07 14:25:01 +00:00
Joshua Barretto
68b0aa5c50 sync 2021-03-07 14:25:00 +00:00
Joshua Barretto
9cf13ac3b2 Simple coral 2021-03-07 14:25:00 +00:00
Joshua Barretto
3766a77de1 Better tree parameterisation, improved pines 2021-03-07 14:25:00 +00:00
Joshua Barretto
953d8841b4 Procedural pines (first attempt), more tree parameters 2021-03-07 14:25:00 +00:00
Joshua Barretto
24773afe76 Better parameterisation of trees 2021-03-07 14:25:00 +00:00
Joshua Barretto
5e7c231788 Switched to recursive tree generation and recursive culling algorithm for massive performance wins 2021-03-07 14:25:00 +00:00
Joshua Barretto
6f11c4c5c7 Added tree benchmarks 2021-03-07 14:25:00 +00:00
ccgauche
2f68a565d4 Fixed branch flattening 2021-03-07 14:25:00 +00:00
ccgauche
cf91358f40 Fixed canopy problem + Added iteration constant 2021-03-07 14:25:00 +00:00
ccgauche
0eaf8492a5 Removed unsafe from finvsqrt 2021-03-07 14:25:00 +00:00
ccgauche
454d9d0b75 Quite a lot of optimisations 2021-03-07 14:25:00 +00:00
ccgauche
37f9fba023 Simplified generation and fixed some tree cliping issues 2021-03-07 14:25:00 +00:00
ccgauche
bbc64b4ead New generation for trees 2021-03-07 14:25:00 +00:00
Joshua Barretto
9d1a03504c Fixed clipping issues, faster generation 2021-03-07 14:25:00 +00:00
ccgauche
7f3ba0eaca New generation for trees 2021-03-07 14:25:00 +00:00
Joshua Barretto
0745514174 Prevented trees from being too sparse 2021-03-07 14:25:00 +00:00
Joshua Barretto
4bcf9e7a63 More sparse, faster trees 2021-03-07 14:25:00 +00:00
Joshua Barretto
6dd0f73c2d Fixed clipping issues, faster generation 2021-03-07 14:25:00 +00:00
Joshua Barretto
82a25e49ef Began integrating procgen trees 2021-03-07 14:25:00 +00:00
Marcel Märtens
c681992367 Changelog: 
-Savanna grasses now only spawn in the savanna and no longer bleed into desert and temperate biomes
-Cacti now only spawn in the desert and density of large cacti has decreased
-Dead bushes are largely unchanged and still spawn in both the savanna and desert with some bleed into temperate biomes
 2021-03-03 15:06:34 +01:00
Snowram
1b9815dc34 Adds 3 new npcs, tusk ram new design 2021-02-27 01:42:46 -05:00
jshipsey
e4e25e20c9 rebase 2021-02-27 01:42:45 -05:00
unknown
559ece5ede More npcs work 2021-02-27 01:42:45 -05:00
unknown
6f18d16aa2 Add new quadmeds npcs with rough offsets 2021-02-27 01:42:44 -05:00
Sarra
fff194dfbf coral and kelp, cargo fmt 2021-02-25 23:47:38 -05:00
Sarra
02eb76416f tweaking coral models and seagrass spawns 2021-02-25 23:39:41 -05:00
Sarra
1d4b8d4d99 correcting formatting and removing commented out code that wasn't supposed to be there 2021-02-25 20:41:57 -05:00
Sarra
f39f5ab5d3 added coral reefs, kelp forests, and seagrass 2021-02-25 05:33:18 -05:00
jiminycrick
8b97199245 Update rand dependency 2021-01-26 20:35:08 -08:00
Joshua Barretto
58c69980b1 Merge branch 'synis/fix-cave-rng' into 'master' 
Fixes #935 - deterministic sprite placement in caves

Closes #935

See merge request veloren/veloren!1721
 2021-01-24 17:17:02 +00:00
Monty
7cbf946a65 6 new sceptres, add DPS display to tooltips 2021-01-23 23:10:36 +01:00
dryadee
f064033bb4 Fixes #935 - deterministic sprite placement in caves 2021-01-23 21:14:07 +01:00
Rotsuoy
994677a4d0 Rotsuoy/savanna grass 2021-01-23 07:46:54 +00:00
Ben Wallis
aef2637288 Refactored loadout to have public functions for each slot instead of requiring callers to use the _INDEX consts 2021-01-08 19:12:09 +00:00
Benoît du Garreau
7b4aa6d4cc cargo fmt 2020-12-17 12:06:22 +01:00
Benoît du Garreau
0cf164f33a Use assets_manager to load assets 2020-12-17 12:06:07 +01:00
jiminycrick
60d5d62eef Switched to hashbrown everywhere 2020-12-17 10:31:35 +01:00
Monty Marz
f2ba7cc297 add baobabs, fix map difficulty, make mushrooms lootable 2020-12-10 18:06:29 +01:00
Snowram
526d3bd035 Vacations are never over 2020-12-08 23:03:40 +01:00
Snowram
72d73ecd38 Initial fish work 2020-12-08 23:03:38 +01:00
Sam
33e4448542 Replaced every unnecssary powf in the entire codebase with either powi or sqrt. 2020-11-24 18:28:24 -06:00
jiminycrick
aad9734055 Agent tactic refactoring 
Lower theropods spawns

clippy, changelog

review response
 2020-11-24 17:49:00 -06:00
jshipsey
d10dd83e5f theropods in world, small tweaks 2020-11-24 17:48:51 -06:00
Joshua Barretto
26fd40c0e3 Fmt, make clippy happy 2020-11-23 15:39:03 +00:00
Joshua Barretto
deda202b5a Prevent wildlife spawning in towns 2020-11-23 10:58:22 +00:00
Joshua Barretto
55c6966ad9 Fewer trees near obstacles 2020-11-23 10:58:21 +00:00
Monty Marz
99b3a4465a WIP map zooming and dragging 2020-11-23 10:57:15 +00:00
Joshua Barretto
49df604de0 Better scattering and scatter (of both varieties) 2020-11-23 10:45:02 +00:00
Monty Marz
1864f4626c map icons 2020-11-23 10:45:01 +00:00
Joshua Barretto
25c50de347 Return of the cacti 2020-11-23 10:37:59 +00:00
Joshua Barretto
fc26305ac8 Increases maximum sprite dimensions (if you suspect an issue, check this commit) 2020-11-23 10:37:59 +00:00
Joshua Barretto
808d1873bd Began implementing rtsim 2020-11-23 10:37:59 +00:00
Monty Marz
8235e94aa4 Conversion to struct to please clippy 2020-11-21 15:42:43 +01:00
Snowram
a939eac30d Refines spawn values, add gradients to debug_column 2020-11-21 14:33:35 +01:00
Snowram
febe79e602 Added remaining creature spawns 2020-11-21 14:33:33 +01:00
Joshua Barretto
2ae51de7f0 Added more creature spawns 2020-11-21 14:33:32 +01:00
Joshua Barretto
97ec94fd3d Initial NPC region spawning work 2020-11-21 14:33:30 +01:00
Monty Marz
0e072f72cc frost cleaver 
velorite mage set

offsets
armor stats
 2020-11-10 21:43:45 +00:00
Joshua Barretto
bce6195479 Added birch forest 2020-11-09 22:59:41 +00:00
Joshua Barretto
b09148abee Updated changelog, removed old models 2020-11-09 17:19:29 +00:00
Joshua Barretto
962f0ec812 Better snow effects for non-trees 2020-11-09 17:09:33 +00:00
Joshua Barretto
71718d9c98 Better humidity, better snow trees 2020-11-09 15:06:37 +00:00
Joshua Barretto
3f02aa5134 Removed more redundant code, desert dunes, better bridges 2020-11-09 10:20:22 +00:00
Joshua Barretto
1036ce8c7e Abandon tree generation when outside bounds 2020-11-09 10:20:22 +00:00
Joshua Barretto
9b233708e2 Turned tree generation into a post-processing layer, ripped out old tree generator for performance wins 2020-11-09 10:20:22 +00:00
Joshua Barretto
647dcb2fec Switched path generation to canvas 2020-11-09 10:20:22 +00:00
Joshua Yanovski
5af5ceb1f9 Address review comments. 2020-09-27 17:06:46 +02:00
Joshua Yanovski
938039a56e Remove spurious uses of Vox. 
In the process, also try to address a few edge cases related to block
detection, such as adding back previously solid sprites and removing
filters that may be vestiges of earlier logic.
 2020-09-26 16:30:40 +02:00
Joshua Barretto
49d1b3df6d Improved docs 2020-09-20 11:46:12 +01:00
Joshua Barretto
ece4a01867 Improved representation of Block for better performance, more features, and better backwards-compatibility 2020-09-20 11:46:12 +01:00
jshipsey
cd6e1ad45f haul out the critter skele, add theropod 2020-09-17 22:32:10 -04:00
Joshua Barretto
0a29c6b6f4 Better grass density 2020-09-04 21:20:08 +01:00
Joshua Barretto
798e9d7cd7 Cheaper terrain sprites 2020-09-04 11:48:57 +01:00
Monty Marz
b24f5b5b24 adjustments to firefly density 2020-09-04 11:48:57 +01:00
Joshua Barretto
57ccf4863e Moved scatter to dedicated file 2020-09-04 11:48:57 +01:00
Monty Marz
c3ae56114a added fireflies to reed and flowers, readded sunflowers 2020-09-04 11:48:57 +01:00
Joshua Barretto
be3ceaf677 Overhauled terrain sprite spawning 2020-09-04 11:48:56 +01:00
Joshua Barretto
88add8456f Added fireflies, reeds near rivers 2020-09-04 11:48:56 +01:00
Joshua Yanovski
3a96b73b2c Move figure meshing to a background thread. 2020-08-28 05:25:31 +02:00
Joshua Barretto
bf7afcf5c9 Merge branch 'zesterer/small-fixes' into 'master' 
Better world colours, better projectiles, better aiming, many other small improvements

See merge request veloren/veloren!1332
 2020-08-25 15:59:05 +00:00
notoria
2be4202d01 Corrected some spelling errors 2020-08-25 12:21:25 +00:00