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
7,914 Commits 151 Branches 18 Tags 2.1 GiB
27fb8a9f6c
Commit Graph

905 Commits

Author SHA1 Message Date
Joshua Barretto
1d16f14dd5 Small fixes 2021-03-07 14:25:02 +00:00
Joshua Barretto
f537f82b17 Updated vek, fixed house wall bugs 2021-03-07 14:25:02 +00:00
Joshua Barretto
fe8ffc8f87 Fixed more silly issues 2021-03-07 14:25:02 +00:00
Joshua Barretto
6e6e322e90 Fixed stupid generation bugs, made houses more interesting 2021-03-07 14:25:02 +00:00
Joshua Barretto
293d1f2d5e More plot generation work 2021-03-07 14:25:02 +00:00
Joshua Barretto
9e20d7390f Better house generation 2021-03-07 14:25:02 +00:00
Joshua Barretto
14bac81dc4 Added CSG house roofs 2021-03-07 14:25:02 +00:00
Joshua Barretto
9875e2c025 Began work on CSG-based primitive tree site structure generation system 2021-03-07 14:25:02 +00:00
Joshua Barretto
95af1536be Town hazards 2021-03-07 14:25:02 +00:00
Joshua Barretto
cd97a4b2fc Wider roads, better structure 2021-03-07 14:25:02 +00:00
Joshua Barretto
1dab08075e Fixed biasing bug 2021-03-07 14:25:02 +00:00
Joshua Barretto
7d94c3600f New town layouts, initial progress 2021-03-07 14:25:02 +00:00
Joshua Barretto
660b297dd0 Cliff height variety 2021-03-07 14:25:02 +00:00
Joshua Barretto
81b93b548e More varied cliff placement 2021-03-07 14:25:02 +00:00
Joshua Barretto
7ea9e32acf Better cliffs 2021-03-07 14:25:01 +00:00
Joshua Barretto
e5b02ff7da Better water/cave/cliff interaction 2021-03-07 14:25:01 +00:00
Joshua Barretto
466f3919d2 Removed the worst water/cliff interaction issues 2021-03-07 14:25:01 +00:00
Joshua Barretto
4ffdcd0fa1 Cliff overhangs 2021-03-07 14:25:01 +00:00
Joshua Barretto
740dcbb440 Stone layering 2021-03-07 14:25:01 +00:00
Joshua Barretto
9b5c9d1246 Cliff improvements 2021-03-07 14:25:01 +00:00
Joshua Barretto
620e2000d2 Experimental cliffs, use column alt for world map 2021-03-07 14:25:01 +00:00
Joshua Barretto
3aff271a05 Initial test site generation 2021-03-07 14:25:01 +00:00
Joshua Barretto
c7e82aea26 Began work integrating new sites into the world 2021-03-07 14:25:01 +00:00
Joshua Barretto
6af0e77efd Better stairs 2021-03-07 14:25:01 +00:00
Joshua Barretto
b07c942aef Added staircase to giant trees 2021-03-07 14:25:01 +00:00
Joshua Barretto
284d061068 Added staircases to giant trees 2021-03-07 14:25:01 +00:00
Joshua Barretto
0c302bb020 Lanterns in trees 2021-03-07 14:25:01 +00:00
Joshua Barretto
6fc7d2a906 Faster More interesting giant trees, better oaks, hives on branches 2021-03-07 14:25:01 +00:00
Joshua Barretto
185b1c3053 Specialised giant trees 2021-03-07 14:25:01 +00:00
Joshua Barretto
abd1eec815 Slightly smaller giant trees, more dispersed forests 2021-03-07 14:25:01 +00:00
Joshua Barretto
7d526da735 Experimental giant mother trees 2021-03-07 14:25:01 +00:00
Joshua Barretto
e30c625d81 More tree variety, denser forests 2021-03-07 14:25:01 +00:00
Joshua Barretto
81206d5e13 New site work 2021-03-07 14:25:00 +00:00
Joshua Barretto
68b0aa5c50 sync 2021-03-07 14:25:00 +00:00
Joshua Barretto
9cf13ac3b2 Simple coral 2021-03-07 14:25:00 +00:00
Joshua Barretto
3766a77de1 Better tree parameterisation, improved pines 2021-03-07 14:25:00 +00:00
Joshua Barretto
953d8841b4 Procedural pines (first attempt), more tree parameters 2021-03-07 14:25:00 +00:00
Joshua Barretto
24773afe76 Better parameterisation of trees 2021-03-07 14:25:00 +00:00
Joshua Barretto
5e7c231788 Switched to recursive tree generation and recursive culling algorithm for massive performance wins 2021-03-07 14:25:00 +00:00
Joshua Barretto
6f11c4c5c7 Added tree benchmarks 2021-03-07 14:25:00 +00:00
ccgauche
2f68a565d4 Fixed branch flattening 2021-03-07 14:25:00 +00:00
ccgauche
cf91358f40 Fixed canopy problem + Added iteration constant 2021-03-07 14:25:00 +00:00
ccgauche
0eaf8492a5 Removed unsafe from finvsqrt 2021-03-07 14:25:00 +00:00
ccgauche
454d9d0b75 Quite a lot of optimisations 2021-03-07 14:25:00 +00:00
ccgauche
37f9fba023 Simplified generation and fixed some tree cliping issues 2021-03-07 14:25:00 +00:00
ccgauche
bbc64b4ead New generation for trees 2021-03-07 14:25:00 +00:00
Joshua Barretto
9d1a03504c Fixed clipping issues, faster generation 2021-03-07 14:25:00 +00:00
ccgauche
7f3ba0eaca New generation for trees 2021-03-07 14:25:00 +00:00
Joshua Barretto
0745514174 Prevented trees from being too sparse 2021-03-07 14:25:00 +00:00
Joshua Barretto
4bcf9e7a63 More sparse, faster trees 2021-03-07 14:25:00 +00:00
Joshua Barretto
6dd0f73c2d Fixed clipping issues, faster generation 2021-03-07 14:25:00 +00:00
Joshua Barretto
82a25e49ef Began integrating procgen trees 2021-03-07 14:25:00 +00:00
Joshua Barretto
23f0dfb078 Began work on new sites 2021-03-07 14:25:00 +00:00
Joshua Barretto
272ca41b9e Reduced bridge artifacts 2021-03-07 14:25:00 +00:00
Joshua Yanovski
7146ff2676 Merge branch 'sharp/bump-vek' into 'master' 
Bring vek up to date so we can bump rustc (hopefully).

See merge request veloren/veloren!1848
 2021-03-04 12:56:05 +00:00
Joshua Yanovski
2dd7089e52 Bring vek up to date so we can bump rustc (hopefully). 2021-03-04 05:46:59 +01:00
Marcel Märtens
c681992367 Changelog: 
-Savanna grasses now only spawn in the savanna and no longer bleed into desert and temperate biomes
-Cacti now only spawn in the desert and density of large cacti has decreased
-Dead bushes are largely unchanged and still spawn in both the savanna and desert with some bleed into temperate biomes
 2021-03-03 15:06:34 +01:00
jshipsey
16720a6826 weapon/manifest tweaks 2021-02-27 10:44:55 -05:00
Sam
238fcaf5f1 Particle rebase fixes 2021-02-27 01:42:47 -05:00
jshipsey
8d316aac8c feedback adjustments 2021-02-27 01:42:47 -05:00
jshipsey
16a44cd532 minotaur moves, added claygolem 2021-02-27 01:42:47 -05:00
jshipsey
417f4638ed balance pass 2 2021-02-27 01:42:47 -05:00
jshipsey
79ec9115f5 rebase, yeti in dungeon 2021-02-27 01:42:47 -05:00
jshipsey
e06ebf3507 initial balance 2021-02-27 01:42:47 -05:00
Snowram
1b9815dc34 Adds 3 new npcs, tusk ram new design 2021-02-27 01:42:46 -05:00
jshipsey
57d5e90ddd full bipedsmall armor swaps 2021-02-27 01:42:46 -05:00
jshipsey
952a77f94d speedier weapons initial testing 2021-02-27 01:42:45 -05:00
jshipsey
e4e25e20c9 rebase 2021-02-27 01:42:45 -05:00
jshipsey
ca3248cc93 new dungeon setups, new npcs, weapon specific loadouts, anims 2021-02-27 01:42:45 -05:00
unknown
559ece5ede More npcs work 2021-02-27 01:42:45 -05:00
unknown
6f18d16aa2 Add new quadmeds npcs with rough offsets 2021-02-27 01:42:44 -05:00
Snowram
1172c2f2c3 Merge branch 'Sarrakitty/OceanFlora' into 'master' 
added coral reefs, kelp forests, and seagrass

See merge request veloren/veloren!1819
 2021-02-27 01:52:33 +00:00
Sarra
fff194dfbf coral and kelp, cargo fmt 2021-02-25 23:47:38 -05:00
Sarra
02eb76416f tweaking coral models and seagrass spawns 2021-02-25 23:39:41 -05:00
Sarra
1d4b8d4d99 correcting formatting and removing commented out code that wasn't supposed to be there 2021-02-25 20:41:57 -05:00
Sarra
f39f5ab5d3 added coral reefs, kelp forests, and seagrass 2021-02-25 05:33:18 -05:00
Sam
b0b4a07b9e Bows 2021-02-24 20:37:43 -05:00
Sam
ee5c9d78ca Swords 2021-02-24 18:54:06 -05:00
Snowram
4078eeb877 Various fixes to object animation, cleanup 2021-02-21 19:56:46 +01:00
Snowram
775224983b Initial turret implementation 2021-02-21 18:23:54 +01:00
Sam
341affdae2 Added hands field to all ron files of weapons. 
Removed weapons that were duplicated in weapons and npc_weapons from npc_weapons.
Added migration to convert npc_weapons that ended up in anyone's inventory to weapon version.
Consolidated debug boost and possess sticks into one debug_stick, and renamed the admin sword (with name cultist_purp_2h_boss-0) to admin_sword
 2021-02-19 17:30:20 -05:00
Caelan
dda4931f46 Clean and update dependencies 
* Remove tweak feature
 * Remove const-tweaker
 * Update tiny_http
 * Update bitvec to 0.21.0
 * Downgrade euc to avoid conflict with vek 0.12.0
 * Require exactly vek 0.12.0
 * Update all other dependencies automatically based on these changes
 * Update gilrs to latest at the request of Ada Lovegirls
 * Update meshing benchmarks to new criterion API
 2021-02-17 01:27:06 -08:00
Synis
a29ce3c428 Waypoints are no longer placed underwater 2021-02-16 13:23:12 +01:00
Lippy13
b64fc5e822 Fix #689 - dungeon without stairs to boss floor 2021-02-16 00:54:44 +00:00
Joshua Barretto
8ece00d6c6 Merge branch 'snowram/fix-staicases-lights' into 'master' 
Fixes lights positions and orientations in staircases

See merge request veloren/veloren!1776
 2021-02-14 01:17:53 +00:00
Snowram
f1f6a12718 Fixes lights positions and orientations in staircases 2021-02-13 22:27:37 +01:00
DaforLynx
ebbb06a400 Added crickets blocktype, added 3 new cricket sounds, made crickets chirp consistently, made frogs more sporadic 2021-02-12 00:54:42 +00:00
Snowram
6ac52daeae Refactor, addresses more comments 2021-02-10 00:34:37 +01:00
Snowram
477bdfdfe7 Adresses some comments, various visual tweaks 2021-02-10 00:30:23 +01:00
Snowram
02f446fe4b Adds lights to dungeons 2021-02-10 00:30:23 +01:00
Scott Williams
ae22a98167 Added a miniboss loot table for the stonework defender, made damaged bag, glider, and root of evil mindflayer exclusive drops. 2021-02-07 19:04:20 +00:00
jiminycrick
8b97199245 Update rand dependency 2021-01-26 20:35:08 -08:00
Joshua Barretto
58c69980b1 Merge branch 'synis/fix-cave-rng' into 'master' 
Fixes #935 - deterministic sprite placement in caves

Closes #935

See merge request veloren/veloren!1721
 2021-01-24 17:17:02 +00:00
Monty
7cbf946a65 6 new sceptres, add DPS display to tooltips 2021-01-23 23:10:36 +01:00
dryadee
f064033bb4 Fixes #935 - deterministic sprite placement in caves 2021-01-23 21:14:07 +01:00
Rotsuoy
994677a4d0 Rotsuoy/savanna grass 2021-01-23 07:46:54 +00:00
Sam
d2f3c1dd25 Restores difficulty to mindflayer fight. Made various tweaks to skillset builder functions. 2021-01-21 14:56:24 -05:00
Acrimon
9f16a946ee
update a few deps 2021-01-20 15:53:58 +01:00
Sarra Kitty
e7d852835c Sarrakitty/rotsys item sprites 2021-01-19 18:23:44 +00:00
jiminycrick
3d44ac2c35 Humanoid skill config and AI skill check 
updated axe skill with correct icons
 2021-01-19 08:08:05 -05:00
Sam
6ce422748c Added SkillSetConfig to specify skill sets for npcs. 2021-01-19 08:07:55 -05:00
Sam
cb3e44a811 Health can now be scaled for npcs again. 2021-01-19 08:07:40 -05:00
Marcel Märtens
6390e758d4 fix clippy in all examples. 
added a ignore for plugins, as we cannot remove the `Result<>` type, it is necessary
 2021-01-13 15:06:04 +01:00
Ben Wallis
aef2637288 Refactored loadout to have public functions for each slot instead of requiring callers to use the _INDEX consts 2021-01-08 19:12:09 +00:00
jiminycrick
aceac9e205 Upgrade noise eliminating old rand dependency 2021-01-05 10:10:47 -08:00
ubruntu
ae366e03c5 Reduced downward fall of birds, Humanoid travelers no longer visit dungeons, birds only travel between dungeons 2021-01-05 01:04:01 +00:00
Benoît du Garreau
989683d2d3 Improve world::Index 2020-12-17 12:08:04 +01:00
Benoît du Garreau
7b4aa6d4cc cargo fmt 2020-12-17 12:06:22 +01:00
Benoît du Garreau
0cf164f33a Use assets_manager to load assets 2020-12-17 12:06:07 +01:00
jiminycrick
60d5d62eef Switched to hashbrown everywhere 2020-12-17 10:31:35 +01:00
Marcel Märtens
e8003a44dd update specs 2020-12-16 14:31:16 +01:00
Marcel Märtens
e3307344ab get rid of some insecure dependencies 2020-12-16 10:42:36 +01:00
Marcel Märtens
107fd432f5 update further crates 2020-12-16 08:56:21 +01:00
Joshua Barretto
f8c8e342e6 Moved common networking code to common/net, clippy fixes 2020-12-13 17:23:45 +00:00
Joshua Barretto
316bddbf30 Prevented towns destroying trees, rocks, other towns, etc. 2020-12-11 16:53:21 +01:00
Monty Marz
f2ba7cc297 add baobabs, fix map difficulty, make mushrooms lootable 2020-12-10 18:06:29 +01:00
Marcel Märtens
ccb01e1898 adjust fmt and clippy after toolchain upgrade 2020-12-10 14:53:01 +01:00
Snowram
526d3bd035 Vacations are never over 2020-12-08 23:03:40 +01:00
Snowram
72d73ecd38 Initial fish work 2020-12-08 23:03:38 +01:00
Joshua Barretto
e5ebbd31fa Began using Grid<T> for LoD data 2020-12-05 11:20:25 +00:00
Marcel Märtens
ca1601a980 Change the version number to 0.8 2020-11-28 11:25:58 +01:00
Sam
33e4448542 Replaced every unnecssary powf in the entire codebase with either powi or sqrt. 2020-11-24 18:28:24 -06:00
jiminycrick
aad9734055 Agent tactic refactoring 
Lower theropods spawns

clippy, changelog

review response
 2020-11-24 17:49:00 -06:00
jshipsey
d10dd83e5f theropods in world, small tweaks 2020-11-24 17:48:51 -06:00
Christof Petig
4563cb40ce use iter once.chain(once).flatten trick to deduplicate SiteInfo generation 2020-11-23 23:28:21 +01:00
Christof Petig
49d7c40bec Remove the last remnants of the site circle and cave map drawing code 2020-11-23 19:54:56 +01:00
Christof Petig
11f9d71fde fix clippy: One argument is no longer needed 2020-11-23 19:17:19 +01:00
Christof Petig
813f63a1e5 remove cave lines from the map, also remove remnants of the colored site circles 2020-11-23 19:07:11 +01:00
Christof Petig
921022638c Display names for caves (identical on both ends) 2020-11-23 19:05:43 +01:00
Christof Petig
a3db20c9d6 Show caves in map 2020-11-23 19:05:17 +01:00
Joshua Barretto
26fd40c0e3 Fmt, make clippy happy 2020-11-23 15:39:03 +00:00
Snowram
6215682619 Temp loot tables 2020-11-23 10:58:22 +00:00
Joshua Barretto
deda202b5a Prevent wildlife spawning in towns 2020-11-23 10:58:22 +00:00
Joshua Barretto
765a1ca17b Switched light map iteration order, fire bowls in dungeons 2020-11-23 10:58:21 +00:00
Snowram
b7a33c56cc Add basic guards to towns 2020-11-23 10:58:21 +00:00
Snowram
8885efd702 Adds (mini)bosses spawns 2020-11-23 10:58:21 +00:00
Joshua Barretto
55c6966ad9 Fewer trees near obstacles 2020-11-23 10:58:21 +00:00
Joshua Barretto
b539ecf438 More lights, minimised light and glow map data 2020-11-23 10:58:21 +00:00
Snowram
6e51967079 Dungeon tweaks 2020-11-23 10:58:21 +00:00
Snowram
0737c71749 Adds new cultist armors, defines loadouts for dungeons 2020-11-23 10:57:57 +00:00
Joshua Barretto
df1b19ed64 Light/glow temporal interpolation hack 2020-11-23 10:57:57 +00:00
Snowram
3bcffe1bf7 Assigns spawned npcs loadout with new method 2020-11-23 10:57:56 +00:00
Monty Marz
b950447bed added enum for different dungeon enemies 2020-11-23 10:57:56 +00:00
Monty Marz
95d300c0e2 remove level 6 dungeons 2020-11-23 10:57:56 +00:00
Joshua Barretto
b30dfd1539 sync 2020-11-23 10:57:56 +00:00
Joshua Barretto
93a86a951e Tweaked default graphics settings 2020-11-23 10:57:56 +00:00
Joshua Barretto
7850b0bcaf Added site names, dungeon difficulty, better explosions 2020-11-23 10:57:55 +00:00
Treeco
f78b165320 Replaced placeholder willow generating conditions 2020-11-23 10:57:16 +00:00
Joshua Barretto
579bdcf10e Forest soil undulation, better acadia placement 2020-11-23 10:57:15 +00:00
Monty Marz
99b3a4465a WIP map zooming and dragging 2020-11-23 10:57:15 +00:00