3522 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Joshua Barretto	72e483df00	Merge branch 'zesterer/small-fixes' into 'master' ... Small Fixes See merge request veloren/veloren!851	2020-03-17 17:48:43 +00:00
timokoesters	4b7eacfdc6	Add support for different models per weapon type	2020-03-17 18:28:07 +01:00
Joshua Barretto	99bc1825d3	Omitted unnecessary test	2020-03-17 16:37:39 +00: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
Pfauenauge90	e0a4bcc2b2	unclothed parts	2020-03-17 15:39:29 +01:00
Joshua Barretto	5c58fd318d	Fixed remaining pathfinding issues	2020-03-17 14:14:20 +00:00
timokoesters	2880048312	Add ability requirements system	2020-03-17 15:01:41 +01:00
Joshua Barretto	6b13f305eb	Nicer point lights	2020-03-17 13:29:42 +00:00
timokoesters	c6fc1a109f	fix dash attack angles, arrow damage and readd possession stick impl	2020-03-17 14:15:39 +01:00
Pfauenauge90	53975b9152	more UI visuals	2020-03-16 22:58:19 +01:00
timokoesters	298c24918e	Fix body parts not changing	2020-03-16 22:06:23 +01:00
Pfauenauge90	d5826984d3	small fixes	2020-03-16 20:50:01 +01:00
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