4461 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Joshua Barretto	3c1fddfb0b	Merge branch 'zesterer/server-fixes' into 'master' ... Server bug fixes See merge request veloren/veloren!1159	2020-07-05 19:41:30 +00:00
Marcel	4e45ecb17c	Merge branch 'xMAC94x/network-small-fixes' into 'master' ... X mac94x/network small fixes See merge request veloren/veloren!1160	2020-07-05 19:40:22 +00:00
Joshua Barretto	3bef87016b	Merge branch 'qutrin/another-fix' into 'master' ... Fix loot table (again) See merge request veloren/veloren!1157	2020-07-05 19:13:58 +00:00
Joshua Barretto	dd2a81b1f3	Increased network test timeouts	2020-07-05 19:56:06 +01:00
Marcel Märtens	3a6319f2f6	compress everything	2020-07-05 20:14:47 +02:00
Joshua Barretto	a9f862ee95	Fixed multiple char select bug	2020-07-05 18:05:00 +01:00
Marcel Märtens	092b1e0d6c	small fix	2020-07-05 18:54:34 +02:00
Piotr Korgól	713d0c5e8a	Add a test for the loot table's validity	2020-07-05 18:52:36 +02:00
Piotr Korgól	d0b7958309	Fix loot table (again)	2020-07-05 18:52:34 +02:00
Joshua Barretto	616dd29df1	Merge branch 'zesterer/bombs' into 'master' ... Added bombs, training dummies, throwable items, more block kinds, weaker explosions See merge request veloren/veloren!1155	2020-07-05 16:45:19 +00:00
Joshua Barretto	43f75f2f54	Removed bomb timeout	2020-07-05 16:15:51 +01:00
Joshua Barretto	fd39ee97bc	Added training dummies	2020-07-05 16:15:51 +01:00
Joshua Barretto	92c9db5291	Made fluids block explosions	2020-07-05 16:15:51 +01:00
Joshua Barretto	38c422bef7	Added bombs to loot table	2020-07-05 16:15:51 +01:00
Joshua Barretto	2f6a618d5a	Added bombs, throwable items, more block kinds, weaker explosions	2020-07-05 16:15:48 +01:00
Justin Shipsey	1c7c04141a	Merge branch 'snowram/quad-rework' into 'master' ... quadruped rewrite See merge request veloren/veloren!1116	2020-07-05 15:00:14 +00:00
jshipsey	50fcd6c6a3	remove slowmo test mode	2020-07-05 10:00:44 -04:00
jshipsey	2c14b2f891	clippy fixes	2020-07-05 09:39:56 -04:00
jshipsey	62eb66173f	tweaks and fixes	2020-07-05 09:39:55 -04:00
Snowram	1b778ca191	Various small improvements to anims and models	2020-07-05 09:38:15 -04:00
Joshua Barretto	8508b5177b	Velocity-corrected bezier pathfinding control, swimming control	2020-07-05 09:38:15 -04:00
jshipsey	ca9ae13527	more latitude tilt, better attack anims, addressed aesthetic concerns, deleted dead assets	2020-07-05 09:38:15 -04:00
Joshua Barretto	8a0b7fd173	Smoother pathfinding for fast animals	2020-07-05 09:38:14 -04:00
jshipsey	014cab0257	remove warnings, rebase fix	2020-07-05 09:38:14 -04:00
jshipsey	e97be07e97	minor changes to account for movement speeds	2020-07-05 09:38:14 -04:00
Joshua Barretto	177bd7a128	More tolerant pathfinding	2020-07-05 09:38:14 -04:00
Joshua Barretto	db26c10299	Run tilting, per-species running speed	2020-07-05 09:38:14 -04:00
jshipsey	e689de3c8a	better everything	2020-07-05 09:38:14 -04:00
Snowram	86b2272176	Salamander model fixes	2020-07-05 09:38:14 -04:00
jshipsey	9ef383ff03	simplify quadmed run, integrate dampener variable	2020-07-05 09:38:14 -04:00
Snowram	ce9cd29720	Add offset to quadmed legs + various fixes and improvements	2020-07-05 09:38:14 -04:00
jshipsey	f164bd2280	placeholder attack anim	2020-07-05 09:38:14 -04:00
jshipsey	894a823aad	orientation tilt, make run frequency proportional to species size	2020-07-05 09:38:14 -04:00
jshipsey	a7c23ea5be	custom scaling by species	2020-07-05 09:38:14 -04:00
jshipsey	94ab3665d5	pangolin and special pangolin variable	2020-07-05 09:38:14 -04:00
jshipsey	d8fff8833e	quadlow spawn in world, continued adjustments	2020-07-05 09:38:14 -04:00
jshipsey	c5f7a60f3b	more run animation work, adjusting pivots	2020-07-05 09:38:14 -04:00
jshipsey	03c1a97ba9	animation tweaks, fix some idle	2020-07-05 09:38:14 -04:00
jshipsey	db64972e42	starting on trot, removing some warnings	2020-07-05 09:38:14 -04:00
Snowram	648e140be3	Add wolf, frostfang and mouflon npcs	2020-07-05 09:38:14 -04:00
Snowram	4acdc24df9	Add tarasque and grolgar improvements	2020-07-05 09:38:14 -04:00
unknown	0de4b6b7f9	Makes anim hotload work for quadlow	2020-07-05 09:38:14 -04:00
Snowram	b1f4e4b9c1	Add new tusk ram model	2020-07-05 09:38:13 -04:00
Snowram	c22d543dd2	Add rock snapper mob	2020-07-05 09:38:13 -04:00
Snowram	1be42a8f85	Add tortoise mob	2020-07-05 09:38:13 -04:00
Snowram	016b05cf38	Add new grolgar model	2020-07-05 09:38:13 -04:00
Snowram	c7df12d2ea	Set new lion model offsets, fix some jaws	2020-07-05 09:38:13 -04:00
unknown	4b493b196c	Add asp mob	2020-07-05 09:38:13 -04:00
jshipsey	59777ee688	more quadmed run work	2020-07-05 09:38:13 -04:00
jshipsey	e362749fc7	more progress on on quad_med run	2020-07-05 09:38:13 -04:00