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
15,788 Commits 151 Branches 18 Tags 2.1 GiB
fc6b87d5ca
Commit Graph

1905 Commits

Author SHA1 Message Date
jshipsey
567b6535af airship dock 2023-10-11 22:37:17 -04:00
Marcel Märtens
8e95cb944d cargo fmt after updating new toolchain 2023-10-06 09:13:01 +02:00
Marcel Märtens
cb25a409d5 more clippy fixes in all binaries 2023-10-06 09:12:31 +02:00
Marcel Märtens
631f3ab8ee fix clippy issues, WITHOUT clippy::needless_pass_by_ref_mut as we are still unsure how to proceed with it. we want to keep the &mut ref where we are actually writing. maybe we need another method support 2023-10-05 23:23:27 +02:00
Marcel Märtens
882a8d104c Revert "extended clippy from quality.sh" 
This reverts commit 30ebb7f2edcf299e4886aa7de6573ef54353a8dd.
 2023-10-05 22:00:49 +02:00
Marcel Märtens
df03c92741 extended clippy from quality.sh 2023-10-05 22:00:49 +02:00
Marcel Märtens
394c8892bb update toolchain to nightly-2023-09-28 2023-10-05 22:00:48 +02:00
Maxicarlos08
7734b653e7
replace all uses of Arc<> with references 2023-10-02 16:52:41 +02:00
Maxicarlos08
9ababec625
fix UI issues & cleanup 2023-09-29 23:30:44 +02:00
Maxicarlos08
66f6b81575
singleplayer server initialization status 2023-09-29 23:30:14 +02:00
flo666
a470b016fb fix_desert_city_library_windowsill 2023-09-26 15:27:08 +02:00
Laura
f4d48d2689 New Arena building and visit site for NPCs 2023-09-26 12:29:14 +00:00
Imbris
cd98dd5245 Remove unused deps flagged by cargo-machete 2023-09-21 22:59:50 -04:00
Isse
b9c33df635 Merge branch 'isse/world-gen-ui' into 'master' 
Map selector and generation UI

See merge request veloren/veloren!3925
 2023-09-17 17:11:19 +00:00
Isse
f4ca60cbb6 Map selector and generation UI 2023-09-17 17:11:19 +00:00
Isse
478c37f6f1 Merge branch 'james/min-initial-civ-count' into 'master' 
Always generate at least one civilization

See merge request veloren/veloren!3927
 2023-09-17 16:57:06 +00:00
flo
78b2443edc Merge branch 'qsto/bosses_loot_overhaul' into 'master' 
Bosses loot overhaul

See merge request veloren/veloren!4072
 2023-08-30 12:08:52 +00:00
Marcel Märtens
b4216ec634 get rid of old criterion 2023-08-27 19:17:04 +02:00
Christof Petig
24773cb3f1 deduplicate location name code 2023-08-22 23:11:18 +02:00
Christof Petig
b20ff5144c determine location names when loading character list 2023-08-22 22:41:48 +02:00
Joshua Barretto
6fbca74e88 Merge branch 'maxicarlos08/dungeon-avoid-cave' into 'master' 
Cheesing fixes to old-style dungeons

See merge request veloren/veloren!4014
 2023-08-19 11:12:01 +00:00
Maxicarlos08
e5e26149ed
review 2023-08-17 11:16:20 +02:00
flo
fdea283f98 JungleRuin 2023-08-16 12:35:27 +00:00
flo
21bf0a5572 Merge branch 'pirate_hideout_site' into 'master' 
site pirate_hideout

See merge request veloren/veloren!4057
 2023-08-16 06:59:59 +00:00
flo
fba1976dee site pirate_hideout 2023-08-16 06:59:58 +00:00
flo
36c0096f6a coastal town fence fix 2023-08-15 22:34:38 +00:00
Maxicarlos08
0929a3c76c
use same timings for both portals 2023-08-15 12:24:49 +02:00
Maxicarlos08
8fe5f2e708
addressed review comments 2023-08-15 12:24:49 +02:00
Maxicarlos08
e5fe64ccf6
pre-review cleanups 2023-08-15 12:24:49 +02:00
Maxicarlos08
09f7087ac6
buildup time adjustments 2023-08-15 12:24:48 +02:00
Maxicarlos08
25fcb04ad3
buildup times and portal model update 2023-08-15 12:24:48 +02:00
Maxicarlos08
14141ecc80
failed attempt at making dungeons avoid caves 2023-08-15 12:24:46 +02:00
Maxicarlos08
0f2db68498
added portals 2023-08-15 12:24:17 +02:00
Maxicarlos08
730f96536a
remove staircases 2023-08-15 12:24:17 +02:00
Maxicarlos08
ed8fe545f8
Fixed temperate dungeon entrance height and wall artifacts around dungeons 2023-08-15 12:24:17 +02:00
Maxicarlos08
2d616352a2
grey walled dungeons 2023-08-15 12:24:17 +02:00
Maxicarlos08
73a79b32a1
no dungeons = no dungeons with caves! 2023-08-15 12:24:17 +02:00
Michal Sroczynski
c8feb568ba Bosses loot overhaul p1 2023-08-11 09:47:13 +02:00
Michał
5762e62704 Desert hum fix 2023-08-09 15:53:16 +00:00
Isse
254c1c7145 ResourceSprite Fill, so we can track giant tree IronWood in rtsim 2023-08-02 18:48:01 +02:00
Michal Sroczynski
0d4fc62468 Code quality fix 2023-08-02 18:48:01 +02:00
Michal Sroczynski
1301761445 Scatter changes and fixes 2023-08-02 18:48:01 +02:00
Michal Sroczynski
2c23781d22 Remove tiers from dungeons names 2023-08-02 18:48:01 +02:00
Michal Sroczynski
50304ed54e Format fix 2023-08-02 18:48:01 +02:00
Michal Sroczynski
28cf9bf19d Add woods to scatter and rarify the pyrebloom 2023-08-02 18:48:01 +02:00
Michal Sroczynski
a577ed1d36 Changes to Gnarling Tree 2023-08-02 18:45:40 +02:00
David Fisher
e2a0bc55c3 Lower grass target in standalone economy tests 
because: The test_economy_moderate_standalone was failing tests on
arm64 MacOS systems with the following error:

```
thread 'site::economy::context::tests::test_economy_moderate_standalone' panicked at 'assertion failed: site.economy.pop >= env.targets[&id]', world/src/site/economy/context.rs:562:17
```

This was originally reported in Discord by @sharp in July, 2022
https://discord.com/channels/449602562165833758/797421546871324712/997332351195553874

Debugging showed that the grass target was 880, and the population was only around 718.
Local testing showed that lowering the grass target to 700 fixed the issue.

this commit: Lowers the grass target to 700 in the standalone economy tests.

unaddressed questions:

- Why is the grass target so high in the standalone economy tests?
- Alternately, why did the grass population drift so low, and no longer aligned with the tests.
- Why is this passing in CI, but not local testing?
- There are a number of commented out add_settlement calls in the standalone economy tests. Were there issues with the tests prior?
 2023-07-31 16:51:29 -04:00
Isse
e7269a510b Fix adlet site division by zero 2023-07-28 16:08:25 +02:00
flo
36889f671e fix_desertcity_repairbench 2023-07-13 11:30:53 +00:00
flo
b556befe73 coastal_town 2023-07-12 23:02:40 +00:00
Monty Marz
102945b9e7 Dungeon rework initial patch 2023-07-09 20:03:09 +00:00
flo
3611fd2b3d wildlife_spawn_work 2023-07-03 23:21:56 +00:00
Samuel Keiffer
079e7bfed6 Merge branch 'uniior/cacti' into 'master' 
New/revamped cacti sprites

See merge request veloren/veloren!3986
 2023-06-18 01:22:33 +00:00
unknown
8978bc9dc4 Test 2023-06-14 13:14:33 -04:00
Tormod G. Hellen
cf002478b8
Optimally place towns. 
This gets rid of the arbitrary threshold values for what is and
isn't an acceptable town.
 2023-06-09 13:44:01 +02:00
unknown
526386e51c Initial cacti work 2023-06-07 14:46:54 -04:00
flo
02bba1e343 clifftown rework 2023-06-07 18:45:12 +00:00
Isse
a884e0e058 Various rtsim related stuff 2023-06-03 22:14:18 +00:00
Joshua Barretto
dc2afe8236 Merge branch 'floppy_savannah_hut' into 'master' 
savannah_hut

See merge request veloren/veloren!3872
 2023-06-03 11:54:58 +00:00
flo
22854cbea2 savannah_hut 2023-06-03 11:54:58 +00:00
Tormod G. Hellen
4f2548fe78
Pass SiteKind by reference. 2023-06-02 15:04:16 +02:00
Tormod G. Hellen
1d0329cfa7
Make sure location hint calculation is only done once. 
Location hint calculation is expensive and should not be done
in a hot loop.

This is a fixup for 1572a5a759.
 2023-06-02 15:04:09 +02:00
Isse
68491dde55 Merge branch 'seachapel_rework' into 'master' 
seachapel_rework

See merge request veloren/veloren!3856
 2023-05-24 18:13:29 +00:00
flo
a55276ea73 seachapel_rework 2023-05-24 18:13:29 +00:00
Tormod G. Hellen
a2ecd0b403
Replace SquareLocationRestriction with Aabr<i32>. 
This is a fixup for 1572a5a759
 2023-05-23 01:25:36 +02:00
Tormod G. Hellen
af080016ab
Get rid of the old and clunky loc_suitable_for_site function. 2023-05-22 16:35:12 +02:00
Tormod G. Hellen
a58b589c1a
Consolidate SiteKind impl. 2023-05-22 16:26:30 +02:00
Tormod G. Hellen
2397209b5d
Add proximity test. 2023-05-22 00:58:53 +02:00
Tormod G. Hellen
1572a5a759
Add location hint optimization. 2023-05-22 00:58:53 +02:00
Tormod G. Hellen
057c502218
Factor out town attribute calculation. 2023-05-22 00:58:53 +02:00
Sam
ca070f7ae8 Removed old tier-1 files 2023-05-13 09:32:29 -04:00
flo666
aca38d0cf4 review fixes 2023-05-13 09:32:29 -04:00
Sam
07afecfcd1 Clippy 2023-05-13 09:32:28 -04:00
Sam
92074e16d3 Made most inaccessible adlet caves accessible 2023-05-13 09:32:28 -04:00
flo666
8516899c18 inuit inspired location names for adlet stronghold 2023-05-13 09:32:27 -04:00
flo666
0431ebf8dc solid fill for igloo foundations 2023-05-13 09:32:26 -04:00
flo666
34bfb8ba68 tweak igloo&bonehut top decor bone 2023-05-13 09:32:26 -04:00
Isse
62a598c59b remove unwrap TODO 2023-05-13 09:32:26 -04:00
flo666
19b90d078a rebase & fix pipeline 2023-05-13 09:32:25 -04:00
flo666
7739aaff78 add more loot 2023-05-13 09:32:24 -04:00
flo666
713baa615e chests 2023-05-13 09:32:22 -04:00
flo666
7bed8488e7 level yetipit room entries 2023-05-13 09:32:22 -04:00
flo666
dfc6cbae3a reduce bonfire particles - Ember, 
reduce animals
 2023-05-13 09:32:21 -04:00
flo666
ed260f832d add loot, reduce enemies 2023-05-13 09:32:21 -04:00
flo666
c2cf88da3d - bigger yetipit mob rooms 
- tweaks
 2023-05-13 09:32:20 -04:00
flo666
17e4af3c48 BlockKind::ArtSnow 
replace BlockKind::Snow with BlockKind::Misc
 2023-05-13 09:32:19 -04:00
flo666
25ef582f1a - sprites IceCrystal, GlowIceCrystal for yetipit 
- rough creature balance
 2023-05-13 09:32:16 -04:00
flo666
38a6cc67f9 add models: bone_door, bone_keyhole, bone_key 2023-05-13 09:31:29 -04:00
flo666
72418e6804 where possible, replace intersect(painter.cylinder with intersect(painter.aabb 2023-05-13 09:30:57 -04:00
flo666
f4c7ab16d2 outside igloo variety 2023-05-13 09:30:57 -04:00
flo666
eb269c0e89 remove without() from adlet site code 2023-05-13 09:30:56 -04:00
flo666
6668df9f08 add adlet elder 2023-05-13 09:30:56 -04:00
flo666
86803c43bf adlet tracker tweaks 2023-05-13 09:30:54 -04:00
flo666
f936c2f00e rocky yetipit entrance & AdletTrap object 2023-05-13 09:30:54 -04:00
Sam
9fbc759ccd Creature distribution 2023-05-13 09:30:52 -04:00
Sam
2e9f1edef3 Adlet AI 2023-05-13 09:30:52 -04:00
Sam
92e28f09fc Adlet abilities 2023-05-13 09:30:51 -04:00
flo666
715a0b7b20 rebase 2023-05-13 09:30:50 -04:00
flo666
1750c9a0f2 structure work 2023-05-13 09:30:48 -04:00
Sam
3557f93f1e Initial cookfires and rock and bone huts 2023-05-13 09:30:19 -04:00
Sam
60f0505e8a Initial tannery and animal pen 2023-05-13 09:30:19 -04:00
Sam
cda910468a Initial yeti pit 2023-05-13 09:30:18 -04:00
Sam
1115877f5f Initial central bonfire 2023-05-13 09:30:18 -04:00
Sam
4c67691e45 Initial speleothems 2023-05-13 09:30:17 -04:00
Sam
6f70882ffe Placeholder igloos (someone with aesthetics fix please) 2023-05-13 09:30:17 -04:00
James Melkonian
c0676a008f Add rib cage to tunnel entrance 2023-05-13 09:30:17 -04:00
Sam
a87548e8b2 Tunnel entrance 2023-05-13 09:30:16 -04:00
Sam
bd222cb1eb Walls correctly sample and handle cliffs 2023-05-13 09:30:16 -04:00
Sam
dd1d5d1c29 Wall, in progress 2023-05-13 09:30:15 -04:00
Sam
c90159840c Tunnel tweaks 2023-05-13 09:30:15 -04:00
IsseW
731195f864 Sampled caverns 2023-05-13 09:30:15 -04:00
Sam
abf3546e64 Adlets can now carve tunnels and caverns 2023-05-13 09:30:14 -04:00
Sam
76f4db6f70 Tweaked positioning of adlet sites 2023-05-13 09:30:14 -04:00
jshipsey
da3c2369e5 initial setup 2023-05-13 09:30:13 -04:00
James Hiew
3a85a8d399
Always generate at least one civilization 2023-05-11 02:15:56 +01:00
Marcel Märtens
3a19669d53 use workspace dependencies to make our life easier maintaining them :) 2023-05-10 18:16:25 +02:00
Marcel Märtens
95bca5418a update toolchain to nightly-2023-04-20 2023-05-08 18:58:54 +02:00
Corvella
6367a51fa3 Cheesing fixes mainly focused on bosses 2023-05-06 01:57:41 +00:00
Marcel Märtens
4be1e82ba9 update further dependencies 2023-05-04 23:42:05 +02:00
Marcel Märtens
27620e665b we need a new version of refinery that needs a new version of rusqlite, so update both 2023-05-04 20:53:00 +02:00
Marcel
ce4beff7fe Merge branch 'xMAC94x/update_deps' into 'master' 
update veloren deps

See merge request veloren/veloren!3911
 2023-05-04 18:28:59 +00:00
Marcel Märtens
054f4f9453 update veloren deps 2023-05-04 11:58:43 +02:00
Imbris
d29a1ec052 Switch back to 100 attempts for each site, optimization of 
find_site_loc, and fix pre-existing bugs.

* In two spots, there were suspicious conversions between chunk positions
  / world positions that I removed. Everything, here should just be in
  chunk positions afaict!
* Optimized by skipping further checks if `in_suitable_loc` is false
  (main optimization (10x speedup for desert city site location finding
  attempts)) as well as only computing `in_suitable_loc` once (minor
  optimization).
 2023-05-02 06:12:33 -04:00
Imbris
ddf9e0eaab Address review on !3888 2023-05-01 21:01:50 -04:00
Imbris
4becb2c616 Refactor iteration over cardinals for bridges to explicitly check for the cardinal direction instead of using specific indices, performance seems roughly the same. 2023-04-25 01:10:34 -04:00
Imbris
87f042eb45 Lower max attempts for site placement to 15 from 100, to save time in the case of sites that can't easily be placed 2023-04-22 00:13:51 -04:00
Imbris
d18100c87a Add a max cost parameter to the astar algorithm so that it will terminate as exausted if this limit is reached. This is used to optimize site pathfinding by exiting early from finding a novel path if we know it won't be used. 2023-04-21 23:16:24 -04:00
Imbris
ed94c1c1b6 Fix existing bug with all site route costs be computed as 0 2023-04-20 22:22:21 -04:00
Imbris
c0db1310be Fix bug 2023-04-20 21:53:59 -04:00
Imbris
c82e6cfc77 Cleanup, fmt, appease clippy 2023-04-20 21:53:59 -04:00
Imbris
c6f5e8dac2 Add more profiling spans to Server startup related things in order to 
visualize where time is being spent. Make `Lod::from_world` use the same
rayon pool as other things during the server startup. Move parallel
iteration up out of structure_gen.par_iter in order to slightly optimize
Lod::from_world (saves a few hundred milliseconds on my machine)
 2023-04-20 21:53:59 -04:00
Imbris
92a42ced18 Apply experimental astar2 changes to the original impl 2023-04-20 21:53:59 -04:00
Imbris
d1ca47da41 Remove astar node clustering related code 2023-04-20 21:53:59 -04:00
Imbris
81885fe8e5 Additional optimizations (such as avoiding calling find_path when we know we won't use the result or that it will fail), cleanup of excess notes and commented code, probably other misc optimizations 2023-04-20 21:53:59 -04:00
Imbris
1f5ebbd100 mess (server startup time related experimentation, in particular with 
pathfinding between sites)
 2023-04-20 21:53:59 -04:00
Imbris
ed4643e80b Add profiling spans for Server::new and World::generate 2023-04-20 21:53:59 -04:00
Sam
e819cd2309 Updated hashbrown, removed some to_owned calls in handling recently unequipped items 2023-04-19 18:43:40 -04:00
Isse
e4a6c67fb0 try to get at least one workshop in towns 2023-04-15 19:57:18 +02:00
Isse
9c30d2018d add bridge tile for better bridge pathfinding 2023-04-14 11:17:08 +02:00
Joshua Barretto
a835ce7e26 Better starting site choices 2023-04-13 18:32:21 +01:00
Joshua Barretto
d8702f128b Variable town sizes 2023-04-13 12:05:16 +01:00
Joshua Barretto
308ee2f674 Don't pessimise worldgen fast paths for rtsim resources 2023-04-09 19:25:58 +01:00
Joshua Barretto
efbab102a5 Make LoD towns glow 2023-04-09 19:25:58 +01:00
Joshua Barretto
70538dae66 Choose random plaza tile 2023-04-09 19:25:58 +01:00
Joshua Barretto
a7a08763f2 Gave NPCs names 2023-04-09 19:25:58 +01:00
Joshua Barretto
85c572f6e2 Better town layout 2023-04-09 19:25:57 +01:00
Joshua Barretto
06820dbf16 Better path distance check for site2 2023-04-09 19:25:57 +01:00
Joshua Barretto
c8d0443111 Clippy fixes 2023-04-09 19:25:57 +01:00
Joshua Barretto
2eaf3c7e92 Spawn dogs and cats in towns 2023-04-09 19:25:57 +01:00
Isse
71039b56e6 fix examples 2023-04-09 19:25:55 +01:00
Joshua Barretto
ea007ff702 Cleaning up 2023-04-09 19:25:55 +01:00
Isse
dda1be58d4 big birds! 2023-04-09 19:25:54 +01:00
Joshua Barretto
bb96e92362 Track almost all collectable sprites, added resource replenishment 2023-04-09 19:25:54 +01:00
Joshua Barretto
ac83cfc4a3 More interesting idle behaviours 2023-04-09 19:25:54 +01:00
Joshua Barretto
7e9474ab70 Overhauled rtsim2 pathfinding with TravelTo 2023-04-09 19:25:53 +01:00
Joshua Barretto
e8b489a71a sync 2023-04-09 19:25:53 +01:00
IsseW
9be6c7b527 Pathing between sites. 2023-04-09 19:25:53 +01:00
IsseW
afd9ea5462 site pathing 2023-04-09 19:25:52 +01:00
Joshua Barretto
f40cfb4ac3 Made farmers sell food 2023-04-09 19:25:52 +01:00
IsseW
64c56f544d randomly walk around town 2023-04-09 19:25:52 +01:00
Joshua Barretto
c856f2625c Added rtsim sites 2023-04-09 19:25:51 +01:00
Joshua Barretto
c168ff2f9b Added rtsim saving, chunk resources, chunk resource depletion 2023-04-09 19:25:51 +01:00
Sam
7fab9d192b Add repair bench to desert and cliff towns. 2023-04-06 10:57:18 -04:00
Sam
c3f5bc13f1 Equipment can now be repaired at sprites in town. 2023-04-06 10:54:48 -04:00
Joshua Barretto
acec45b756 Initial implementation of starting site choice 2023-03-31 14:24:14 +01:00
Monty Marz
d1a7884ac8 Merge branch 'more_spot_things' into 'master' 
grave models, spot fixes, sword overlay

See merge request veloren/veloren!3842
 2023-03-31 02:57:39 +00:00
Isse
c34e5ad4ed Small fixes 2023-03-29 23:11:59 +00:00
Monty Marz
e4c5e50fb2 grave models, spot fixes, sword overlay 2023-03-29 13:10:49 +02:00
Sam
e31668b188 Fixed dynlib features to not have UB when allocating. 2023-03-21 20:03:20 -04:00
Imbris
61cb0ad39b Merge branch 'imbris/small-tweaks' into 'master' 
Various small tweaks / fixes

Closes #1475

See merge request veloren/veloren!3817
 2023-03-18 00:52:20 +00:00
Christof Petig
0e73bd23ed significant code simplification proposed by zesterer 2023-03-17 22:43:19 +01:00
Christof Petig
b555d619fb prefer imbris syntax proposal, documentation and changelog 2023-03-17 22:35:47 +01:00
Christof Petig
1f976f9f1c follow clippy's advice 2023-03-17 22:35:47 +01:00
Christof Petig
28da420c82 enable spot addition via ron file 2023-03-17 22:35:47 +01:00
Imbris
19b5ed3487 Appease clippy 2023-03-11 11:06:08 -05:00
Imbris
475ae65d16 Avoid extra StructureBlock clones in layer/tree.rs 2023-03-11 10:24:45 -05:00
Monty Marz
277a402781 Initial quest window work, spot fixes 2023-03-10 22:16:26 +00:00
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
Samuel Keiffer
01da8b6a82 Merge branch 'tursus_werewolf_anim&spawn_loot_tweaks' into 'master' 
spawn and loot tweaks, tursus and werewolf anims

See merge request veloren/veloren!3790
 2023-02-22 01:32:05 +00:00
flo
98e93d1a1c spawn and loot tweaks, tursus and werewolf anims 2023-02-22 01:32:05 +00:00
Tormod Gjeitnes Hellen
7164391c40
Refactor the site enemy functions to return iterators. 2023-02-21 17:14:04 +01:00
Tormod Gjeitnes Hellen
5e506a02ef
Change warning level for failing to find site placement to debug. 2023-02-21 17:03:23 +01:00
Tormod Gjeitnes Hellen
0fbe6a67f2
Make castles appear close to towns. 2023-02-21 17:03:22 +01:00
Tormod Gjeitnes Hellen
a0dd527a1d
Refactor proximity checking to be more flexible. 2023-02-21 16:58:54 +01:00
Tormod G. Hellen
90b945e18b
Make castles avoid trees. 2023-02-20 23:24:03 +01:00
Sam
4f26e37ae6 Addressed review 2023-01-09 20:18:31 -05:00
Sam
7d42c45fdd Site2 code is now hot-reloadable with 'hot-site2' feature. 2023-01-09 20:06:35 -05:00
Joshua Barretto
873d3fb7a4 Added dead trees to LoD 2022-12-31 15:32:56 +00:00
Isse
ef2c1633ed Merge branch 'isse/bridges' into 'master' 
Bridges

See merge request veloren/veloren!3680
 2022-11-30 15:07:03 +00:00
Marcel Märtens
4a1404cd71 fix leftovers from toolchain update 2022-11-30 15:14:47 +01:00
Isse
02eadc3002 add doc comment 2022-11-30 15:13:52 +01:00
Isse
560d5c3153 fix doc test 2022-11-30 15:13:52 +01:00
Isse
c81fbf50c4 Fix cylinder primitive and better ramp function 2022-11-30 15:13:52 +01:00
Isse
dda54bcb01 small fixes 2022-11-30 15:13:52 +01:00
IsseW
17cd863605 tuning 2022-11-30 15:13:52 +01:00
IsseW
179c6dab8f better flat 2022-11-30 15:13:52 +01:00
IsseW
6d2b39c254 simple hang bridge 2022-11-30 15:13:52 +01:00
IsseW
df8db713ea lights 2022-11-30 15:13:52 +01:00