970 Commits

Author SHA1 Message Date
Imbris
0be9d41b0f Add basic index based coloring for figures 2019-09-03 23:05:56 -04:00
Imbris
f263ecd880 Fix sliders, remove uneeded method, fix aspect ratio in character creation 2019-09-03 23:05:54 -04:00
Imbris
6c47c458d8 Add ron file for head offsets, segment unionizer 2019-09-03 23:05:52 -04:00
Imbris
afe3b32a9e Split up figure.rs 2019-09-03 23:05:50 -04:00
Imbris
c37646e0e2 Add basic segment combination 2019-09-03 23:05:50 -04:00
Imbris
2e8f94659e Save settings, start log, & set panic hook first 2019-09-03 23:05:47 -04:00
Marcel
4747c09785 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
4a4eab274a Don't add adjacent duplicates to the history 2019-09-02 01:07:16 -04:00
Imbris
e1e1dd9a28 Directly adjust chat input when traversing history 2019-09-02 00:54:44 -04:00
tommy
3f46987cc1 Added SetText event, rewritten based on comments 2019-09-01 23:43:06 -04:00
tommy
a3c8acf0e4 Basic chat window history functionality 2019-09-01 23:43:04 -04:00
Imbris
a9d0daee32 Remove copy-pasted comment 2019-09-01 16:41:40 -04:00
Imbris
9d0f114df7 Adjust tooltip layout by moving title to the right of images 2019-09-01 16:30:26 -04:00
Imbris
2e1427933d 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
2c84be4306 Convert tooltips to use ImageFrame, add autosizing 2019-09-01 15:34:20 -04:00
Imbris
8a4dd94132 Pixel perfection, vox orientation, image rotation 2019-09-01 15:34:20 -04:00
Imbris
6ba734a944 Add ImageFrame widget 2019-09-01 15:34:19 -04:00
Monty Marz
8c39a4751b More sprites, ui fixes, lianas 2019-09-01 19:04:03 +00:00
Joshua Barretto
8d0c91dc94 Merge branch 'zesterer/worldgen' into 'master'
Worldgen improvements

See merge request veloren/veloren!457
2019-08-31 21:37:54 +00:00
Joshua Barretto
2bfb5d7c5e Fixed warnings 2019-08-31 11:44:52 +01:00
Joshua Barretto
0a5805d423 Fixed terrain sprite transparency issue 2019-08-31 11:44:52 +01:00
Joshua Barretto
460c509a12 Fixed terrain sprite transparency layering 2019-08-31 11:44:52 +01:00
Joshua Barretto
5e78479b50 Added Generator trait, fixed ocean lighting 2019-08-31 11:44:52 +01:00
jshipsey
11d52a3972 removing to make gitlab compiler happy 2019-08-30 23:18:56 -04:00
jshipsey
26c877d8ac rebase 2019-08-30 23:01:29 -04:00
jshipsey
a1d23cdc14 combine character.action movement blocks 2019-08-30 22:51:46 -04:00
timokoesters
702a4afd46 Move std::mem::discriminant into new method 2019-08-30 22:51:46 -04:00
timokoesters
3430f290bb Remove warning 2019-08-30 22:51:46 -04:00
jshipsey
7f38acd475 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
f7f6fd98dd Make npcs roll correctly 2019-08-30 22:50:53 -04:00
timokoesters
8900a9e4f3 Fix rolling for the player 2019-08-30 22:50:53 -04:00
jshipsey
01105d21e5 fixed tiny feet in char creation 2019-08-30 22:50:53 -04:00
jshipsey
5a59f4bb22 readded cidle 2019-08-30 22:50:53 -04:00
jshipsey
2496256ff6 some stuff fixed, other stuff still broken 2019-08-30 22:50:53 -04:00
timokoesters
efddbcd5f9 Use movement anim as base and action anim as overwrite 2019-08-30 22:50:53 -04:00
jshipsey
737bddc15d separate static anims for feet (run/static) 2019-08-30 22:50:53 -04:00
timokoesters
7099ef99b4 Split animations 2019-08-30 22:50:53 -04:00
timokoesters
ade4bd8887
Rename controller main, alt to primary, secondary 2019-08-31 00:13:45 +02:00
timokoesters
2b0f6a1d9c
Rename activate_inventory_slot to use_inventory_slot 2019-08-30 22:46:45 +02:00
timokoesters
891c4cc99c
Implement icons based on weapon 2019-08-29 21:48:05 +02:00
timokoesters
0e64c13996
Remove warnings 2019-08-29 19:54:53 +02:00
Pfauenauge90
7c188c8900
Axe offset 2019-08-29 19:44:29 +02:00
Pfauenauge90
987a179119
fmt 2019-08-29 19:44:29 +02:00
Pfauenauge90
77205f7a8f
changed debug wand visuals, added icons for 2h sword main and alt attack 2019-08-29 19:44:29 +02:00
timokoesters
e4ca33de5b
Add debug mode item giving speed boost in look_dir on click 2019-08-29 19:44:28 +02:00
timokoesters
af780acc84
Use comp::Stats to store Equipment, make char weapon selection work 2019-08-29 19:44:28 +02:00
yashaslokesh
11678fb952 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
e2c8532958
Make respawn hint text base on key bindings 2019-08-27 14:42:53 +02:00
timokoesters
765391b4ee
Allow mapping the same key to multile actions (LMB = attack + respawn) 2019-08-27 14:03:40 +02:00
timokoesters
0960b03455
Rename attack, block to main, alt 2019-08-27 14:03:39 +02:00