Joshua Barretto
|
6d768e9685
|
Merge branch 'zesterer/worldgen-canvas' into 'master'
*The* world generation cleanup (part 1)
See merge request veloren/veloren!1490
|
2020-11-10 00:01:11 +00:00 |
|
Joshua Barretto
|
6703575641
|
Added birch forest
|
2020-11-09 22:59:41 +00:00 |
|
Joshua Barretto
|
1b03d0437c
|
Updated changelog, removed old models
|
2020-11-09 17:19:29 +00:00 |
|
Joshua Barretto
|
81a01b4740
|
Better snow effects for non-trees
|
2020-11-09 17:09:33 +00:00 |
|
Joshua Barretto
|
ed41d0fa9b
|
Reduced oaks in desert
|
2020-11-09 16:28:57 +00:00 |
|
Joshua Barretto
|
de78c64107
|
Better pine forests by shifting average oak temperature
|
2020-11-09 16:22:47 +00:00 |
|
Joshua Barretto
|
4944eb5f59
|
Better humidity, better snow trees
|
2020-11-09 15:06:37 +00:00 |
|
Joshua Barretto
|
69beba3e79
|
Removed more redundant code, desert dunes, better bridges
|
2020-11-09 10:20:22 +00:00 |
|
Joshua Barretto
|
3f7dba5127
|
Abandon tree generation when outside bounds
|
2020-11-09 10:20:22 +00:00 |
|
Joshua Barretto
|
27821c3aed
|
Turned tree generation into a post-processing layer, ripped out old tree generator for performance wins
|
2020-11-09 10:20:22 +00:00 |
|
Joshua Barretto
|
9d8fab2056
|
Switched path generation to canvas
|
2020-11-09 10:20:22 +00:00 |
|
Marcel
|
2ca06ca7b1
|
Merge branch 'xMAC94x/auth-link' into 'master'
adjust path to veloren account page
See merge request veloren/veloren!1498
|
2020-11-09 09:01:59 +00:00 |
|
Marcel Märtens
|
735774b5c2
|
adjust path to veloren account page
|
2020-11-09 09:21:14 +01:00 |
|
Imbris
|
b05c99e3ac
|
Merge branch 'persistent_waypoints' into 'master'
Make waypoints persistent, Closes #549
Closes #549
See merge request veloren/veloren!1480
|
2020-11-08 23:36:30 +00:00 |
|
Christof Petig
|
e288677af0
|
Make waypoints persistent
Closes #549
|
2020-11-08 22:15:47 +01:00 |
|
Samuel Keiffer
|
75072c28e2
|
Merge branch 'sam/fix-admin-sword' into 'master'
Fixed sneaky admin sword.
See merge request veloren/veloren!1495
|
2020-11-08 21:06:08 +00:00 |
|
Sam
|
4a8c0e0bce
|
Fixed sneaky admin sword.
|
2020-11-08 13:58:23 -06:00 |
|
Christof Petig
|
7ef0636614
|
Patch for the position de-synchronization by imbris
See https://discordapp.com/channels/449602562165833758/449650240350453760/774724295452393522
|
2020-11-08 18:56:55 +01:00 |
|
Justin Shipsey
|
84d7af1ee8
|
Merge branch 'AlKabir/animals-dont-drop-lootbags' into 'master'
Make different mobs drop different assets on death (not just lootbags)
See merge request veloren/veloren!1462
|
2020-11-08 07:26:10 +00:00 |
|
Justin Shipsey
|
db70c8cec5
|
Merge branch 'james/unique-weapon-fix' into 'master'
Asset ron file fix for Unique NPC weapons after de-stringifying ToolKind
See merge request veloren/veloren!1494
|
2020-11-08 06:55:50 +00:00 |
|
AlKabir
|
435c2b9bda
|
centering assets
|
2020-11-08 00:35:11 -06:00 |
|
jiminycrick
|
37335078ed
|
Asset ron file fix
|
2020-11-07 22:06:08 -08:00 |
|
AlKabir
|
13b76e1891
|
improved the steak asset
|
2020-11-07 23:52:18 -06:00 |
|
AlKabir
|
1cfa96e830
|
changed to an or operand
|
2020-11-07 23:37:15 -06:00 |
|
AlKabir
|
f5e5511057
|
added two meat assets for mobs to drop
|
2020-11-07 23:34:20 -06:00 |
|
AlKabir
|
2b3684ccbd
|
Merge branch 'AlKabir/animals-dont-drop-lootbags' of https://gitlab.com/veloren/veloren into AlKabir/animals-dont-drop-lootbags
|
2020-11-07 22:51:10 -06:00 |
|
AlKabir
|
568743d75d
|
Make different mobs drop different assetts on death (not just lootbags) cargo fmt
|
2020-11-07 22:50:38 -06:00 |
|
AlKabir
|
362e84c631
|
Make different mobs drop different assetts on death (not just lootbags)
|
2020-11-07 22:50:38 -06:00 |
|
Samuel Keiffer
|
faf0578d50
|
Merge branch 'sam/fix-typo-from-yeet-weapon-string' into 'master'
Typo Fix in Asset Manifest File
See merge request veloren/veloren!1493
|
2020-11-08 04:45:57 +00:00 |
|
Samuel Keiffer
|
1b06b48952
|
Merge branch 'sam/stupid-fix-2' into 'master'
Other stupid fix
See merge request veloren/veloren!1492
|
2020-11-08 04:04:41 +00:00 |
|
Sam
|
eb028de936
|
Fixed cultist sword not displaying correctly in inventory.
|
2020-11-07 21:48:24 -06:00 |
|
Sam
|
6879c880fe
|
Other stupid fix.
|
2020-11-07 21:07:53 -06:00 |
|
Samuel Keiffer
|
7d9a18a91b
|
Merge branch 'sam/stupid-fix' into 'master'
Fixed stupid error.
See merge request veloren/veloren!1491
|
2020-11-08 02:45:46 +00:00 |
|
Sam
|
a8d02bf2ce
|
Fixed stupid error.
|
2020-11-07 19:54:37 -06:00 |
|
Samuel Keiffer
|
21ae7b867d
|
Merge branch 'sam/yeet-weapon-strings' into 'master'
Removes weapon strings from ToolKind
See merge request veloren/veloren!1489
|
2020-11-08 00:38:50 +00:00 |
|
Imbris
|
db6eeaeb6c
|
Use item_definition_id for weapon asset mapping
|
2020-11-07 16:44:11 -06:00 |
|
Sam
|
13be252f58
|
Fix audio tests.
|
2020-11-07 15:53:19 -06:00 |
|
Sam
|
afb405350e
|
Added Tool() around file paths in other manifest.
|
2020-11-07 15:53:19 -06:00 |
|
Sam
|
4ddb9878b4
|
Added Tool() around file paths.
|
2020-11-07 15:53:18 -06:00 |
|
Sam
|
ce32437ee1
|
Yeeted from ron files.
|
2020-11-07 15:53:16 -06:00 |
|
Sam
|
76db4b338d
|
Yeeted from manifest files.
|
2020-11-07 15:53:14 -06:00 |
|
Sam
|
e392e37c47
|
Yeeted from code files.
|
2020-11-07 15:53:10 -06:00 |
|
Justin Shipsey
|
055e341449
|
Merge branch 'AlKabir/issue785-small-aiming-change' into 'master'
Minor combat fixes (see issue 785)
See merge request veloren/veloren!1461
|
2020-11-07 18:00:07 +00:00 |
|
AlKabir
|
ee64934c94
|
Minor combat fixes (see issue 785)
|
2020-11-07 18:00:07 +00:00 |
|
Samuel Keiffer
|
849e90ad06
|
Merge branch 'tbg/#785' into 'master'
Removed ToolCategory, changed in_fluid to in_liquid
See merge request veloren/veloren!1475
|
2020-11-06 15:33:20 +00:00 |
|
TheBoredProgrammer64
|
d195eaf701
|
Revert "Removed toolCategory"
This reverts commit 5b0ff408176ff00408cc90f2516a90d5cd303e56.
|
2020-11-06 15:33:20 +00:00 |
|
Marcel
|
b9fc903cd1
|
Merge branch 'xMAC94x/small-ci' into 'master'
ci cleanup, dependency update
See merge request veloren/veloren!1485
|
2020-11-06 14:23:52 +00:00 |
|
Marcel Märtens
|
77bbc44051
|
ci cleanup, dependency update
|
2020-11-06 14:34:42 +01:00 |
|
Samuel Keiffer
|
df8567c5a9
|
Merge branch 'sam/make-roll-great-again' into 'master'
Roll overhaul
See merge request veloren/veloren!1484
|
2020-11-06 03:25:18 +00:00 |
|
Samuel Keiffer
|
f4dade7957
|
Merge branch 'snowram/consumables-buffs' into 'master'
Allows for consumables to have an optional array of buffs and effects
See merge request veloren/veloren!1472
|
2020-11-06 02:42:34 +00:00 |
|