James Melkonian
0422c3391d
Improve NPC aiming and humanoid hitboxes
2020-11-11 04:36:40 +00:00
Samuel Keiffer
a043985ba5
Merge branch 'sam/fix-assets-update-2' into 'master'
...
Fix 2 for Assets Update Merge
See merge request veloren/veloren!1501
2020-11-11 03:12:40 +00:00
Sam
989de385e3
Yeet
2020-11-10 19:59:55 -06:00
Samuel Keiffer
2cd512577f
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
Marcel
d188b12084
Merge branch 'xMAC94x/clock' into 'master'
...
massivly switch clock algorithm.
See merge request veloren/veloren!1499
2020-11-10 22:12:12 +00:00
Sam
c2300ea2a5
Yeet
2020-11-10 15:49:51 -06:00
Monty Marz
f4d286f00c
Merge branch 'pfau/assets_update' into 'master'
...
Assets update
See merge request veloren/veloren!1458
2020-11-10 21:43:45 +00:00
Monty Marz
b4f160d0e3
frost cleaver
...
velorite mage set
offsets
armor stats
2020-11-10 21:43:45 +00:00
Marcel Märtens
33100275fd
switch to spin_sleep
2020-11-10 22:39:10 +01:00
Marcel Märtens
f831df5064
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
Justin Shipsey
0c8d8fc5c6
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
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
jshipsey
11abacda69
adjust to comments
2020-11-09 18:47:52 -05:00
jshipsey
34b05e8229
tweaks
2020-11-09 18:32:23 -05: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
Sam
91082b3167
Slight balance tweaks.
2020-11-08 19:33:24 -06:00
jshipsey
c665c1b268
hammer keyframes
2020-11-08 19:54:46 -05:00
Sam
ee014e3079
Minor tweaks.
2020-11-08 18:11:53 -06:00
jshipsey
28180c5c5d
rebase
2020-11-08 19:02:48 -05:00
jshipsey
84586ef085
ranged
2020-11-08 18:52:22 -05:00
Sam
8b3f6ba128
Made bow stay in BasicRanged state while autofiring.
2020-11-08 18:51:36 -05:00
jshipsey
85a38d6f7a
axe basic
2020-11-08 18:51:35 -05:00
jiminycrick
81e77aa2ee
Initial combo melee for axe M1
2020-11-08 18:48:48 -05: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
