3602 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Pfauenauge90	4d9327cef5	2 weapons	2020-03-18 21:05:20 +01:00
timokoesters	87c276b292	Add hard coded loot	2020-03-18 20:37:42 +01:00
Pfauenauge90	1cb2022d35	UI visuals	2020-03-18 19:51:48 +01:00
Pfauenauge90	43bae55961	coin/currency visuals	2020-03-18 12:05:36 +01:00
Pfauenauge90	70511e0f4e	background images	2020-03-18 01:43:55 +01:00
Pfauenauge90	04c8ed9a3c	armour slot bgs	2020-03-17 19:48:15 +01:00
Pfauenauge90	d752501db1	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-17 19:04:11 +01:00
Pfauenauge90	c9d09b8cdd	more slots	2020-03-17 19:04:06 +01:00
Joshua Barretto	f83b223178	Merge branch 'zesterer/small-fixes' into 'master' ... Small Fixes See merge request veloren/veloren!851	2020-03-17 17:48:43 +00:00
timokoesters	4741e41230	Add support for different models per weapon type	2020-03-17 18:28:07 +01:00
Joshua Barretto	95eeb7e145	Omitted unnecessary test	2020-03-17 16:37:39 +00:00
Pfauenauge90	431974cf8e	test armor slot	2020-03-17 17:02:50 +01:00
timokoesters	d6929ae0ea	Select newly created character automatically	2020-03-17 16:22:34 +01:00
timokoesters	08b44db1fc	Stop first person bounce in air	2020-03-17 16:08:53 +01:00
Pfauenauge90	b9f6dfac77	fixes	2020-03-17 16:07:20 +01:00
Pfauenauge90	40910b28e4	unclothed parts	2020-03-17 15:39:29 +01:00
Joshua Barretto	4580752e78	Fixed remaining pathfinding issues	2020-03-17 14:14:20 +00:00
timokoesters	19a09782a0	Add ability requirements system	2020-03-17 15:01:41 +01:00
Joshua Barretto	3559252a5e	Nicer point lights	2020-03-17 13:29:42 +00:00
timokoesters	f32eb1db75	fix dash attack angles, arrow damage and readd possession stick impl	2020-03-17 14:15:39 +01:00
Pfauenauge90	7ded921ecc	more UI visuals	2020-03-16 22:58:19 +01:00
timokoesters	b040e18246	Fix body parts not changing	2020-03-16 22:06:23 +01:00
Pfauenauge90	11e4289f28	small fixes	2020-03-16 20:50:01 +01:00
Pfauenauge90	da91ce0640	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-16 19:56:20 +01:00
Pfauenauge90	2e41b59282	removed character window and questlog	2020-03-16 19:56:15 +01:00
timokoesters	b3057add42	Smaller damage and health numbers	2020-03-16 19:55:12 +01:00
Pfauenauge90	b9f61d4e7a	UI colourable in the code, stats window	2020-03-16 18:55:43 +01:00
Pfauenauge90	ab8b83f8d6	more bag parts	2020-03-16 18:55:31 +01:00
timokoesters	d5db1f6ca0	Add dash ability to sword M2	2020-03-16 16:34:53 +01:00
timokoesters	81591fcaf7	Make npcs attack again	2020-03-16 14:27:52 +01:00
timokoesters	1279f70184	Add shield item	2020-03-16 13:40:14 +01:00
timokoesters	4195273cf9	Adjust first person camera and underwater wield orientation	2020-03-16 13:19:51 +01:00
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