Imbris
58b41bb2bb
Merge branch 'debug' into 'master'
...
Use debug_map to implement Debug
See merge request veloren/veloren!3048
2022-01-02 21:02:26 +00:00
Imbris
972c8ba41d
Add wildlife density modifier to features.ron
2021-12-25 19:24:09 -05:00
Imbris
bf48bd5346
update toolchain to nightly-2021-12-19
2021-12-23 13:04:24 +01:00
Christof Petig
453c4c149e
fix more examples and satisfy code quality checks
2021-12-20 18:09:34 +00:00
Christof Petig
2dd63a333e
fix economy test [ci skip]
2021-12-20 18:06:58 +00: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
3edc7b5846
make house decorations correctly depend on Calendar
2021-12-20 18:06:58 +00:00
Christof Petig
8a85d6e6e0
cargo fmt, pass calendar down into building creation
2021-12-20 18:06:58 +00:00
Christof Petig
42ba9212ea
move Calendar object into WorldSim
...
(needed for Christmas decoration in towns)
2021-12-20 18:06:58 +00:00
Christof Petig
be1a9050a4
make Christmas decoration unconditional for now
2021-12-20 18:06:57 +00:00
Joshua Barretto
3b4fa6b328
Snow for ice
2021-12-20 18:06:53 +00:00
Joshua Barretto
6e97e3179d
Slippery ice
2021-12-20 18:03:52 +00:00
UncomfySilence
d6d55764c4
+ Created common.loot_tables.calendar.<seasonal_event> directory for special item drop changes or for potential bosses.
...
+ Created common.entity.calendar.<seasonal_event> directory for special entities that spawn exclusively during season event.
+ Added lines to world/src/layer/wildlife.rs for the current events underneath nonevent basis.
+ Attempted organization go brrrrrr
2021-12-20 18:03:52 +00:00
Joshua Barretto
a2ca95af3d
Ice cliffs
2021-12-20 18:03:52 +00:00
Joshua Barretto
a2a3a20aad
Added ice to cold water
2021-12-20 18:03:52 +00:00
Joshua Barretto
78f76dde83
Added baubles to trees
2021-12-20 18:03:52 +00:00
Joshua Barretto
3ddacb96ab
Added christmas snow
2021-12-20 18:03:52 +00:00
Joshua Barretto
e3203080ed
Added Calendar for temporal events based on the real-world calendar
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
notoria
81f28bc3cc
Use debug_map to implement Debug
2021-12-12 21:46:06 +01:00
Jonathan Berglin
596307c9b7
Remove unused clippy suppressions
2021-12-05 17:59:02 +00:00
Dr. Dystopia
c002e5e749
Resolve all '#[allow(clippy::eval_order_dependence)]' error supressions
2021-12-03 19:44:41 +01:00
Dr. Dystopia
5d1d510d54
Resolve all '#[allow(clippy::redundant_static_lifetimes)]' error supressions
2021-12-03 10:43:09 +01:00
Jonathan Berglin
d9dd49552b
Tygyh/resolve all '# allow(clippy needless update)]' error supressions
2021-11-29 09:32:55 +00:00
Imbris
7760210824
Remove redundant closures
2021-11-28 12:24:57 -05:00
Treeco
3a998ca5b9
Merge branch 'isse/primitive-fixes' into 'master'
...
Primitive fixes
See merge request veloren/veloren!3016
2021-11-27 19:02:12 +00:00
Marcel
724e3bcdfd
Merge branch 'capucho/tracing-bump' into 'master'
...
Bump tracing-subscriber to 0.3.2
See merge request veloren/veloren!3032
2021-11-27 11:11:47 +00:00
João Capucho
8b89903d57
Bump tracing-subscriber to 0.3.2
...
We were pulling two versions of it. Causing some compilation errors
2021-11-26 17:41:51 +00:00
Marcel Märtens
ef40ebe0c8
update toolchain to nightly-2021-11-24
2021-11-24 10:09:22 +01:00
Marcel Märtens
aa93b4b53c
update other binaries
2021-11-20 20:19:48 +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
IsseW
7eaddcafad
Ok just call it without
2021-11-20 13:13:21 +01:00
Treeco
3018942291
Merge branch 'juliancoffee/resizeable_map' into 'master'
...
Add size parameter to map_file opts
See merge request veloren/veloren!2975
2021-11-19 22:50:24 +00:00
IsseW
88840fe58d
Change "and_not" and "diff" to "subtract"
2021-11-19 23:38:33 +01:00
IsseW
4b6f3ddeea
Intersect instad of union in pyramid
2021-11-17 14:32:07 +01:00
IsseW
07da6a9271
Rename 'and' to 'intersect' and 'or' to 'union'
2021-11-17 14:11:20 +01:00
Joshua Barretto
db741fe4c0
Added waypoints to towns
2021-11-13 17:13:09 +00:00
DemonicOnPc
b7ac542ebb
fixes to branch after my whoops
2021-11-08 17:09:19 -05:00
DemonicOnPc
a9cedee277
Update scatter.rs
2021-11-08 17:09:17 -05: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
Joshua Barretto
6b4abddc4e
Added floating scatter
2021-11-08 17:04:45 -05:00
Joshua Barretto
de087ae992
Added site2 worldgen feature
2021-11-01 22:53:38 +00:00
Joshua Barretto
16889b2b3e
Fixed house supports
2021-11-01 22:19:49 +00:00
Joshua Barretto
0cb88139c9
Made merchants work in new sites
2021-11-01 22:19:49 +00:00
Joshua Barretto
4b8bf94320
Used correct entity configs
2021-11-01 22:19:49 +00:00
Joshua Barretto
4acffb9cfb
New CSG API for site2
2021-11-01 22:19:49 +00:00
Joshua Barretto
e3ab8fc8ce
Added rtsim merchants to site2
2021-11-01 22:19:49 +00:00
Joshua Barretto
bacb2aa504
Better town layout
2021-11-01 22:19:49 +00:00
Joshua Barretto
4a9581b54d
Fixed house entrances
2021-11-01 22:19:49 +00:00
