3364 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Pfauenauge90	44d3f4c4ac	fix	2020-03-19 20:01:31 +01:00
Pfauenauge90	ce5eb2e2ab	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-19 19:34:05 +01:00
Pfauenauge90	3c0e070ed0	stack numbers	2020-03-19 19:33:59 +01:00
timokoesters	83be1226ef	Set dash direction based on look_dir	2020-03-19 18:33:10 +01:00
Pfauenauge90	e16bb66fb3	fix	2020-03-19 18:19:05 +01:00
Pfauenauge90	b9b2833e97	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-19 18:11:48 +01:00
Pfauenauge90	466b80e8a8	added const tweaker	2020-03-19 18:11:45 +01:00
timokoesters	49b0af10a9	Regular naming scheme for armor assets	2020-03-19 17:47:37 +01:00
timokoesters	bb1b3ceabc	Fix syncing amount	2020-03-19 17:44:32 +01:00
timokoesters	22652cfa37	Restore old boost stick behavior	2020-03-19 17:01:58 +01:00
timokoesters	6c129c9b8d	Fix amounts out of range	2020-03-19 16:51:50 +01:00
Pfauenauge90	0bb0d5e7a6	Update bag.rs	2020-03-19 16:43:11 +01:00
Pfauenauge90	041277917b	Update bag.rs	2020-03-19 15:49:32 +01:00
timokoesters	449ae22730	Add inventory stacking	2020-03-19 14:32:17 +01:00
Pfauenauge90	d863e12235	swift leather armour parts	2020-03-19 14:17:53 +01:00
timokoesters	2b22b84a33	Give bandits and travelers different armor	2020-03-19 11:21:37 +01:00
Pfauenauge90	509615c15b	npc armour	2020-03-18 23:09:58 +01:00
Imbris	1a484410ca	Delete Vel and Ori on the client when they are removed on the server	2020-03-18 17:01:51 -04:00
timokoesters	038f655269	fix pfau's broken commit	2020-03-18 21:12:55 +01:00
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
timokoesters	4741e41230	Add support for different models per weapon type	2020-03-17 18:28:07 +01: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
timokoesters	19a09782a0	Add ability requirements system	2020-03-17 15:01:41 +01: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