2015 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Joshua Barretto	d42485238e	Added town road construction	2019-08-31 11:44:52 +01:00
Joshua Barretto	aaade23eef	Better warping	2019-08-31 11:44:52 +01:00
Joshua Barretto	b0293ecce4	Switched to FastNoise	2019-08-31 11:44:52 +01:00
Joshua Barretto	4777921680	Added test generator	2019-08-31 11:44:52 +01:00
Joshua Barretto	1fcb4a0313	Added Generator trait, fixed ocean lighting	2019-08-31 11:44:52 +01:00
Joshua Barretto	75f5419571	Removed dryness	2019-08-31 11:44:52 +01:00
Joshua Barretto	4735d3d6da	More interesting hills	2019-08-31 11:44:52 +01:00
Timo Koesters	b5f649eb15	Merge branch 'timo-inventory' into 'master' ... Timo inventory See merge request veloren/veloren!468	2019-08-30 22:37:40 +00:00
timokoesters	15978d216b	Rename controller main, alt to primary, secondary	2019-08-31 00:13:45 +02:00
timokoesters	a95893e43b	Remove inventory::swap and improve inventory::insert	2019-08-31 00:09:25 +02:00
timokoesters	ba02956f05	Make boost RMB go upward again	2019-08-31 00:08:44 +02:00
timokoesters	bd8e71c5aa	Rename activate_inventory_slot to use_inventory_slot	2019-08-30 22:46:45 +02:00
timokoesters	5d02d32ec6	Make inventory::get return a reference	2019-08-30 22:42:43 +02:00
timokoesters	082ccd7c46	Avoid right-ward shift	2019-08-30 22:32:47 +02:00
timokoesters	7e66fe792d	Return the item again if slot was not wrong	2019-08-30 21:03:49 +02:00
timokoesters	b063694d05	Implement icons based on weapon	2019-08-29 21:48:05 +02:00
timokoesters	952ec35857	Remove warnings	2019-08-29 19:54:53 +02:00
timokoesters	512d2d9a8e	Rename Teleport to Boost	2019-08-29 19:44:30 +02:00
timokoesters	075827698f	Use RMB to boost away again	2019-08-29 19:44:30 +02:00
Pfauenauge90	12365ee381	Axe offset	2019-08-29 19:44:29 +02:00
Pfauenauge90	9a391332a6	fmt	2019-08-29 19:44:29 +02:00
Pfauenauge90	50c4764588	changed debug wand visuals, added icons for 2h sword main and alt attack	2019-08-29 19:44:29 +02:00
timokoesters	6e1c78e5d5	Add debug mode item giving speed boost in look_dir on click	2019-08-29 19:44:28 +02:00
timokoesters	155605841b	Use comp::Stats to store Equipment, make char weapon selection work	2019-08-29 19:44:28 +02:00
Joshua Barretto	b53c882dc7	Merge branch 'haslersn/no-cheetah' into 'master' ... common: Stop abusing wild animals for bit shifts See merge request veloren/veloren!467	2019-08-29 17:07:52 +00:00
haslersn	9844e95e5f	common: Stop abusing wild animals for bit shifts	2019-08-29 18:06:52 +02:00
Joshua Barretto	2cf52b7093	Merge branch 'xp-226' into 'master' ... Make XP a u32 rather than f32 Closes #226 See merge request veloren/veloren!465	2019-08-27 22:33:14 +00:00
yashaslokesh	be71aea20b	Changed exp type from f64 to u32 and altered exp calculations and function signatures to adhere to the new types ... Signed-off-by: Yashas Lokesh <yashas.lokesh@gmail.com>	2019-08-27 22:33:14 +00:00
Timo Koesters	1bd3f0ab28	Merge branch 'timo-keybinds' into 'master' ... Timo keybinds See merge request veloren/veloren!464	2019-08-27 14:10:56 +00:00
timokoesters	cd061aba85	Make respawn hint text base on key bindings	2019-08-27 14:42:53 +02:00
timokoesters	6b4dfcc533	Allow mapping the same key to multile actions (LMB = attack + respawn)	2019-08-27 14:03:40 +02:00
timokoesters	186db16707	Rename attack, block to main, alt	2019-08-27 14:03:39 +02:00
Timo Koesters	838eab8637	Merge branch 'timo-attack-delay' into 'master' ... Timo attack delay See merge request veloren/veloren!463	2019-08-27 12:01:45 +00:00
timokoesters	b725b0e9ea	End rolling when player is in the air	2019-08-27 11:06:55 +02:00
timokoesters	74677784c0	Add attack buildup duration (Delay before hit)	2019-08-27 11:06:54 +02:00
timokoesters	72564cf8b4	Make action durations constants	2019-08-27 11:06:54 +02:00
timokoesters	869535e5a2	Rename tool strength/damage to power	2019-08-26 20:05:13 +02:00
Timo Koesters	e5413360b6	Merge branch 'timo-components' into 'master' ... Better component states See merge request veloren/veloren!458	2019-08-26 15:47:43 +00:00
timokoesters	269d179243	Remove vek patch, it's on crates.io now	2019-08-26 17:26:16 +02:00
timokoesters	84d0f61596	Make pipeline succeed	2019-08-26 14:05:17 +02:00
timokoesters	a7747fe965	Simplify code	2019-08-26 13:12:45 +02:00
timokoesters	c4879307af	Update to github vek repo	2019-08-26 13:12:45 +02:00
timokoesters	b89bfcbfc1	Remove unnecessary map	2019-08-26 13:12:44 +02:00
timokoesters	08fa6a3414	Prevent problems with no vel while rolling in the future	2019-08-26 13:12:44 +02:00
timokoesters	c278ac9927	Add todo making glide an ability/item	2019-08-26 13:12:44 +02:00
timokoesters	98f8196a16	Put combat related values into constants	2019-08-26 13:12:43 +02:00
timokoesters	05f2f168fd	Make falldamage local, don't use force update for local, cleanup	2019-08-26 13:12:43 +02:00
timokoesters	eb34e5bb27	fmt	2019-08-26 13:12:43 +02:00
timokoesters	b96557d012	Fix roll from cliff bug	2019-08-26 13:12:42 +02:00
timokoesters	a715a84ea7	Implement unstoppable rolling	2019-08-26 13:12:42 +02:00