e90104ba0f
Yeet
2020-11-10 19:59:55 -06:00
c087b74a8d
Merge branch 'sam/fix-assets-update' into 'master'
...
Fix merge of assets update branch
See merge request veloren/veloren!1500
2020-11-10 23:10:36 +00:00
696f607a70
Merge branch 'xMAC94x/clock' into 'master'
...
massivly switch clock algorithm.
See merge request veloren/veloren!1499
2020-11-10 22:12:12 +00:00
e6693d5979
Yeet
2020-11-10 15:49:51 -06:00
670af0ad1e
Merge branch 'pfau/assets_update' into 'master'
...
Assets update
See merge request veloren/veloren!1458
2020-11-10 21:43:45 +00:00
0e072f72cc
frost cleaver
...
velorite mage set
offsets
armor stats
2020-11-10 21:43:45 +00:00
72afd7af6c
switch to spin_sleep
2020-11-10 22:39:10 +01:00
e4e5c6e55b
massivly switch clock algorithm.
...
- before we had a Clock that tried to average multiple ticks and predict the next sleep.
This system is massivly bugged.
a) We know exactly how long the busy time took, so we dont need to predict anything in the first place
b) Preduction was totally unrealistic after a single lag spike
c) When a very slow tick happens, we dont benefit from 10 fast ticks.
- Instead we just try to keep the tick time exact what we expect.
If we can't manage a constant tick time because we are to slow, the systems have to "catch" this via the `dt` anyway.
2020-11-10 18:31:42 +01:00
a8ac051f33
Merge branch 'james/axe-hammer-keyframes' into 'master'
...
James/axe hammer keyframes
See merge request veloren/veloren!1497
2020-11-10 01:03:11 +00:00
b4d337c746
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
db753c4f3b
adjust to comments
2020-11-09 18:47:52 -05:00
cd188fd32b
tweaks
2020-11-09 18:32:23 -05:00
bce6195479
Added birch forest
2020-11-09 22:59:41 +00:00
b09148abee
Updated changelog, removed old models
2020-11-09 17:19:29 +00:00
962f0ec812
Better snow effects for non-trees
2020-11-09 17:09:33 +00:00
b0f7cdfe66
Reduced oaks in desert
2020-11-09 16:28:57 +00:00
d9550ddebd
Better pine forests by shifting average oak temperature
2020-11-09 16:22:47 +00:00
71718d9c98
Better humidity, better snow trees
2020-11-09 15:06:37 +00:00
3f02aa5134
Removed more redundant code, desert dunes, better bridges
2020-11-09 10:20:22 +00:00
1036ce8c7e
Abandon tree generation when outside bounds
2020-11-09 10:20:22 +00:00
9b233708e2
Turned tree generation into a post-processing layer, ripped out old tree generator for performance wins
2020-11-09 10:20:22 +00:00
647dcb2fec
Switched path generation to canvas
2020-11-09 10:20:22 +00:00
981b71759e
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
d9f7a72139
adjust path to veloren account page
2020-11-09 09:21:14 +01:00
9b0e1c8dfc
Slight balance tweaks.
2020-11-08 19:33:24 -06:00
7aa3de35c9
hammer keyframes
2020-11-08 19:54:46 -05:00
8fa7e246e9
Minor tweaks.
2020-11-08 18:11:53 -06:00
0618de138e
rebase
2020-11-08 19:02:48 -05:00
20efc692fd
ranged
2020-11-08 18:52:22 -05:00
edff3a75c3
Made bow stay in BasicRanged state while autofiring.
2020-11-08 18:51:36 -05:00
92aa6a1b12
axe basic
2020-11-08 18:51:35 -05:00
33e87de17e
Initial combo melee for axe M1
2020-11-08 18:48:48 -05:00
91502255e8
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
b56919b123
Make waypoints persistent
...
Closes #549
2020-11-08 22:15:47 +01:00
3e96c7d211
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
08a0926c40
Fixed sneaky admin sword.
2020-11-08 13:58:23 -06:00
b11da85ff9
Patch for the position de-synchronization by imbris
...
See https://discordapp.com/channels/449602562165833758/449650240350453760/774724295452393522
2020-11-08 18:56:55 +01:00
8cab21d44c
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
86aa7f7ba2
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
9424ecfb4d
centering assets
2020-11-08 00:35:11 -06:00
66dbfebf3b
Asset ron file fix
2020-11-07 22:06:08 -08:00
aaac3dadcb
improved the steak asset
2020-11-07 23:52:18 -06:00
4803ee5c81
changed to an or operand
2020-11-07 23:37:15 -06:00
6535deae9c
added two meat assets for mobs to drop
2020-11-07 23:34:20 -06:00
0bf437f2b1
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
289126d9c8
Make different mobs drop different assetts on death (not just lootbags) cargo fmt
2020-11-07 22:50:38 -06:00
134c481408
Make different mobs drop different assetts on death (not just lootbags)
2020-11-07 22:50:38 -06:00
d523ed7216
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
245caa1e78
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
aeca76c748
Fixed cultist sword not displaying correctly in inventory.
2020-11-07 21:48:24 -06:00
