Marcel
9396fa9741
Merge branch 'Thegaming_Life/replacing_all_map2_with_RECT_SIZE_with_cpos_to_wpos_and_wpos_to_cpos' into 'master'
...
replaced CHUNK_SIZE by RECT_SIZE everywhere, and change the use (and remove...
See merge request veloren/veloren!3807
2023-03-06 21:03:35 +00:00
Thegaming Life
5ddc55be52
replaced CHUNK_SIZE by RECT_SIZE everywhere, and change the use (and remove...
2023-03-06 21:03:35 +00:00
Monty Marz
9a025cfcc8
More spot features
2023-03-03 23:21:37 +00:00
Thegaming Life
acbb7ccba9
Changed the chunk size to constant
2023-02-28 10:00:53 +00:00
flo
bf81ffc029
frost_gigas
2023-02-15 00:10:37 +00:00
Isse
4fdcbeeb71
Update dot_vox dependency
2023-01-22 18:00:39 +01:00
Benoît du Garreau
4fbb0b9a0b
Update to `assets_manager 0.9
2022-12-14 00:54:34 +01:00
Marcel Märtens
dad73ba2a3
fix clamp clippy errors
2022-11-28 14:26:27 +01:00
Marcel Märtens
0ab7a2543e
fix clippy errors
2022-11-28 14:08:11 +01:00
Avi Weinstock
08a50afd9f
Mostly working train tracks.
2022-10-28 21:36:42 -04:00
flo
698a00bae3
savannah_pit
2022-10-22 19:48:50 +00:00
Joshua Barretto
3c54e63592
Various minor optimisations
2022-10-12 13:57:14 +01:00
Marcel
17c940e0f8
Merge branch 'xMAC94x/update_toolchain' into 'master'
...
update toolchain to `2022-09-23`
See merge request veloren/veloren!3615
2022-09-25 19:44:58 +00:00
Marcel Märtens
1e1ee5031f
remove enum_iterator with strum, fixes #1723
2022-09-25 16:09:46 +02:00
Marcel Märtens
cf6a764aa4
update toolchain to 2022-09-23
2022-09-25 15:58:32 +02:00
Marcel Märtens
29d0f5b25d
update dependencies
2022-09-22 11:57:55 +02:00
Joshua Yanovski
e9a463d459
Revert "Merge branch 'xMAC94x/update-deps' into 'master'"
...
This reverts merge request !3608
2022-09-15 18:51:48 +00:00
Joshua Yanovski
2c15d0af56
Reduce overhead of messaging systems.
2022-09-14 21:04:53 -07:00
Joshua Yanovski
986d104faa
Update Rust toolchain.
2022-09-08 15:43:53 -07:00
Marcel Märtens
d9e6f10688
update dependencies
2022-09-08 23:29:08 +02:00
flo
e882e62c08
seachapel
2022-08-24 21:50:53 +00:00
DaforLynx
daadf3abdb
Gnarling Fort music; more specific sites; fix music spacing; new sfx
2022-08-14 01:57:58 +00:00
tygyh
120ee6b6c0
Fix typos
2022-07-15 18:59:37 +02:00
Christof Petig
59d876a654
pass humidity to meta, move smoke cycle to separate file
2022-06-01 22:13:34 +02:00
Maxwell
14d5b2e579
added all other types of chest sprites to check for non-explodable objects
2022-05-30 22:41:57 -05:00
Maxwell
a8892bab53
updated explode_power function to make chests non-explodable
2022-05-30 22:40:59 -05:00
Benoît du Garreau
8488c7b25e
Upgrade assets_manager to 0.8.0 and image to 0.24
...
This removes a significant number of duplicated dependencies
2022-05-28 23:18:31 +02:00
Sam
afd2c8730f
Addressed most review comments (no assets).
2022-05-16 15:11:32 -04:00
Sam
c01fe655f1
Added wood
2022-05-16 15:10:55 -04:00
Marcel Märtens
64b9602760
update further dependencies, including strum and get rid of old strum_macro
2022-04-04 16:06:47 +02:00
flo
3d24b1d635
CliffTowns
2022-03-29 12:52:08 +00:00
DaforLynx
7b6f424bb0
Loud rivers
2022-03-13 07:47:23 +00:00
jshipsey
786ae39fb4
new entities
2022-02-09 20:10:59 -05:00
Avi Weinstock
5f8957d8ef
Globally allow the clippy lints {new_without_default, many_single_char_names, identity_op, type_complexity, too_many_arguments}.
2022-01-30 20:16:20 +01:00
Joshua Barretto
69436db64c
Added wall lamps
2022-01-28 13:58:41 +00:00
Joshua Barretto
bdb0fc9c16
Merge branch 'zesterer/underwater' into 'master'
...
Underwater shaders
See merge request veloren/veloren!3127
2022-01-23 20:36:47 +00:00
Joshua Barretto
3b347a2aa3
Improved underwater lighting on low shader settings
2022-01-21 13:35:40 +00:00
Joshua Barretto
4f181c936d
Merge branch 'name_areas_based_on_biome' into 'master'
...
name_areas_based_on_biome
See merge request veloren/veloren!3115
2022-01-20 19:50:57 +00:00
Snowram
02ed6ffd60
More arthropod work
2022-01-19 19:01:13 +01:00
Snowram
ae71f2e4f0
Adds poisoned debuff (energy change over time)
2022-01-19 19:01:13 +01:00
floppy
51356d5fad
in terrain.mod.rs, return name as Option in fn name
2022-01-18 19:53:20 +01:00
floppy
ceb3507e50
-remove line breaks from biome names
...
-disable Wilderness world message in unspecified mini-biomes
-remove duplicate name in Grasslands name pattern
2022-01-18 11:27:55 +01:00
Joshua Barretto
043016a433
Don't try to mount unmountable entities, clippy fixes and fmt
2022-01-16 17:53:14 +00:00
Joshua Barretto
b3e2d825ed
Overhauled mounting to make it more reliable
2022-01-16 17:53:13 +00:00
Imbris
bf48bd5346
update toolchain to nightly-2021-12-19
2021-12-23 13:04:24 +01:00
Christof Petig
cbd2a422f3
Add Chrismas wreath (25% chance) and make the towns go wild with illumination
2021-12-20 18:06:58 +00:00
Christof Petig
201101c059
Add glowing christmas ornaments
2021-12-20 18:06:57 +00:00
Joshua Barretto
17e7879777
Added surface traction factor
2021-12-20 18:03:52 +00:00
Joshua Barretto
6e97e3179d
Slippery ice
2021-12-20 18:03:52 +00:00
Joshua Barretto
a2a3a20aad
Added ice to cold water
2021-12-20 18:03:52 +00:00
Benoît du Garreau
aca088388b
Update assets_manager to 0.7
2021-12-12 22:11:47 +01:00
Jonathan Berglin
596307c9b7
Remove unused clippy suppressions
2021-12-05 17:59:02 +00:00
Marcel Märtens
ef40ebe0c8
update toolchain to nightly-2021-11-24
2021-11-24 10:09:22 +01:00
Marcel Märtens
e29ede7c97
updating dependencies,
...
cannot update the following dependencies:
- vek: Sharps SIMD isnt upstream
- tracing-subscriber: MakeWriter was adjusted and i was to lazy to fiddle with lifetimes,
- refinery, rustsql: we have a custom refinery version which is incompatible with newer rustsql
- equi + egui_winit + egui_wgpu_backend: i tried it in this commit but it turned out that they dependo n wgpu which we cant update
- wgpu: cant update due new version doesnt support DX11
Got quinn updated which now require some dependencies to be explicit.
2021-11-20 20:17:49 +01:00
Joshua Barretto
edf9c59e7d
Added bomb sprites
2021-11-13 17:12:16 +00:00
DemonicOnPc
7fc57c027b
Fixes to jungle sprites and lillypads
2021-11-08 17:09:15 -05:00
DemonicOnPc
9514cd71c6
Jungle and River update
...
-Added Lillypads to rivers
-Added new types of reeds
-Added reeds to water
-Added more Ferns/Flowers/Plants to jungles
2021-11-08 17:09:11 -05:00
Monty Marz
727295aec1
text and alignment WIP
2021-10-27 17:02:35 -04:00
Monty Marz
7aae35f286
bench
2021-10-27 17:02:31 -04:00
Joshua Barretto
3357008601
Merge branch 'zesterer/small-fixes' into 'master'
...
Caverns
See merge request veloren/veloren!2763
2021-10-16 09:33:57 +00:00
Joshua Barretto
086097cd56
Better vines and lighting
2021-10-10 13:41:57 +01:00
Joshua Barretto
353ccc5bce
Added new cavern sprites to caverns
2021-10-10 13:41:57 +01:00
Monty Marz
14ed73ec12
cavern sprites
2021-10-10 13:41:56 +01:00
Joshua Barretto
bfc55d7b17
More cavern details
2021-10-10 13:41:56 +01:00
Joshua Barretto
5c0026f4a7
Performance improvements for terrain watcher
2021-10-10 13:41:56 +01:00
Joshua Barretto
1cfad833c7
Added caverns, fixed chunk load performance issue
2021-10-10 13:41:56 +01:00
Imbris
11c8cf19d1
Switch to for loops in default for_each_in (small perf increase), add inline to sprite methods (no perf change)
2021-10-10 02:42:07 -04:00
Imbris
5777486f5c
Remove custom for_each_in from Chonk
2021-10-10 02:42:07 -04:00
Imbris
3a4c45f045
Try marking Chonk::for_each_in and related functions as inlineable
2021-10-10 02:42:07 -04:00
Imbris
7f6ba90f59
simplify water/walls check code, interally iterate in chonks (but not
...
chunks)
2021-10-10 02:42:06 -04:00
Imbris
59bd5b4acd
Initial iterator optimization by using internal iteration at the vol_grid level, water/walls not switched over yet
2021-10-10 02:42:06 -04:00
Treeco
dafa1327d0
Added mottled bark to birch
2021-10-06 02:26:43 +01:00
Joshua Barretto
c6d3137612
Fixed sail boat thrust, removed dead water code, added comments
2021-10-05 00:02:03 +01:00
Joshua Barretto
e8021fab2c
Cleaned up shrub implementation
2021-10-05 00:02:03 +01:00
Joshua Barretto
3b66af468a
Improved river and lake banks
2021-10-05 00:02:03 +01:00
Joshua Barretto
826aff2ea4
Better lake entrances and distance
2021-10-05 00:02:03 +01:00
Joshua Barretto
f118d15745
Fixed oceans
2021-10-05 00:02:03 +01:00
Joshua Barretto
87c7d6e982
Improved river/lake rendering
2021-10-05 00:02:03 +01:00
James Melkonian
42fdf0818d
Gable primitive and dungeon lava rooms
2021-09-17 15:45:26 -07:00
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
