Joshua Barretto
3f0301d981
New site work
2021-03-07 14:25:00 +00:00
Joshua Barretto
330f3898d4
sync
2021-03-07 14:25:00 +00:00
Joshua Barretto
617a77ff8a
Simple coral
2021-03-07 14:25:00 +00:00
Joshua Barretto
585415872a
Better tree parameterisation, improved pines
2021-03-07 14:25:00 +00:00
Joshua Barretto
5a970cc3fc
Procedural pines (first attempt), more tree parameters
2021-03-07 14:25:00 +00:00
Joshua Barretto
b185231387
Better parameterisation of trees
2021-03-07 14:25:00 +00:00
Joshua Barretto
37c45113da
Switched to recursive tree generation and recursive culling algorithm for massive performance wins
2021-03-07 14:25:00 +00:00
Joshua Barretto
78959f0a7e
Added tree benchmarks
2021-03-07 14:25:00 +00:00
ccgauche
c95aeac652
Fixed branch flattening
2021-03-07 14:25:00 +00:00
ccgauche
01aaa77245
Fixed canopy problem + Added iteration constant
2021-03-07 14:25:00 +00:00
ccgauche
e1c71d0ddc
Removed unsafe from finvsqrt
2021-03-07 14:25:00 +00:00
ccgauche
ded078c623
Quite a lot of optimisations
2021-03-07 14:25:00 +00:00
ccgauche
0ea6ca49cf
Simplified generation and fixed some tree cliping issues
2021-03-07 14:25:00 +00:00
ccgauche
3750a97611
New generation for trees
2021-03-07 14:25:00 +00:00
Joshua Barretto
140efa7f6f
Fixed clipping issues, faster generation
2021-03-07 14:25:00 +00:00
ccgauche
76a52f5698
New generation for trees
2021-03-07 14:25:00 +00:00
Joshua Barretto
95a98044e3
Prevented trees from being too sparse
2021-03-07 14:25:00 +00:00
Joshua Barretto
b137ab4aed
More sparse, faster trees
2021-03-07 14:25:00 +00:00
Joshua Barretto
ae071dcbd3
Fixed clipping issues, faster generation
2021-03-07 14:25:00 +00:00
Joshua Barretto
ab6a1165fe
Began integrating procgen trees
2021-03-07 14:25:00 +00:00
Joshua Barretto
a2706cb546
Began work on new sites
2021-03-07 14:25:00 +00:00
Joshua Barretto
2563e49bfd
Reduced bridge artifacts
2021-03-07 14:25:00 +00:00
Joshua Barretto
21703e84f6
Merge branch 'aweinstock/recursive-fireworks' into 'master'
...
Make fireworks recursively shoot more fireworks (95% average replication).
See merge request veloren/veloren!1855
2021-03-06 23:36:21 +00:00
Avi Weinstock
c5a959a60b
Make the probabilities data to assert that the expected value is less than 1.
2021-03-06 15:11:19 -05:00
Avi Weinstock
83870aae43
Make fireworks recursively shoot more fireworks (95% average replication).
2021-03-06 14:05:51 -05:00
Samuel Keiffer
6dfc0acd94
Merge branch 'aweinstock/chase_dist_quickfix' into 'master'
...
Increase MAX_CHASE_DIST from 20 to 250, so enemies don't ignore you if you're...
See merge request veloren/veloren!1853
2021-03-06 17:59:44 +00:00
Avi Weinstock
61c9ff90e4
Increase MAX_CHASE_DIST from 20 to 250, so enemies don't ignore you if you're fireballing them from a hallway.
2021-03-06 10:50:04 -05:00
Imbris
f48a522e07
Merge branch 'Quibble/item-buff-tooltips' into 'master'
...
Tooltips use item stats for buff information
See merge request veloren/veloren!1820
2021-03-05 22:00:24 +00:00
Joshua Barretto
f892aa5dca
Merge branch 'ccgauche/fix-tracy' into 'master'
...
Fixed tracy
See merge request veloren/veloren!1852
2021-03-05 22:00:22 +00:00
ccgauche
aa0373ba0e
Fixed tracy
2021-03-05 19:02:33 +01:00
Imbris
e583afbdaf
Merge branch 'sarrakitty/fireworks' into 'master'
...
made firework explosions colorful
See merge request veloren/veloren!1851
2021-03-05 17:48:56 +00:00
Imbris
9caef83915
Merge branch 'cargo-override' into 'master'
...
Cargo.nix override instead of requiring manual intervention
See merge request veloren/veloren!1647
2021-03-05 17:04:29 +00:00
Snowram
d243f12b20
Merge branch 'vfoulon80/convert-fr-translations' into 'master'
...
Split the french translation into multiple files
See merge request veloren/veloren!1672
2021-03-05 12:23:08 +00:00
Vincent Foulon
503f44f0c2
Split the french translation into multiple files
2021-03-05 12:23:08 +00:00
Sarra
df78d4654a
made firework explosions colorful
2021-03-05 01:22:29 -05:00
Marcel
a7ecd8e180
Merge branch 'vfoulon80/skilltree-icons' into 'master'
...
implement the new skilltree icons
See merge request veloren/veloren!1794
2021-03-04 18:37:33 +00:00
Vincent Foulon
4b23a3b307
implement the new skilltree icons
2021-03-04 18:37:32 +00:00
Marcel
7b0734ad91
Merge branch 'sam/asset-validation-tests' into 'master'
...
Added Item Validation Test
See merge request veloren/veloren!1849
2021-03-04 15:46:12 +00:00
Marcel
faeacb8ce2
Merge branch 'aweinstock/stack-trading' into 'master'
...
Allow using stack splitting into or out of a trade.
See merge request veloren/veloren!1850
2021-03-04 14:34:05 +00:00
Joshua Yanovski
674ff96096
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
Marcel
d2cc47258b
Merge branch 'Rotsuoy/SavannaGrass' into 'master'
...
Rotsuoy/SavannaGrassUpdate
See merge request veloren/veloren!1725
2021-03-04 10:32:58 +00:00
Joshua Yanovski
e7cd5fedf4
Bring vek up to date so we can bump rustc (hopefully).
2021-03-04 05:46:59 +01:00
Avi Weinstock
33bed4a2ad
Allow using stack splitting into or out of a trade.
2021-03-03 18:19:10 -05:00
Sam
7e8556406d
Added test that all items are properly formatted and valid. Fixed items that were broken.
2021-03-03 16:45:36 -05:00
Lippy13
4f9b365c20
Make the BuffKind match expression exhaustive
2021-03-03 21:10:41 +00:00
Lippy13
310c4b655d
Check if duration exists instead of defaulting to zero and clean up code
2021-03-03 20:39:14 +00:00
Samuel Keiffer
d57f2d7e32
Merge branch 'armor-org-fix-3' into 'master'
...
Fixed debug back armor. Removed leather_3 item.
See merge request veloren/veloren!1847
2021-03-03 20:13:39 +00:00
Sam
eaa240fdc0
Fixed debug back armor. Removed leather_3 item.
2021-03-03 15:05:51 -05:00
Marcel
e9f2c024ec
Merge branch 'xMAC94x/mpsc' into 'master'
...
Change the way Network is dropped.
Closes #46
See merge request veloren/veloren!1846
2021-03-03 15:19:44 +00:00
Marcel Märtens
0d44b14c4f
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
