Imbris
891e81cf58
Merge branch 'imbris/save-selected-char' into 'master'
...
Save the selected character, deselect character when deleting, auto select newly created character
See merge request veloren/veloren!1516
2020-11-15 01:40:44 +00:00
Imbris
4f2512f126
Save the selected character, deselect character when deleting, auto select newly created character
2020-11-14 19:17:42 -05:00
Imbris
2072929a5a
Send ability map from the server to the client on connection instead of loading from the assets
2020-11-14 16:07:07 -05:00
Samuel Keiffer
0c7cd3d8fb
Merge branch 'jasonkjl72/axe-spin-adjustment' into 'master'
...
Make Axe Spin More Realistic
Closes #827
See merge request veloren/veloren!1510
2020-11-14 04:15:50 +00:00
Jason Lee
1d2ccd5762
Make Axe Spin More Realistic
2020-11-13 21:49:12 -05:00
Imbris
1373b752ff
Merge branch 'imbris/fix-5' into 'master'
...
Remove randomization of species and body_type with the randomize button in char creation
See merge request veloren/veloren!1512
2020-11-14 01:56:28 +00:00
Imbris
51dd5110d0
Merge branch 'imbris/fix-3' into 'master'
...
Tweak clock related things and fix voxygen tracy feature
See merge request veloren/veloren!1506
2020-11-14 01:39:33 +00:00
Imbris
1952785af2
Remove randomization of species and body_type with the randomize button in char creation
2020-11-13 19:43:32 -05:00
Sam
b5f59f9cf3
Fixed tests. Addressed comments.
2020-11-13 10:41:34 -06:00
Sam
e2fe2fd532
Speed and power on weapons are now able to modify abilities after they are loaded from ron files.
2020-11-12 21:24:36 -06:00
Imbris
37e4ea4669
Remove ability map from top level functions
2020-11-12 21:24:35 -06:00
Sam
9b4fa4e961
Started moving loading of ability manifest to an ecs variable.
2020-11-12 21:24:34 -06:00
Sam
050ad82e55
Abilities are now loaded from .ron files.
2020-11-12 21:24:34 -06:00
Sam
770aaf6b93
Added projectile constructor. Removed a bunch of cloning.
2020-11-12 21:24:32 -06:00
Sam
abf7301a89
Changed how buffs were constructed on projectiles.
2020-11-12 21:24:32 -06:00
Sam
f4244ecbaf
Added ron files for unique and WIP tools.
2020-11-12 21:24:31 -06:00
Imbris
27d4310498
Add more catagories to common deps, store average busy dt as a duration, store frame delta times as seconds instead of milliseconds
2020-11-12 19:18:54 -05:00
Imbris
c0e8298ac3
Display averaged busy dt
2020-11-11 23:26:13 -05:00
Imbris
a97b188bea
Make fps display and specification more precise
2020-11-11 21:47:22 -05:00
Imbris
ba042c76c8
Only limit negative z velocity by gravity instead of total negative z velocity
2020-11-11 20:09:07 -05:00
Snowram
bed3a5c70a
Adds a speed variable to charged states
2020-11-11 22:06:05 +01:00
Snowram
af346806de
Addressed comments
2020-11-11 22:03:54 +01:00
Snowram
fe977f0a6c
Adds a speed stat to weapons
2020-11-11 22:03:53 +01:00
Imbris
cd1a134c26
Fix bug in body.validate(), add sliders to iced char creation screen, make char selection screen more closely resemble the master version in style
2020-11-11 03:02:22 -05:00
James Melkonian
6085edaa34
Improve NPC aiming and humanoid hitboxes
2020-11-11 04:36:40 +00:00
Marcel
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
Monty Marz
0e072f72cc
frost cleaver
...
velorite mage set
offsets
armor stats
2020-11-10 21:43:45 +00:00
Marcel Märtens
72afd7af6c
switch to spin_sleep
2020-11-10 22:39:10 +01:00
Marcel Märtens
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
Justin Shipsey
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
jshipsey
cd188fd32b
tweaks
2020-11-09 18:32:23 -05:00
Joshua Barretto
71718d9c98
Better humidity, better snow trees
2020-11-09 15:06:37 +00:00
Sam
9b0e1c8dfc
Slight balance tweaks.
2020-11-08 19:33:24 -06:00
Sam
8fa7e246e9
Minor tweaks.
2020-11-08 18:11:53 -06:00
jshipsey
0618de138e
rebase
2020-11-08 19:02:48 -05:00
jshipsey
20efc692fd
ranged
2020-11-08 18:52:22 -05:00
Sam
edff3a75c3
Made bow stay in BasicRanged state while autofiring.
2020-11-08 18:51:36 -05:00
jshipsey
92aa6a1b12
axe basic
2020-11-08 18:51:35 -05:00
jiminycrick
33e87de17e
Initial combo melee for axe M1
2020-11-08 18:48:48 -05:00
Christof Petig
b56919b123
Make waypoints persistent
...
Closes #549
2020-11-08 22:15:47 +01:00
AlKabir
6535deae9c
added two meat assets for mobs to drop
2020-11-07 23:34:20 -06:00
Sam
158fb36420
Other stupid fix.
2020-11-07 21:07:53 -06:00
Imbris
133ba82a9b
Use item_definition_id for weapon asset mapping
2020-11-07 16:44:11 -06:00
Sam
a4046872b2
Yeeted from code files.
2020-11-07 15:53:10 -06:00
AlKabir
77f3c7e3c5
Minor combat fixes (see issue 785)
2020-11-07 18:00:07 +00:00
TheBoredProgrammer64
b2ec207979
Revert "Removed toolCategory"
...
This reverts commit 5b0ff408176ff00408cc90f2516a90d5cd303e56.
2020-11-06 15:33:20 +00:00
Marcel Märtens
40f5afc2b0
ci cleanup, dependency update
2020-11-06 14:34:42 +01:00
Samuel Keiffer
44f676d90c
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
Sam
37ecb165ef
Addressed comments. Roll now only provides i-frames to melee attacks. It also reduces height of hitbox.
2020-11-05 20:40:20 -06:00
Snowram
262ceac060
fmt
2020-11-06 01:08:35 +01:00