Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,365 Commits 151 Branches 18 Tags
Commit Graph

3365 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pfauenauge90
f167825709 reenabled inventory slots 2020-03-15 19:48:02 +01:00
timokoesters
b159a93664 Move equipment from loadout into body 2020-03-15 19:44:47 +01:00
Pfauenauge90
870333f04f minimap scale 2020-03-15 16:53:28 +01:00
Pfauenauge90
67aea90cea minimap position 2020-03-15 16:53:28 +01:00
Pfauenauge90
4a5db0297a minimap assets 2020-03-15 16:53:28 +01:00
Pfauenauge90
36f97183a2 mmap visuals 2020-03-15 16:52:38 +01:00
Pfauenauge90
8ee2a58bbb item images 2020-03-15 16:51:55 +01:00
Pfauenauge90
4ecb0c2c67 plate armour 2020-03-15 16:51:55 +01:00
Pfauenauge90
cc20cc47af more assa armour parts 2020-03-15 16:51:55 +01:00
Pfauenauge
e76fb108fb new assassin shoulder armor 2020-03-15 16:51:55 +01:00
Pfauenauge90
7e378464a6 more armour 2020-03-15 16:51:55 +01:00
Joshua Barretto
8fd42651fc Added armour items and equipping of armour 2020-03-15 16:51:54 +01:00
Pfauenauge90
d86e1181ed plate chest armour 2020-03-15 16:50:37 +01:00
Pfauenauge90
9e3a11ddc1 assassin armour 2020-03-15 16:50:37 +01:00
Imbris
2f3966942c maybe fix hotreload panic 2020-03-15 16:50:37 +01:00
Pfauenauge90
056c6338b2 UI changes 2020-03-15 16:50:37 +01:00
Pfauenauge90
749d13ac6d better item desc 2020-03-15 16:42:09 +01:00
Pfauenauge90
d2859e894c item images 2020-03-15 16:42:09 +01:00
Pfauenauge90
749a71014e plate armour 2020-03-15 16:42:09 +01:00
Pfauenauge90
8a27575ce9 more assa armour parts 2020-03-15 16:42:09 +01:00
Pfauenauge
3eff61fa80 new assassin shoulder armor 2020-03-15 16:42:09 +01:00
Pfauenauge
d51efe9ca7 Update item_image_manifest.ron 2020-03-15 16:42:09 +01:00
Pfauenauge90
c1abc3aa8d more armour 2020-03-15 16:42:09 +01:00
Joshua Barretto
b087e1845a Added armour items and equipping of armour 2020-03-15 16:42:09 +01:00
Pfauenauge90
dd0aa8e7c3 plate chest armour 2020-03-15 15:53:51 +01:00
Pfauenauge90
33c227bb48 assassin armour 2020-03-15 15:53:51 +01:00
Pfauenauge90
760880464f Even less blending. 2020-03-15 15:53:51 +01:00
Pfauenauge90
48674114ce Update vol.rs 2020-03-15 15:53:51 +01:00
Imbris
70e7291e01 maybe fix hotreload panic 2020-03-15 15:53:51 +01:00
timokoesters
914d1979b7 Merge branch 'clientstates' of gitlab.com:veloren/veloren into clientstates 2020-03-15 15:43:52 +01:00
timokoesters
583aa1e482 Merge remote-tracking branch 'origin/master' into clientstates 2020-03-15 15:27:06 +01:00
AdamWhitehurst
c67e688464 Merge branch 'clientstates' of https://gitlab.com/veloren/veloren into clientstates 2020-03-15 08:24:40 -06:00
timokoesters
e025363199 Make durations and damage depend on weapon type 2020-03-15 14:34:17 +01:00
AdamWhitehurst
730344e04d Damage increase, remove lines 2020-03-15 07:26:42 -06:00
AdamWhitehurst
7051230f82 add knockback localevent 2020-03-15 07:20:42 -06:00
Songtronix
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
Songtronix
5cbd629118 fix: do not depend on hash file during runtime 2020-03-15 09:02:56 +01:00
timokoesters
b5c6952fb8 Add loadout struct for info on weapon configurations 2020-03-14 22:33:20 +01:00
AdamWhitehurst
419662c9b4 Finish state struct data refactor 2020-03-14 15:17:27 -06:00
AdamWhitehurst
4686c3bc96 Tweaking timed_combo 2020-03-14 13:04:04 -06:00
AdamWhitehurst
86c12f3961 Update timed combo, add CharacerBehavior trait 2020-03-14 12:50:07 -06:00
timokoesters
dac8eeb295 Make abilities depend on weapon 2020-03-14 16:40:29 +01:00
Adam Whitehurst
51efa2ae31 Begin TripleStrike Logic 2020-03-12 08:22:42 -07:00
Adam Whitehurst
5e8548968e add ToolData::get_primary_abilities() 2020-03-12 07:47:27 -07:00
Adam Whitehurst
6e88349c40 Add some ability costs 2020-03-12 07:36:02 -07:00
Adam Whitehurst
44d5fc5087 Add triple_strike behavior to cs behavior sys 2020-03-12 07:34:24 -07:00
Adam Whitehurst
aab87741ba Remove can_transition and begin triple_strike 2020-03-12 07:33:19 -07:00
Adam Whitehurst
ccb3141c40 Add TripleStrike 2020-03-12 07:25:06 -07:00
Adam Whitehurst
8e27a07bd3 TripleAttack -> TimedCombo 
(it wasnt the right logic for the tiple attack)
 2020-03-12 05:16:40 -07:00
Marcel
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