3317 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
timokoesters	87acc01d48	Readd ranged and debug boost. Add bouncing while running in first person	2020-03-16 12:32:57 +01:00
timokoesters	1e9f081f10	include chest models	2020-03-15 19:53:58 +01:00
Pfauenauge90	db6099a62f	reenabled inventory slots	2020-03-15 19:48:02 +01:00
timokoesters	1f78344d6f	Move equipment from loadout into body	2020-03-15 19:44:47 +01:00
Pfauenauge90	817cd24d54	minimap scale	2020-03-15 16:53:28 +01:00
Pfauenauge90	492db3ac5f	minimap position	2020-03-15 16:53:28 +01:00
Pfauenauge90	19bcbbbd9a	minimap assets	2020-03-15 16:53:28 +01:00
Pfauenauge90	7b77064539	mmap visuals	2020-03-15 16:52:38 +01:00
Pfauenauge90	db96930ad1	item images	2020-03-15 16:51:55 +01:00
Pfauenauge90	6e2015957a	plate armour	2020-03-15 16:51:55 +01:00
Pfauenauge90	bc34a7cce8	more assa armour parts	2020-03-15 16:51:55 +01:00
Pfauenauge	077ae66281	new assassin shoulder armor	2020-03-15 16:51:55 +01:00
Pfauenauge90	2f3c67a76f	more armour	2020-03-15 16:51:55 +01:00
Joshua Barretto	98e8c79b1c	Added armour items and equipping of armour	2020-03-15 16:51:54 +01:00
Pfauenauge90	898150bd23	plate chest armour	2020-03-15 16:50:37 +01:00
Pfauenauge90	658b6465b2	assassin armour	2020-03-15 16:50:37 +01:00
Imbris	dc88e33a63	maybe fix hotreload panic	2020-03-15 16:50:37 +01:00
Pfauenauge90	caf4159463	UI changes	2020-03-15 16:50:37 +01:00
Pfauenauge90	3738fe45f7	better item desc	2020-03-15 16:42:09 +01:00
Pfauenauge90	bf1c46d596	item images	2020-03-15 16:42:09 +01:00
Pfauenauge90	913393963a	plate armour	2020-03-15 16:42:09 +01:00
Pfauenauge90	6cb68fabea	more assa armour parts	2020-03-15 16:42:09 +01:00
Pfauenauge	0c49cd8596	new assassin shoulder armor	2020-03-15 16:42:09 +01:00
Pfauenauge	e7780e5f5b	Update item_image_manifest.ron	2020-03-15 16:42:09 +01:00
Pfauenauge90	aa36082eed	more armour	2020-03-15 16:42:09 +01:00
Joshua Barretto	e20feeeb0c	Added armour items and equipping of armour	2020-03-15 16:42:09 +01:00
Pfauenauge90	e80750bc53	plate chest armour	2020-03-15 15:53:51 +01:00
Pfauenauge90	5a962771d9	assassin armour	2020-03-15 15:53:51 +01:00
Pfauenauge90	1b170f70c3	Even less blending.	2020-03-15 15:53:51 +01:00
Pfauenauge90	0e7f3a6b00	Update vol.rs	2020-03-15 15:53:51 +01:00
Imbris	6d0ec984c8	maybe fix hotreload panic	2020-03-15 15:53:51 +01:00
timokoesters	4e281e22b7	Merge branch 'clientstates' of gitlab.com:veloren/veloren into clientstates	2020-03-15 15:43:52 +01:00
timokoesters	aa963b7686	Merge remote-tracking branch 'origin/master' into clientstates	2020-03-15 15:27:06 +01:00
AdamWhitehurst	6078b9a468	Merge branch 'clientstates' of https://gitlab.com/veloren/veloren into clientstates	2020-03-15 08:24:40 -06:00
timokoesters	447617dc69	Make durations and damage depend on weapon type	2020-03-15 14:34:17 +01:00
AdamWhitehurst	7520798567	Damage increase, remove lines	2020-03-15 07:26:42 -06:00
AdamWhitehurst	52059d83d3	add knockback localevent	2020-03-15 07:20:42 -06:00
Songtronix	b9639f2454	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	e72f0c6d12	fix: do not depend on hash file during runtime	2020-03-15 09:02:56 +01:00
timokoesters	598a4c6cbb	Add loadout struct for info on weapon configurations	2020-03-14 22:33:20 +01:00
AdamWhitehurst	7dfe00b674	Finish state struct data refactor	2020-03-14 15:17:27 -06:00
AdamWhitehurst	ee706fa32a	Tweaking timed_combo	2020-03-14 13:04:04 -06:00
AdamWhitehurst	6fc94c22ba	Update timed combo, add CharacerBehavior trait	2020-03-14 12:50:07 -06:00
timokoesters	fe19698d52	Make abilities depend on weapon	2020-03-14 16:40:29 +01:00
Adam Whitehurst	ac1c279a9b	Begin TripleStrike Logic	2020-03-12 08:22:42 -07:00
Adam Whitehurst	00e4ad61f7	add ToolData::get_primary_abilities()	2020-03-12 07:47:27 -07:00
Adam Whitehurst	68dd8c578f	Add some ability costs	2020-03-12 07:36:02 -07:00
Adam Whitehurst	990ea5c5a2	Add triple_strike behavior to cs behavior sys	2020-03-12 07:34:24 -07:00
Adam Whitehurst	772f7ff92d	Remove can_transition and begin triple_strike	2020-03-12 07:33:19 -07:00
Adam Whitehurst	3cb288bc8c	Add TripleStrike	2020-03-12 07:25:06 -07:00