Commit Graph

247 Commits

Author SHA1 Message Date
anomaluridae
82f3c3c3e8 is_solid() detects both solid rock and sprites (e.g. mineable ore). when in build mode, would like to be able to still mine if user cursor is over a mineable ore. so need to properly cast the build ray to use opaque (not fillable) blocks to get the proper position, vs the mineable block which may be nearer 2021-09-17 10:34:20 -07:00
Monty Marz
1d94adc2e1 0.11 Background images and more 2021-09-10 08:34:01 +00:00
Joshua Barretto
1b0cb40d94 Made ore streams mineable 2021-09-01 12:05:00 +01:00
Joshua Barretto
0b1a820762 Make arrows 'bonk' hanging sprites 2021-08-31 13:31:27 +01:00
Monty Marz
13c15b3840 fix witch hut smoke 2021-08-30 12:03:13 +02:00
Joshua Barretto
0011e75526 More tree variety 2021-08-29 18:38:34 +01:00
Joshua Barretto
87f4efd65b Added spot loot 2021-08-29 12:50:35 +01:00
Monty Marz
771a380e6c witch stuff 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
06d85b8b10 Added index customisation for world structure models 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
Imbris
1fd25c22dd Merge branch 'juliancoffee/explode_vines' into 'master'
Make Fireballs explode EnsnaringVines

See merge request veloren/veloren!2758
2021-08-14 19:09:05 +00:00
Joshua Barretto
738e59965f Added experimental terrain persistence 2021-08-12 10:26:20 +01:00
juliancoffee
86b9e2d8e6 Make Fireballs explode EnsnaringVines 2021-08-12 01:25:55 +03:00
James Melkonian
54eb97b9de Reduce number of map layers and remove unneeded alpha channel 2021-07-24 19:54:40 -07:00
Joshua Barretto
37077b5703 Merge branch 'Resolve-unused-clippy-supressions' into 'master'
Resolve unused clippy supressions

See merge request veloren/veloren!2673
2021-07-24 20:44:06 +00:00
Dr. Dystopia
f039321cd7 Resolve unused '#[allow(clippy::redundant_pattern_matching)]' error supressions 2021-07-24 20:19:16 +02:00
Avi Weinstock
5dd56b724c Rename find_space_opt to try_find_space. 2021-07-24 13:09:10 -04:00
Avi Weinstock
ca10d89068 Further improve handling of underground waypoints:
- Set the waypoint to the valid position after chunk load, so that respawns work.
- Search for the nearest valid surface before falling back to the top of the chunk, so that waypoints inside caves/buildings work.
2021-07-22 23:03:52 -04:00
Jonathan Berglin
b15f426ee5 Resolve all approved error supressions 2021-07-18 17:11:46 +00: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
Jonathan Berglin
b88c23e74f Resolve all '#[allow(clippy::if_same_then_else)]' error supressions 2021-07-15 21:07:55 +00:00
Avi Weinstock
836f10ae63 Remove allocation in SpriteKind::collectible_id. 2021-07-03 15:32:36 -04:00
Avi Weinstock
b4c2bc14df Deduplicate data involved in sprite harvesting, making it harder to make mistakes with. 2021-07-02 15:23:19 -04:00
Daan Vanoverloop
0076b8379c Fixing #1169 - use strum macros for BlockKind conversion 2021-06-26 17:52:32 +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
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
Sam
ed503236d6 Slightly functional sprite summon. 2021-06-23 22:38:16 -05:00
Avi Weinstock
c6bb61f2e6 Add Primitive::Prefab and Fill::Prefab for coloring dungeon entrances. 2021-06-23 23:22:14 -04: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
juliancoffee
288a7a020b Proof of concept non-explodable sprites 2021-06-18 13:10:27 +03:00
Monty
c17e3ad996 Cactus Colada
Made cacti lootable
Cactus colada recipe and item
price balance
fmt

 "make it 8 and drop it to 20 or 25? Not really sure tbh"
2021-06-13 13:52:56 +02:00
jshipsey
4deeb42155 cave adjustments 2021-06-07 11:02:34 +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
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
jshipsey
754b60d810 crafting stations 2021-06-07 10:59:35 +02:00
Imbris
48ebb10d50 Update toolchain 2021-05-31 20:44:57 -04:00
Avi Weinstock
3684cf0454 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
juliancoffee
940655dcb6 Adding different chests for each dungeon 2021-05-24 23:00:44 +03:00
Joshua Yanovski
3869cdf1d2 Don't remesh chunk vertex data on sprite update.
This results in an extremely visually noticeable improvement in latency
when adding or removing sprite data and makes the game feel more
responsive.

This happens, for instance, when picking up a sprite like an apple or
flower from the environment.  We check to make sure that for items
with lighting (like Velorite) or changes that otherwise affect meshing
(like changing from fluid to nonfluid) this doesn't trigger.
2021-05-11 12:58:15 -07:00
juliancoffee
735e8ab4ec Extract common/src/assets.rs to own crate
This gives us ability to use assets-related code in i18n without
depending on whole veloren-common
2021-05-09 13:12:26 +03:00
DaforLynx
2e0272ce28 Town music 2021-04-28 05:07:59 +00:00
Joshua Barretto
68004bc39c Made cooking pots glow 2021-04-20 15:39:46 +01:00
Monty
86445af09c change cauldron spawning
cooking pot height
fmt
fmt, changelog
2021-04-20 02:48:13 +02:00
Monty
a4d56e7843 more sprite stuff and crafting UI update
fix item images
fix CR display
2021-04-20 02:46:06 +02:00
Monty
a1fe7c12c3 fmt, add sprites 2021-04-20 02:46:04 +02:00