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
4,950 Commits 151 Branches 18 Tags 2.1 GiB
62c53963ab
Commit Graph

578 Commits

Author SHA1 Message Date
Shane Handley
304e06cbce Fix clippy warnings after toolchain update 2020-06-23 16:52:04 +10:00
Marcel Märtens
15fc5787e4 switch log behavior for env variable and removed gfx spam by default 2020-06-22 16:49:40 +02:00
Marcel Märtens
9485b45e70 switch to tracing stlye and enhance logs with usefull information 
- Updated CHANGELOG
- reduce dependencies
- found out that we have alot of duplicate coding... alot...
 2020-06-22 09:53:15 +02:00
Kevin Glasson
589254e4ab Convert all other veloren crates to use tracing 
- Completely removed both `log` and `pretty_env_logger` and replaced
with `tracing` and `tracing_subscriber` where necessary.

- Converted all `log::info!(...)` et al. statements to just use the
shorthand macro i.e. `info!`. This was mostly to make renaming easier.
 2020-06-21 23:19:41 +08:00
Ben Wallis
6da7a11d33 Fixed suppressed clippy warnings for #587 - clone_on_copy 2020-06-18 22:25:48 +01:00
Imbris
26e53409d8 Merge branch 'xvar/clippy-globally-suppress-option_map_unit_fn' into 'master' 
Globally suppressed clippy lint option_map_unit_fn for #587

See merge request veloren/veloren!1071
 2020-06-14 16:48:07 +00:00
Ben Wallis
c1c968f479 Globally suppressed clippy lint option_map_unit_fn for #587 2020-06-14 16:48:07 +00:00
Imbris
fb47115695 Merge branch 'xvar/clippy-fixes-redundant_closure_found' into 'master' 
Fixed suppressed clippy warnings for #587 - redundant_closure

See merge request veloren/veloren!1065
 2020-06-14 16:33:04 +00:00
Ben Wallis
4d6c553b1b Fixed suppressed clippy warnings for #587 - redundant_closure 2020-06-12 20:47:22 +01:00
Ben Wallis
8ed2109bcf Fixed suppressed clippy warnings for #587 - collapsible_if 2020-06-12 20:34:54 +01:00
Ben Wallis
950c62efc6 Suppressed all existing clippy warnings in preparation for fixes as part of #587 2020-06-10 22:01:42 +01:00
Monty Marz
b34da9b07b More item drops 2020-06-03 17:59:09 +00:00
CapsizeGlimmer
78a06550d0 Only NPCs speak when hit. Farm animal alignment changed from NPC to Tame 2020-05-27 13:49:18 +02:00
Joshua Barretto
786665eac4 Merge branch 'sharp/deterministic-civsim' into 'master' 
Make civsim and sites deterministic.

See merge request veloren/veloren!1009
 2020-05-26 19:22:48 +00:00
Treeco
4c41cc1050 Changed SEED_SKIP to 0 2020-05-21 21:59:59 +01:00
Joshua Yanovski
eaea83fe6a Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes 2020-05-21 22:47:07 +02:00
Joshua Yanovski
2f89b863e0 Merge branch 'treeco/new-map' into 'master' 
Changed default map and seed, lowered site counts

See merge request veloren/veloren!992
 2020-05-21 20:46:54 +00:00
Joshua Yanovski
34427373ef Make civsim and sites deterministic. 
For anything in worldgen where you use a HashMap, *please* think
carefully about which hasher you are going to use!  This is
especially true if (for some reason) you are depending on hashmap
iteration order remaining stable for some aspect of worldgen.
 2020-05-21 21:43:54 +02:00
Joshua Yanovski
2670184954 Make civsim and sites deterministic. 
For anything in worldgen where you use a HashMap, *please* think
carefully about which hasher you are going to use!  This is
especially true if (for some reason) you are depending on hashmap
iteration order remaining stable for some aspect of worldgen.
 2020-05-21 21:20:01 +02:00
Joshua Yanovski
f8376fd5dc Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes 2020-05-21 17:53:57 +02:00
Joshua Barretto
db59a3ca3d Merge branch 'small-fixes' into 'master' 
Dungeon Bosses

See merge request veloren/veloren!994
 2020-05-15 19:07:11 +00:00
Joshua Barretto
fff4021777 Better spawn town 2020-05-15 19:26:09 +01:00
Joshua Barretto
ba80f7c872 Fixed square staircases in dungeons 2020-05-15 18:34:05 +01:00
Joshua Barretto
93de58252e More interesting dungeon features 2020-05-15 17:22:51 +01:00
Joshua Barretto
fb0c817528 More powerful bosses 2020-05-15 16:32:09 +01:00
Joshua Barretto
aac28d04d5 Added dungeon bosses, boss loot, boss arenas 2020-05-15 16:05:50 +01:00
Joshua Yanovski
243d0837b8 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes 2020-05-15 14:53:13 +02:00
Treeco
61bcfbeeb2 Changed default map and seed, lowered site counts 2020-05-15 11:36:19 +01:00
François Mockers
c757645587 fix links 2020-05-14 22:13:20 +02:00
Joshua Barretto
dd91fc53f8 Resolved bizarre dungeon spawn rate bug 2020-05-13 15:49:33 +01:00
Treeco
6281ab865a Increased the spawn rate of towns and dungeons 2020-05-11 18:37:34 +01:00
Treeco
2797af0c87 Removed old-style dungeons 
I believe this means that trees are the only thing still using the
old-style structure spawning. Maybe it can be simplified a lot more?
 2020-05-11 18:37:16 +01:00
Monty Marz
b589c3fc71 Fix animals not attacking 2020-05-04 16:59:32 +00:00
Joshua Yanovski
746a10e8d0 Merge branch 'master' of gitlab.com:veloren/veloren into sharp/small-fixes 2020-05-02 04:02:09 +02:00
Monty Marz
c792cc05a9 Villagers and Cultists 2020-04-30 20:43:24 +00:00
Joshua Barretto
44fc88b4d1 Better dungeon waypoint placement 2020-04-29 17:01:35 +02:00
Joshua Barretto
3e86b20c2c Fixed dungeon offsets 2020-04-29 17:01:34 +02:00
Joshua Barretto
d0b1c9eb6f Added dungeon entrances 2020-04-29 17:01:34 +02:00
Joshua Yanovski
e0452e895c More proper HDR. 2020-04-27 13:13:23 +02:00
Joshua Yanovski
682a3d74c8 Fix LOD heights in towns. 2020-04-26 23:11:08 +02:00
Joshua Yanovski
cc39e5734e More LOD fixes. 2020-04-26 21:01:23 +02:00
Joshua Yanovski
bc2560ea90 Merge remote-tracking branch 'origin/master' into sharp/small-fixes 2020-04-25 23:48:33 +02:00
Joshua Barretto
a1983712d3 Prevented windows spawning inside houses 2020-04-25 21:44:23 +01:00
Joshua Barretto
90de779559 Better LoD variable names 2020-04-25 21:44:23 +01:00
Joshua Barretto
c05f4fe009 Added configurable sprite view distance, minor bug fixes 2020-04-25 21:44:23 +01:00
Joshua Barretto
8bf5709ddf Implemented Treeco's z-only LoD suggestion 2020-04-25 21:44:23 +01:00
Joshua Barretto
5bdc420726 Harbarboofarfoobar 2020-04-25 21:44:23 +01:00
Joshua Barretto
1feae79243 Added reseeding for sites 2020-04-25 21:44:23 +01:00
Joshua Yanovski
44e4aad48d Merge remote-tracking branch 'origin/master' into sharp/small-fixes 2020-04-25 02:01:04 +02:00
Joshua Barretto
b588be4962 fmt 2020-04-23 22:10:05 +01:00
Joshua Barretto
c0bd0279fc Added sites to the map 2020-04-23 21:59:09 +01:00
Joshua Barretto
2a6a19f7ef fmt 2020-04-23 18:19:42 +01:00
Joshua Barretto
06dc96c56b Made paths connect at the ends, removed paths from dungeons 2020-04-23 18:19:42 +01:00
Joshua Barretto
01e2cd2b88 Warning cleanup 2020-04-23 18:19:42 +01:00
Joshua Barretto
840078d2b7 Gave some villagers weapons 2020-04-23 18:19:42 +01:00
Joshua Barretto
982886b3f8 Made players spawn in the nearest town to the centre of the world, delete object.zip 2020-04-23 18:19:41 +01:00
Joshua Barretto
57153a1720 Balanced dungeon spawn rates slightly 2020-04-23 18:19:41 +01:00
Joshua Barretto
cd5e4ef3b7 Better path colour on map, typo fixes 2020-04-23 18:19:41 +01:00
Joshua Barretto
444f2ecb45 Made /waypoint admin-only, MR cleanup 2020-04-23 18:19:41 +01:00
Joshua Barretto
e35dff2f4b Fixed noise on bridges 2020-04-23 18:19:41 +01:00
Joshua Barretto
8d4f1da3a6 Improved path rendering on the map, removed ugly path noise 2020-04-23 18:19:41 +01:00
Joshua Barretto
60bf396e4f Added doors to houses 2020-04-23 18:19:41 +01:00
Joshua Barretto
a65dbc570a Returned to normal world size 2020-04-23 18:19:41 +01:00
Joshua Barretto
514281c837 Made lantern placement on paths more regular 2020-04-23 18:19:41 +01:00
Joshua Barretto
89f99dbcc9 Added lanterns to town streets 2020-04-23 18:19:41 +01:00
Joshua Barretto
628dc7c47e Added waypoints outside of dungeons 2020-04-23 18:19:41 +01:00
Joshua Barretto
431e199731 Added correctly generating world paths, sub-voxel shader noise 2020-04-23 18:19:41 +01:00
Joshua Barretto
431b2ae07b Fixed window mask layering, fmt 2020-04-23 18:19:41 +01:00
Joshua Barretto
77d0292e91 Added windows to buildings and scarecrows 2020-04-23 18:19:41 +01:00
Joshua Barretto
0329b355ef Made civsim paths visible in-game 2020-04-23 18:19:41 +01:00
jshipsey
27dab981d2 town ground color 2020-04-23 18:19:41 +01:00
jshipsey
a89b28e117 adjusted run animation to allow villager walking 2020-04-23 18:19:41 +01:00
Pfauenauge90
9572c2eaad spawn rates 2020-04-23 18:19:41 +01:00
Pfauenauge90
49d61b33c5 turnip 2020-04-23 18:19:41 +01:00
Pfauenauge90
98704a4753 turnip and window blocks 2020-04-23 18:19:41 +01:00
Joshua Barretto
c5efa43fa3 Reduced enemy spawn rate in dungeons, fixed spawning 2020-04-23 18:19:41 +01:00
Joshua Barretto
ca26efea47 Better town spawn rates 2020-04-23 18:19:41 +01:00
Joshua Barretto
4dbb6a631f Reduced enemy spawn rate in dungeons, fixed spawning 2020-04-23 18:19:41 +01:00
Joshua Barretto
708f15915a Agent adjustments, better dungeon stairwells 2020-04-23 18:19:41 +01:00
Joshua Barretto
cf986e75dc Made civsim considerably more deterministic 2020-04-23 18:19:41 +01:00
Joshua Barretto
6448c17110 Fixed sprite AO, overhauled entity spawning, better enemy spawning in dungeons, made agents more skilled at combat 2020-04-23 18:19:41 +01:00
Joshua Barretto
d0641ecbe3 Unblocked tunnels 2020-04-23 18:19:41 +01:00
Joshua Barretto
aee7802d48 Reduced tunnel width 2020-04-23 18:19:41 +01:00
Joshua Barretto
2f96f3e0b9 Removed EntityKind for a second time because Pfau screwed up a rebase 2020-04-23 18:19:41 +01:00
Joshua Barretto
5229bcc8e2 Reduced crop densities 2020-04-23 18:19:41 +01:00
Monty Marz
0fb3a115da Add more crops 2020-04-23 18:19:41 +01:00
Joshua Barretto
7d4443cbcd Fixed screw-up 2020-04-23 18:19:41 +01:00
Joshua Barretto
3541305ff4 Narrower tunnels 2020-04-23 18:19:41 +01:00
Joshua Barretto
e3ebdc56b3 Fixed figure AO (still need to do sprite AO), added more control over NPC spawning, loot in dungeons 2020-04-23 18:19:41 +01:00
Joshua Barretto
3042a09dfd Disabled warping in towns 2020-04-23 18:19:41 +01:00
Joshua Barretto
866fd1992e Fixed bad AO quad flipping in dark places, bosses spawning in dungeon walls, large creatues being uncompromisingly pedantic when trying to path towards targets 2020-04-23 18:19:41 +01:00
Joshua Barretto
fd14223c33 Basic boss spawning in dungeons, better AO 2020-04-23 18:19:41 +01:00
Joshua Barretto
c4879e991d Enabled AO in darkness, better light attenuation 2020-04-23 18:19:41 +01:00
Joshua Barretto
525cba5029 Added dungeon rooms, corridors, mazes 2020-04-23 18:19:41 +01:00
Joshua Barretto
3ffc5a7d87 Added simple dungeon impl 2020-04-23 18:19:41 +01:00
Joshua Barretto
568a8ab87c Increased block rendering altitude range 2020-04-23 18:19:41 +01:00
Joshua Barretto
32d2274caf Better fields 2020-04-23 18:19:41 +01:00
Joshua Barretto
f999edffaa Fixed crop crash issues 2020-04-23 18:19:41 +01:00
Joshua Barretto
a4872c4e8d Added crop terrain sprite generation 2020-04-23 18:19:41 +01:00
Pfauenauge90
4b72a07e22 sprites 2020-04-23 18:19:41 +01:00