|
|
8a27575ce9
|
more assa armour parts
|
2020-03-15 16:42:09 +01:00 |
|
|
|
3eff61fa80
|
new assassin shoulder armor
|
2020-03-15 16:42:09 +01:00 |
|
|
|
d51efe9ca7
|
Update item_image_manifest.ron
|
2020-03-15 16:42:09 +01:00 |
|
|
|
c1abc3aa8d
|
more armour
|
2020-03-15 16:42:09 +01:00 |
|
|
|
b087e1845a
|
Added armour items and equipping of armour
|
2020-03-15 16:42:09 +01:00 |
|
|
|
dd0aa8e7c3
|
plate chest armour
|
2020-03-15 15:53:51 +01:00 |
|
|
|
33c227bb48
|
assassin armour
|
2020-03-15 15:53:51 +01:00 |
|
|
|
760880464f
|
Even less blending.
|
2020-03-15 15:53:51 +01:00 |
|
|
|
48674114ce
|
Update vol.rs
|
2020-03-15 15:53:51 +01:00 |
|
|
|
70e7291e01
|
maybe fix hotreload panic
|
2020-03-15 15:53:51 +01:00 |
|
|
|
914d1979b7
|
Merge branch 'clientstates' of gitlab.com:veloren/veloren into clientstates
|
2020-03-15 15:43:52 +01:00 |
|
|
|
583aa1e482
|
Merge remote-tracking branch 'origin/master' into clientstates
|
2020-03-15 15:27:06 +01:00 |
|
|
|
c67e688464
|
Merge branch 'clientstates' of https://gitlab.com/veloren/veloren into clientstates
|
2020-03-15 08:24:40 -06:00 |
|
|
|
e025363199
|
Make durations and damage depend on weapon type
|
2020-03-15 14:34:17 +01:00 |
|
|
|
730344e04d
|
Damage increase, remove lines
|
2020-03-15 07:26:42 -06:00 |
|
|
|
7051230f82
|
add knockback localevent
|
2020-03-15 07:20:42 -06:00 |
|
|
|
5f7a49d2d4
|
Merge branch 'songtronix/remove-runtime-dep' into 'master'
fix: do not depend on hash file during runtime
See merge request veloren/veloren!849
|
2020-03-15 08:34:15 +00:00 |
|
|
|
5cbd629118
|
fix: do not depend on hash file during runtime
|
2020-03-15 09:02:56 +01:00 |
|
|
|
b5c6952fb8
|
Add loadout struct for info on weapon configurations
|
2020-03-14 22:33:20 +01:00 |
|
|
|
419662c9b4
|
Finish state struct data refactor
|
2020-03-14 15:17:27 -06:00 |
|
|
|
4686c3bc96
|
Tweaking timed_combo
|
2020-03-14 13:04:04 -06:00 |
|
|
|
86c12f3961
|
Update timed combo, add CharacerBehavior trait
|
2020-03-14 12:50:07 -06:00 |
|
|
|
dac8eeb295
|
Make abilities depend on weapon
|
2020-03-14 16:40:29 +01:00 |
|
|
|
51efa2ae31
|
Begin TripleStrike Logic
|
2020-03-12 08:22:42 -07:00 |
|
|
|
5e8548968e
|
add ToolData::get_primary_abilities()
|
2020-03-12 07:47:27 -07:00 |
|
|
|
6e88349c40
|
Add some ability costs
|
2020-03-12 07:36:02 -07:00 |
|
|
|
44d5fc5087
|
Add triple_strike behavior to cs behavior sys
|
2020-03-12 07:34:24 -07:00 |
|
|
|
aab87741ba
|
Remove can_transition and begin triple_strike
|
2020-03-12 07:33:19 -07:00 |
|
|
|
ccb3141c40
|
Add TripleStrike
|
2020-03-12 07:25:06 -07:00 |
|
|
|
8e27a07bd3
|
TripleAttack -> TimedCombo
(it wasnt the right logic for the tiple attack)
|
2020-03-12 05:16:40 -07:00 |
|
|
|
7ad3cfa4d1
|
Fix: Make the dropped item collection range match the world item range limit.
|
2020-03-12 11:54:23 +09:00 |
|
|
|
425c7052f9
|
Merge branch 'shandley/inventory-full-handling' into 'master'
Feedback when collecting an item while inventory is full
Closes #459
See merge request veloren/veloren!847
|
2020-03-11 10:31:00 +00:00 |
|
|
|
2864e7603a
|
Add audio and chat message feedback when the player attempts to collect something while thier inventory is full.
|
2020-03-11 10:30:59 +00:00 |
|
|
|
4eed065bd9
|
Merge branch 'shandley/collect-block-mousedown-only' into 'master'
Check for the mousedown state before trying to collect an item via secondary mouse click.
See merge request veloren/veloren!846
|
2020-03-11 08:07:34 +00:00 |
|
|
|
f595dad1f8
|
Check for the mousedown state before trying to collect an item via secondary mouse click.
|
2020-03-11 15:39:46 +09:00 |
|
|
|
a4bf2f9ca8
|
Merge branch 'mckol/update-ci' into 'master'
Made the CI fail if Cargo.lock would be changed by cargo build
Closes #110
See merge request veloren/veloren!845
|
2020-03-11 00:05:34 +00:00 |
|
|
|
fa1f24ec2e
|
Merge branch 'imbris/se-latency' into 'master'
Rearrange some operations in the server tick to reduce clientside latency of ServerEvent mediated effects
See merge request veloren/veloren!840
|
2020-03-10 23:21:57 +00:00 |
|
|
|
665795d1c9
|
Made the CI fail if Cargo.lock isn't up-to-date
|
2020-03-10 23:32:33 +01:00 |
|
|
|
2dddc2e692
|
Merge branch 'capucho/voxygen-logout-timeout' into 'master'
FIX #513 logout timeout
See merge request veloren/veloren!837
|
2020-03-10 22:12:29 +00:00 |
|
|
|
77c946d834
|
temp allow failure in macos
|
2020-03-10 22:03:29 +00:00 |
|
|
|
1437d51c67
|
removed merge artifact
|
2020-03-10 21:09:38 +00:00 |
|
|
|
b4969e0233
|
Merge branch 'capucho/voxygen-logout-timeout' of gitlab.com:veloren/veloren into capucho/voxygen-logout-timeout
Fixed conflicts
|
2020-03-10 21:06:08 +00:00 |
|
|
|
6625a356ef
|
Rebased on master and moved logout message to events
|
2020-03-10 21:04:13 +00:00 |
|
|
|
de48300c78
|
Merge branch 'controller' into 'master'
Controller support
Closes #20
See merge request veloren/veloren!750
|
2020-03-10 21:00:13 +00:00 |
|
|
|
aec086a10d
|
Added Controller support
|
2020-03-10 21:00:13 +00:00 |
|
|
|
7aa102415e
|
Merge branch 'shandley/pickup-player-relative' into 'master'
Constrain item pickup range
See merge request veloren/veloren!843
|
2020-03-10 20:50:04 +00:00 |
|
|
|
fdefcf3926
|
Check that a targeted collectible is within a certain pickup range of the character before highlighting it
|
2020-03-10 20:50:04 +00:00 |
|
|
|
62a5a0ae2c
|
Switch states instead of popping
|
2020-03-10 20:34:50 +00:00 |
|
|
|
d8e65318cb
|
Fix the spam on disconnect
|
2020-03-10 20:34:50 +00:00 |
|
|
|
cc5845d756
|
Proper fix to the logout timeout problem using Disconnect ACK
|
2020-03-10 20:34:50 +00:00 |
|
