Samuel Keiffer
bc874905de
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
10189aad74
Make Axe Spin More Realistic
2020-11-13 21:49:12 -05:00
Imbris
7d22d21877
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
f2581eccdb
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
a2ba719ba2
Remove randomization of species and body_type with the randomize button in char creation
2020-11-13 19:43:32 -05:00
Sam
479bda3895
Fixed tests. Addressed comments.
2020-11-13 10:41:34 -06:00
Sam
0752157935
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
c42bdc3641
Remove ability map from top level functions
2020-11-12 21:24:35 -06:00
Sam
275deabae9
Started moving loading of ability manifest to an ecs variable.
2020-11-12 21:24:34 -06:00
Sam
d948777176
Abilities are now loaded from .ron files.
2020-11-12 21:24:34 -06:00
Sam
838c62f56b
Added projectile constructor. Removed a bunch of cloning.
2020-11-12 21:24:32 -06:00
Sam
b4135ab3e2
Changed how buffs were constructed on projectiles.
2020-11-12 21:24:32 -06:00
Sam
84627cfe88
Added ron files for unique and WIP tools.
2020-11-12 21:24:31 -06:00
Imbris
2dfebb8978
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
ebaa35ea79
Display averaged busy dt
2020-11-11 23:26:13 -05:00
Imbris
69d019e5ac
Make fps display and specification more precise
2020-11-11 21:47:22 -05:00
Imbris
293ebde892
Only limit negative z velocity by gravity instead of total negative z velocity
2020-11-11 20:09:07 -05:00
Snowram
49ab17ce8c
Adds a speed variable to charged states
2020-11-11 22:06:05 +01:00
Snowram
2eebc29e21
Addressed comments
2020-11-11 22:03:54 +01:00
Snowram
71e35a6f02
Adds a speed stat to weapons
2020-11-11 22:03:53 +01:00
Imbris
8cf9121e6b
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
0422c3391d
Improve NPC aiming and humanoid hitboxes
2020-11-11 04:36:40 +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
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
jshipsey
34b05e8229
tweaks
2020-11-09 18:32:23 -05:00
Joshua Barretto
4944eb5f59
Better humidity, better snow trees
2020-11-09 15:06:37 +00:00
Sam
91082b3167
Slight balance tweaks.
2020-11-08 19:33:24 -06: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
Christof Petig
e288677af0
Make waypoints persistent
...
Closes #549
2020-11-08 22:15:47 +01:00
AlKabir
f5e5511057
added two meat assets for mobs to drop
2020-11-07 23:34:20 -06:00
Sam
6879c880fe
Other stupid fix.
2020-11-07 21:07:53 -06:00
Imbris
db6eeaeb6c
Use item_definition_id for weapon asset mapping
2020-11-07 16:44:11 -06:00
Sam
e392e37c47
Yeeted from code files.
2020-11-07 15:53:10 -06:00
AlKabir
ee64934c94
Minor combat fixes (see issue 785)
2020-11-07 18:00:07 +00:00
TheBoredProgrammer64
d195eaf701
Revert "Removed toolCategory"
...
This reverts commit 5b0ff408176ff00408cc90f2516a90d5cd303e56.
2020-11-06 15:33:20 +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
Sam
bd6acca55c
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
4f6aae5459
fmt
2020-11-06 01:08:35 +01:00
Monty Marz
8da2871897
potion buff
2020-11-06 01:08:34 +01:00
Snowram
4c30dadf47
Adresses comment
2020-11-06 01:08:34 +01:00
Snowram
c9b3b5b904
Buff stonegolem, nerf giants, add missing sfxs
2020-11-06 01:08:33 +01:00
