Commit Graph

1642 Commits

Author SHA1 Message Date
Sam
c3f5bc13f1 Equipment can now be repaired at sprites in town. 2023-04-06 10:54:48 -04:00
acec45b756 Initial implementation of starting site choice 2023-03-31 14:24:14 +01:00
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
c34e5ad4ed Small fixes 2023-03-29 23:11:59 +00:00
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
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
0e73bd23ed significant code simplification proposed by zesterer 2023-03-17 22:43:19 +01:00
b555d619fb prefer imbris syntax proposal, documentation and changelog 2023-03-17 22:35:47 +01:00
1f976f9f1c follow clippy's advice 2023-03-17 22:35:47 +01:00
28da420c82 enable spot addition via ron file 2023-03-17 22:35:47 +01:00
19b5ed3487 Appease clippy 2023-03-11 11:06:08 -05:00
475ae65d16 Avoid extra StructureBlock clones in layer/tree.rs 2023-03-11 10:24:45 -05:00
277a402781 Initial quest window work, spot fixes 2023-03-10 22:16:26 +00:00
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
5ddc55be52 replaced CHUNK_SIZE by RECT_SIZE everywhere, and change the use (and remove... 2023-03-06 21:03:35 +00:00
9a025cfcc8 More spot features 2023-03-03 23:21:37 +00:00
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
7164391c40 Refactor the site enemy functions to return iterators. 2023-02-21 17:14:04 +01:00
5e506a02ef Change warning level for failing to find site placement to debug. 2023-02-21 17:03:23 +01:00
0fbe6a67f2 Make castles appear close to towns. 2023-02-21 17:03:22 +01:00
a0dd527a1d Refactor proximity checking to be more flexible. 2023-02-21 16:58:54 +01:00
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
873d3fb7a4 Added dead trees to LoD 2022-12-31 15:32:56 +00:00
ef2c1633ed Merge branch 'isse/bridges' into 'master'
Bridges

See merge request veloren/veloren!3680
2022-11-30 15:07:03 +00:00
4a1404cd71 fix leftovers from toolchain update 2022-11-30 15:14:47 +01:00
02eadc3002 add doc comment 2022-11-30 15:13:52 +01:00
560d5c3153 fix doc test 2022-11-30 15:13:52 +01:00
c81fbf50c4 Fix cylinder primitive and better ramp function 2022-11-30 15:13:52 +01:00
dda54bcb01 small fixes 2022-11-30 15:13:52 +01:00
17cd863605 tuning 2022-11-30 15:13:52 +01:00
179c6dab8f better flat 2022-11-30 15:13:52 +01:00
6d2b39c254 simple hang bridge 2022-11-30 15:13:52 +01:00
df8db713ea lights 2022-11-30 15:13:52 +01:00
91ed3c6a84 draw on map 2022-11-30 15:13:52 +01:00
31b56b03b5 desert skin 2022-11-30 15:13:52 +01:00
78e227d317 short bridges 2022-11-30 15:13:52 +01:00
3bb66cf2ff add hipped roof 2022-11-30 15:13:52 +01:00
7296843923 simple bridges 2022-11-30 15:13:52 +01:00
225cbf472f update tag and fix empty maps, other bugs introduced by auto fix 2022-11-29 09:19:10 +01:00
2812729b78 cargo clippy lifetimes 2022-11-28 15:19:57 +01:00
dad73ba2a3 fix clamp clippy errors 2022-11-28 14:26:27 +01:00
0ab7a2543e fix clippy errors 2022-11-28 14:08:11 +01:00
ba3747a3f0 update toolchain 2022-11-28 14:08:11 +01:00
44f118c437 Get rid of redundant sources of truth on site locations. 2022-11-20 00:57:05 +01:00
24aac2d92f Merge branch 'floppy_savannahpit_merchants' into 'master'
add merchants to savannah pits

See merge request veloren/veloren!3690
2022-11-13 19:14:27 +00:00
flo
6d8f2c8c7b add merchants to savannah pits 2022-11-13 19:14:26 +00:00