3429 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Pfauenauge90	f88b848238	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-16 19:56:20 +01:00
Pfauenauge90	fe2d6c09bf	removed character window and questlog	2020-03-16 19:56:15 +01:00
timokoesters	01b73cc110	Smaller damage and health numbers	2020-03-16 19:55:12 +01:00
Pfauenauge90	36180f780c	UI colourable in the code, stats window	2020-03-16 18:55:43 +01:00
Pfauenauge90	d511f79e0f	more bag parts	2020-03-16 18:55:31 +01:00
timokoesters	5d26545174	Add dash ability to sword M2	2020-03-16 16:34:53 +01:00
timokoesters	d9e980e04c	Make npcs attack again	2020-03-16 14:27:52 +01:00
timokoesters	b5db94d5a1	Add shield item	2020-03-16 13:40:14 +01:00
timokoesters	eda349189d	Adjust first person camera and underwater wield orientation	2020-03-16 13:19:51 +01:00
timokoesters	d48dc8fa19	Readd ranged and debug boost. Add bouncing while running in first person	2020-03-16 12:32:57 +01:00
timokoesters	9b15027f60	include chest models	2020-03-15 19:53:58 +01:00
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