969 Commits

Author	SHA1	Message	Date
Imbris	fd251c4d3a	Fix sliders, remove uneeded method, fix aspect ratio in character creation	2019-09-03 23:05:54 -04:00
Imbris	7bebffb2af	Add ron file for head offsets, segment unionizer	2019-09-03 23:05:52 -04:00
Imbris	6289ce8c7f	Split up figure.rs	2019-09-03 23:05:50 -04:00
Imbris	ab34377309	Add basic segment combination	2019-09-03 23:05:50 -04:00
Imbris	0668823493	Save settings, start log, & set panic hook first	2019-09-03 23:05:47 -04:00
Marcel	9a9ac6bebf	Merge branch 'imbris/tooltip-enhancements' into 'master' ... Add ImageFrame widget, make tooltips use this, align ui to the pixels properly See merge request veloren/veloren!474	2019-09-03 06:44:38 +00:00
Imbris	625f83e535	Don't add adjacent duplicates to the history	2019-09-02 01:07:16 -04:00
Imbris	47d0904588	Directly adjust chat input when traversing history	2019-09-02 00:54:44 -04:00
tommy	12029d7e7f	Added SetText event, rewritten based on comments	2019-09-01 23:43:06 -04:00
tommy	a63e67b8d9	Basic chat window history functionality	2019-09-01 23:43:04 -04:00
Imbris	e8e053095b	Remove copy-pasted comment	2019-09-01 16:41:40 -04:00
Imbris	ba186e59cc	Adjust tooltip layout by moving title to the right of images	2019-09-01 16:30:26 -04:00
Imbris	3d7326b65f	Tooltips: make title optional, improve spacing, make it simple to add similar tooltips to multiple widgets	2019-09-01 15:34:21 -04:00
Imbris	3ccbb0f38d	Convert tooltips to use ImageFrame, add autosizing	2019-09-01 15:34:20 -04:00
Imbris	e9bedf529d	Pixel perfection, vox orientation, image rotation	2019-09-01 15:34:20 -04:00
Imbris	66ebdb2355	Add ImageFrame widget	2019-09-01 15:34:19 -04:00
Monty Marz	f53904b534	More sprites, ui fixes, lianas	2019-09-01 19:04:03 +00:00
Joshua Barretto	6919886475	Merge branch 'zesterer/worldgen' into 'master' ... Worldgen improvements See merge request veloren/veloren!457	2019-08-31 21:37:54 +00:00
Joshua Barretto	cc214982bf	Fixed warnings	2019-08-31 11:44:52 +01:00
Joshua Barretto	17a61e0b7c	Fixed terrain sprite transparency issue	2019-08-31 11:44:52 +01:00
Joshua Barretto	27c208d1a5	Fixed terrain sprite transparency layering	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
jshipsey	bb71bdd4a2	removing to make gitlab compiler happy	2019-08-30 23:18:56 -04:00
jshipsey	3c473d6d6c	rebase	2019-08-30 23:01:29 -04:00
jshipsey	b81cd6a8f9	combine character.action movement blocks	2019-08-30 22:51:46 -04:00
timokoesters	9a832dd56b	Move std::mem::discriminant into new method	2019-08-30 22:51:46 -04:00
timokoesters	d822356161	Remove warning	2019-08-30 22:51:46 -04:00
jshipsey	78bf7a0997	slowed movement for block/attack, cleaned up code, made foot speed velocity dependent, tweaked blocking animation	2019-08-30 22:50:53 -04:00
timokoesters	b99bac87db	Make npcs roll correctly	2019-08-30 22:50:53 -04:00
timokoesters	77a48c61a1	Fix rolling for the player	2019-08-30 22:50:53 -04:00
jshipsey	d84c07c1cb	fixed tiny feet in char creation	2019-08-30 22:50:53 -04:00
jshipsey	f8d0b1040a	readded cidle	2019-08-30 22:50:53 -04:00
jshipsey	bec942753e	some stuff fixed, other stuff still broken	2019-08-30 22:50:53 -04:00
timokoesters	cd3e340647	Use movement anim as base and action anim as overwrite	2019-08-30 22:50:53 -04:00
jshipsey	e6197d4c10	separate static anims for feet (run/static)	2019-08-30 22:50:53 -04:00
timokoesters	637b4642d8	Split animations	2019-08-30 22:50:53 -04:00
timokoesters	15978d216b	Rename controller main, alt to primary, secondary	2019-08-31 00:13:45 +02:00
timokoesters	bd8e71c5aa	Rename activate_inventory_slot to use_inventory_slot	2019-08-30 22:46:45 +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
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
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
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
timokoesters	84d0f61596	Make pipeline succeed	2019-08-26 14:05:17 +02:00