3332 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
timokoesters	897f925c18	Go to idle state when picking items up	2020-03-20 20:23:04 +01:00
timokoesters	d28b5669aa	Remove all warnings	2020-03-20 15:45:36 +01:00
timokoesters	358469311a	Experimental tweeks to triplestrike	2020-03-20 15:06:33 +01:00
Pfauenauge90	0540469c02	placement fix	2020-03-20 14:55:31 +01:00
timokoesters	e6c6749fb0	Ranged weapons now give xp on kill and also make enemies angry	2020-03-20 14:26:18 +01:00
Pfauenauge90	dd55829262	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-20 13:02:35 +01:00
Pfauenauge90	3134d7a2c2	new loading screen bg	2020-03-20 13:01:31 +01:00
timokoesters	963a8d1556	Arrows shouldn't turn into loot, staff shoots fireballs again	2020-03-20 11:25:53 +01:00
jshipsey	6b341f7951	hammer go smash	2020-03-20 02:38:53 -04:00
jshipsey	b41e91cbb4	axe, hammer proper wields	2020-03-20 01:27:54 -04:00
Pfauenauge90	9b5aaaf50e	added chest drops	2020-03-20 01:11:02 +01:00
Adam Whitehurst	e36746c582	Oops	2020-03-19 16:14:04 -07:00
Adam Whitehurst	4d6f955bf2	update triple_strike	2020-03-19 15:40:03 -07:00
Pfauenauge90	b09dba3321	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-19 22:36:45 +01:00
Pfauenauge90	d902212676	item images	2020-03-19 22:36:40 +01:00
timokoesters	f90fb41d41	Make orientation not dependend on camera dir while wielded	2020-03-19 22:03:17 +01:00
timokoesters	903c3df5a3	Fix weapon not updating after swapping to a weapon of the same type	2020-03-19 20:57:36 +01:00
timokoesters	57c3d5442d	Hide player body after death	2020-03-19 20:36:19 +01:00
Pfauenauge90	24f3aab1d4	fix	2020-03-19 20:01:31 +01:00
Pfauenauge90	875f23c4b1	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-19 19:34:05 +01:00
Pfauenauge90	6035db3666	stack numbers	2020-03-19 19:33:59 +01:00
timokoesters	ae5f0b2f12	Set dash direction based on look_dir	2020-03-19 18:33:10 +01:00
Pfauenauge90	ea01a4d25e	fix	2020-03-19 18:19:05 +01:00
Pfauenauge90	7dbca469c0	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-19 18:11:48 +01:00
Pfauenauge90	4d5721c35f	added const tweaker	2020-03-19 18:11:45 +01:00
timokoesters	f25c066795	Regular naming scheme for armor assets	2020-03-19 17:47:37 +01:00
timokoesters	0e9a96e8af	Fix syncing amount	2020-03-19 17:44:32 +01:00
timokoesters	4271ddb4e4	Restore old boost stick behavior	2020-03-19 17:01:58 +01:00
timokoesters	4ecf225a2c	Fix amounts out of range	2020-03-19 16:51:50 +01:00
Pfauenauge90	0d298fc67c	Update bag.rs	2020-03-19 16:43:11 +01:00
Pfauenauge90	b8bdd59c20	Update bag.rs	2020-03-19 15:49:32 +01:00
timokoesters	414f2564ee	Add inventory stacking	2020-03-19 14:32:17 +01:00
Pfauenauge90	77e2524e83	swift leather armour parts	2020-03-19 14:17:53 +01:00
timokoesters	af80031568	Give bandits and travelers different armor	2020-03-19 11:21:37 +01:00
Pfauenauge90	7cf24fe8b6	npc armour	2020-03-18 23:09:58 +01:00
Imbris	2a52245e86	Delete Vel and Ori on the client when they are removed on the server	2020-03-18 17:01:51 -04:00
timokoesters	62148bcd92	fix pfau's broken commit	2020-03-18 21:12:55 +01:00
Pfauenauge90	f57497fda4	2 weapons	2020-03-18 21:05:20 +01:00
timokoesters	ef6f9ef8e8	Add hard coded loot	2020-03-18 20:37:42 +01:00
Pfauenauge90	99f1699f15	UI visuals	2020-03-18 19:51:48 +01:00
Pfauenauge90	3ae1f8823b	coin/currency visuals	2020-03-18 12:05:36 +01:00
Pfauenauge90	c4344f77c5	background images	2020-03-18 01:43:55 +01:00
Pfauenauge90	5be66413b6	armour slot bgs	2020-03-17 19:48:15 +01:00
Pfauenauge90	b39bba9b41	Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat	2020-03-17 19:04:11 +01:00
Pfauenauge90	3696647ba1	more slots	2020-03-17 19:04:06 +01:00
timokoesters	4b7eacfdc6	Add support for different models per weapon type	2020-03-17 18:28:07 +01:00
Pfauenauge90	92c20ea479	test armor slot	2020-03-17 17:02:50 +01:00
timokoesters	45f44a158f	Select newly created character automatically	2020-03-17 16:22:34 +01:00
timokoesters	d13c218dca	Stop first person bounce in air	2020-03-17 16:08:53 +01:00
Pfauenauge90	90ce59dabe	fixes	2020-03-17 16:07:20 +01:00