Commit Graph

2088 Commits

Author SHA1 Message Date
scott-c
5fd4f00012 Add first person models 2019-09-04 22:05:59 +08:00
Imbris
1f859111c4 Merge branch 'imbris/char-creation' into 'master'
Segment combination for character creation

Closes #94

See merge request veloren/veloren!470
2019-09-04 03:25:09 +00:00
Imbris
fc9c87878e Fix some warnings, cleanup comment 2019-09-03 23:09:29 -04:00
Imbris
8a994ada8e Remove derpy eyes :( , fix undead eye indices, fmt 2019-09-03 23:06:15 -04:00
jshipsey
ca4da22c7d fixing eyes, cleanup on offsets 2019-09-03 23:06:13 -04:00
jshipsey
178657c871 tweaked hair colors, head offsets, skin colors 2019-09-03 23:06:11 -04:00
Imbris
cc331c10b6 Remove use of empty.vox 2019-09-03 23:06:09 -04:00
Imbris
074eee06e6 Add pants coloring, chest and pants sliders 2019-09-03 23:06:06 -04:00
Imbris
0ffc534df2 Add separate eye color lists for each race 2019-09-03 23:06:02 -04:00
Pfauenauge90
bdb95be5cc hair and skin colours 2019-09-03 23:05:59 -04:00
Imbris
c4999f5e9d adjust how figure head coloring is done 2019-09-03 23:05:58 -04:00
Pfauenauge90
9654262938 model changes 2019-09-03 23:05:57 -04:00
Imbris
9d086949d1 Add basic index based coloring for figures 2019-09-03 23:05:56 -04:00
jshipsey
a826eb76ec proper head offsets, more options 2019-09-03 23:05:56 -04:00
jshipsey
98175ffbce added more races with head/hair/eye offsets 2019-09-03 23:05:55 -04:00
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
53c0992fd5 Merge branch 'which_object_spawned' into 'master'
Tells the user which object was spawned

See merge request veloren/veloren!368
2019-09-02 05:34:28 +00:00
Christoffer Lantz
7dce9c4fb9 Added unwrap_or to obj_str_opt in handle_object in case we don't return early in the _ => match arm 2019-09-02 01:22:09 -04:00
Christoffer Lantz
c154a41c5c Changed Spawned object: to Spawned: in handle_object 2019-09-02 01:22:09 -04:00
Christoffer Lantz
8f68df2bd1 Tells the user which object was spawned 2019-09-02 01:22:08 -04:00
Imbris
cf022dfd00 Merge branch 'chat_history' into 'master'
Basic chat window history functionality, closes #186

Closes #186

See merge request veloren/veloren!331
2019-09-02 05:12:23 +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
Joshua Barretto
8a3ce232fa Merge branch 'pfauenauge/more_sprites' into 'master'
More sprites, ui fixes, lianas

See merge request veloren/veloren!472
2019-09-01 19:04:03 +00: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
367e7f2351 Merge branch 'timo-animations' into 'master'
Split animations

See merge request veloren/veloren!466
2019-08-31 15:47:16 +00:00
Joshua Barretto
d0768e9858 Faster prng 2019-08-31 14:24:56 +01:00
Joshua Barretto
cc214982bf Fixed warnings 2019-08-31 11:44:52 +01:00
Joshua Barretto
7321eb6999 Better town park generation 2019-08-31 11:44:52 +01:00
Joshua Barretto
1eb0720cbb Cleaned up wall generation 2019-08-31 11:44:52 +01:00
Joshua Barretto
1176fc4d07 Better loading times 2019-08-31 11:44:52 +01:00
Joshua Barretto
c433ef36d7 Sloped wall tops 2019-08-31 11:44:52 +01:00
Joshua Barretto
25d6ab03aa Removed extra foundations 2019-08-31 11:44:52 +01:00
Joshua Barretto
e3c4e34edb Added city walls 2019-08-31 11:44:52 +01:00
Joshua Barretto
144703da1c Added wall module assets 2019-08-31 11:44:52 +01:00
Joshua Barretto
5a677b9c1e Added modular building generation 2019-08-31 11:44:52 +01:00