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
10,897 Commits 151 Branches 18 Tags 2.1 GiB
ba7251c7e3
Commit Graph

1259 Commits

Author SHA1 Message Date
jshipsey
0e9d50162b last fixes 2022-01-14 00:19:32 -05:00
jshipsey
1fac6359de more gnarling weapons 2022-01-13 23:20:56 -05:00
jshipsey
7f928d0bc0 woodengolem, chieftain, icedrake, blowgun 2022-01-13 23:20:52 -05:00
Monty Marz
d72d926341 change merchant backpack visuals and add mining skill icons 2022-01-08 01:57:52 +01:00
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
Joshua Barretto
8e2ca9cdec Added rtsim villagers to site2 towns 2021-11-01 22:19:49 +00:00
Samuel Keiffer
e692f49463 Merge branch 'sam/potion-tweaks' into 'master' 
Potion tweaks

See merge request veloren/veloren!2976
 2021-10-31 21:12:08 +00:00
jshipsey
f69e3c9fbc more hats 2021-10-30 23:42:17 -04:00
Treeco
e380425001 Add continent_scale_hack setting 2021-10-30 16:40:37 +01:00
Sam
ad257410e9 Merchants now have less potion stock. 2021-10-29 19:58:38 -04:00
juliancoffee
84e04fa906 Add size parameter to map_file opts 2021-10-30 01:06:40 +03: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
DemonicOnPc
a74af55c46 Gemu's Revamped vox models added. 2021-10-26 05:28:05 -04:00
DemonicOnPc
8f26c451ae Added shrub density within specific regions 2021-10-25 16:20:49 -04:00
DemonicOnPc
b1476071b1 Added new Spots, Shrubs and Ships. 
Spots
- Gnarling Tree
- Troll Cave
- Underwater Shipwreck second variation.

Shrubs added to biomes
- Savannah Shrubs
- Taiga Shrubs
- Temperate Shrubs

Galleon ship added
 2021-10-24 08:10:44 -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
f9b661fc61 Corrected historical typo 2021-10-15 22:47:43 +01:00
MohammadHasanKargar
c82b3859e0 Deleting extra grasses on the air 2021-10-15 19:09:36 +03:30
Joshua Barretto
e660aafed3 Nicer lake borders 2021-10-10 13:41:57 +01:00
Joshua Barretto
1473029204 Added ability to toggle world features 2021-10-10 13:41:57 +01:00
Joshua Barretto
bee922156e Added radial pattern to shrooms 2021-10-10 13:41:57 +01:00
Joshua Barretto
d09f1e1c4a Added noise to blocks 2021-10-10 13:41:57 +01:00
Joshua Barretto
086097cd56 Better vines and lighting 2021-10-10 13:41:57 +01:00
Joshua Barretto
a5309e1036 Prevented shrooms spawning in water 2021-10-10 13:41:57 +01:00
Joshua Barretto
2ce88ac398 Better grass and lily distribution 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
Joshua Barretto
7768a22f7f Better moss 2021-10-10 13:41:57 +01:00
Joshua Barretto
b22029f87c More mushroom sprites 2021-10-10 13:41:56 +01:00
Joshua Barretto
d785ecc102 Added vines 2021-10-10 13:41:56 +01:00
Joshua Barretto
46118acef3 Added mushroom inner bevel 2021-10-10 13:41:56 +01:00
Joshua Barretto
bfc55d7b17 More cavern details 2021-10-10 13:41:56 +01:00
Joshua Barretto
ed40e92801 Better cave water 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
Treeco
e48c13e140 Decrease beehive frequency on apple trees 2021-10-08 17:42:01 +01:00
Treeco
719fce1c89 Procgen apple trees 2021-10-06 02:26:43 +01:00
Treeco
dafa1327d0 Added mottled bark to birch 2021-10-06 02:26:43 +01:00
Treeco
c502bc177a Procgen birches 2021-10-06 02:26:43 +01:00
Joshua Barretto
f13a8a643b Fixed water light extinction 2021-10-05 00:02:34 +01:00
Joshua Barretto
96e23ae2d4 Handle oceans and steep rivers gracefully, update changelog 2021-10-05 00:02:32 +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
c399fe9a39 No snow on riverbeds 2021-10-05 00:02:03 +01:00
Joshua Barretto
6c6b3e1244 Better lake borders and river depth 2021-10-05 00:02:03 +01:00
Joshua Barretto
22f48b1977 Added waterfalls and fixed warping issues 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
Joshua Barretto
4aa8a6bb42 Better shrubs 2021-10-05 00:02:02 +01:00