Commit Graph

148 Commits

Author SHA1 Message Date
Louis Pearson
5a04e98725 Change asset paths to be relative
Former-commit-id: 6c5f18484fe1b7cbf417d45c38af5ffaa8d48ac6
2019-05-18 13:37:44 -06:00
Forest Anderson
2e7984ebc3 Char selection
Former-commit-id: 8da211b00dcd9a550a8f46e79164ece8f5c193e5
2019-05-18 19:03:13 +00:00
Cody
6b09fd7c53 Pedantic comment and language fixes.
Former-commit-id: eb49765c911aaa97a9c8ed351216a7a6f8411213
2019-05-17 18:32:07 -04:00
Pfauenauge90
66eceb3ca7 Added Grid to main and offhand
Former-commit-id: 6395ba9142d6da3e14c7363e0f38f4fc61de6b79
2019-05-12 14:52:43 +02:00
Imbris
cec01c0d69 rustfmt
Former-commit-id: 227b7f5a55546c678617d157b739e61f15c4aa4b
2019-05-12 00:17:10 -04:00
Pfauenauge90
e7ab006db7 transparency
Former-commit-id: 5a0c0f7267347c3758a266ff49670b55c6e6cc0c
2019-05-11 22:35:19 -04:00
Imbris
52cf7c6f94 rebase fix, re-arrange hud img_ids
Former-commit-id: a5cb82f74afca531995fceea3ddf7ff53616dd1b
2019-05-11 22:35:15 -04:00
Pfauenauge90
fc4103561e CharWindow
Former-commit-id: 1fe067505229dc78dee4a0175fcbdbb2040599bd
2019-05-11 21:36:27 -04:00
Pfauenauge
a59f0e57aa char window
Former-commit-id: 2624ddd883c0ff555fc86efce767fda602de52eb
2019-05-11 21:36:27 -04:00
Pfauenauge
a6b792f930 Char Window
Former-commit-id: 0109555602ba39950f304bd0adc80df6175c3728
2019-05-11 21:36:27 -04:00
Pfauenauge
789e448aa3 positioning
Former-commit-id: 7583dfac4be650ecabaf49608712c8d3cb952bf5
2019-05-11 21:36:26 -04:00
Pfauenauge
3f57ab4f2a positioning
Former-commit-id: 510fcaea11f0e9293e73ba98fb9ad79b5dbbadb5
2019-05-11 21:34:50 -04:00
Pfauenauge90
657bba06e9 asset update and import
Former-commit-id: 43f616f166c3df87a19f0eca80a65f7a3c0e374c
2019-05-11 21:33:48 -04:00
Pfauenauge
bd23732c74 char window
Former-commit-id: 0c15336583eeaf32f0d86ef10b16c47f46d4db7f
2019-05-11 21:32:38 -04:00
Pfauenauge
5731484940 Char Window
Former-commit-id: c44ca056fe76b00e803d96825da69385cfecad39
2019-05-11 21:32:36 -04:00
Pfauenauge
5aa5e84a46 positioning
Former-commit-id: 4524965ee5fa82fc35c965061079d7b52919a74a
2019-05-11 21:32:34 -04:00
Pfauenauge90
757fbdd653 Asset Update
Former-commit-id: 2f3e58679059c3c97cec9312c6fa436d5510b901
2019-05-11 21:32:30 -04:00
Pfauenauge
15816bdf6d positioning
Former-commit-id: 44e8406af9c2b6db60f78f7ff161b7c700f024fd
2019-05-11 21:31:17 -04:00
Pfauenauge90
0f6ec8dce3 asset update and import
Former-commit-id: 455500aac3d82e2920bc02c6846ceb815122bb7d
2019-05-11 21:31:15 -04:00
Imbris
1948bc6392 fix & remove some unused uses, cursor toggle tweak
Former-commit-id: b398b11606d983b7f80364a5689804e3491c218f
2019-05-11 10:59:48 -04:00
Imbris
aed6750885 add multisampling option to voxel graphics
Former-commit-id: d5ca47cd029226d1268c6d860516bfea6f9c5cf6
2019-05-11 10:25:15 -04:00
Imbris
3faf4855cc Merge branch 'cursorgrab' into 'master'
Improve cursor grab

Closes #55

See merge request veloren/veloren!113

Former-commit-id: 56ade58e0a2f55f657f8b714a2216023659b161f
2019-05-09 17:02:24 +00:00
timokoesters
a58b5ceb3a Fix bug when pressing ToggleMouse twice while grabbed
Former-commit-id: 9e01b71577fd3dbe570b7aca1e041c32e9a01c66
2019-05-09 18:55:13 +02:00
timokoesters
e8cf815143 Force ungrab on Key::ToggleCursor
Former-commit-id: 222f5693363662d25cb065fdc104cd079e2c395d
2019-05-09 10:55:32 +02:00
timokoesters
2309ce599c Move font_ids! into mod.rs
Former-commit-id: 602ea44814a25c068e5c022cedc780e3ddc020ae
2019-05-08 22:25:15 +02:00
timokoesters
0e46b00a0c Minor fixes
Former-commit-id: 9c5e90e2bad24e9b5c443bfb1509b18877adf2d6
2019-05-08 22:15:58 +02:00
timokoesters
f6b27db6dd Improve formatting
Former-commit-id: b2167cd982c37b3716fa74d3e75d27e5cf3c65ce
2019-05-08 20:19:38 +02:00
Imbris
470e63a691 Remove or uncomment commented code
Former-commit-id: 32ac76b649012a0a2756f796b26d48318faad11c
2019-05-07 21:59:35 -04:00
timokoesters
a15532f81a Improve cursor grab
Former-commit-id: c1a8b5383bf7682245e2294e5b1d62dae0beb329
2019-05-07 22:00:03 +02:00
timokoesters
b3ffc61119 Don't let widgets have mutable access to show
Former-commit-id: 4c525c60d25bcc6551ddeabd325992fcd513619d
2019-05-07 19:50:53 +02:00
timokoesters
54cc96f0d1 Move minimap into own file
Former-commit-id: 7c4a9b0930c899fc8e5089920c3ee5c717561a1a
2019-05-07 19:34:30 +02:00
Imbris
d13430d51e revert chat clicking change (broke scrolling)
Former-commit-id: f43f3fd97c01dc304f29fcc852ab9909e6d00620
2019-05-07 01:50:47 -04:00
Imbris
eb3d8310f8 rustfmt
Former-commit-id: 7e2cdb284c670b5991c69b6aab042194c806171f
2019-05-07 01:40:03 -04:00
Imbris
99d6c92c8d rebase
Former-commit-id: d73c1bcd433fea599fb4d342918117b23324c8d2
2019-05-07 01:39:32 -04:00
Imbris
0fc6dd317f open input box by clicking anywhere on chat
Former-commit-id: f379c52d034b16c5390375899e551b01515cd11e
2019-05-07 01:27:24 -04:00
Imbris
5c63f398ba replace typing field with function and cleanup
Former-commit-id: eed8063a12ac475927e9d0eabc0aafc0598ce9ef
2019-05-07 01:27:24 -04:00
Pfauenauge
009ca0a130 small windows "relative" to opened char window
Former-commit-id: 13d07e3bfce60cd17eaf7447a442c47353d9517e
2019-05-07 01:25:33 -04:00
timokoesters
7f709bba0c Prepare relative small windows
Former-commit-id: 6f1046518b49b302d69d51e0596514bf9ded7952
2019-05-07 01:25:32 -04:00
timokoesters
a36fcb4243 Fix settings to use Show
Former-commit-id: 99c31d8c9914f4b9e6fbcc2b1f72a97a260a725b
2019-05-07 01:25:32 -04:00
Pfauenauge
6894e55a24 Bag Position
Former-commit-id: af8435d0c078ea1caa388ff0926ef6dae22ab70b
2019-05-07 01:25:31 -04:00
Pfauenauge
b7b3c5f3cd positioning
Former-commit-id: d599e046d1944a41eef5423cf3bb0f17f42a246a
2019-05-07 01:25:31 -04:00
timokoesters
87e75644ec Fix fonts
Former-commit-id: c7929a0b540099ac67b93563d97be4b8c6639190
2019-05-07 01:25:31 -04:00
Imbris
efa2afc5c8 re-enable chat focusing
Former-commit-id: 8cbcbba82bcb85fec11638085cff26049838fe6d
2019-05-07 01:25:30 -04:00
Imbris
7bade0360e Move Hud's show fields to their own struct
Former-commit-id: 8f546b2c2f40fb74e4daecc982256b441fcdd7fb
2019-05-07 01:24:12 -04:00
timokoesters
1c79d06985 Fix settings
Former-commit-id: 694387dc670ac2c39d3fbc8915d4819b638fe431
2019-05-07 01:22:48 -04:00
Pfauenauge90
6cbd045231 positioning
Former-commit-id: 90b626c2900e6bf4924dc290764c2860a5bade98
2019-05-07 01:22:47 -04:00
timokoesters
819e0a200f Separate bag + buttons into own file
Former-commit-id: 08e3b640adb85266ce7a739008fa26e1caee0ebf
2019-05-07 01:15:49 -04:00
timokoesters
abd960aa48 Move skillbar into own file
Former-commit-id: efab633e9b5c1ffc5071a556203490780615cde6
2019-05-07 01:13:26 -04:00
timokoesters
08aa8875fd Separate settings and small windows and convert chat
Former-commit-id: 847b0b8cf64b9d2de10b241d37bb7e21c126d314
2019-05-07 01:12:56 -04:00
timokoesters
f695973bb2 Make fonts work, Remove style
Former-commit-id: 53d158aff30d8c53b86deb62f7079ba06b5119ce
2019-05-07 01:08:27 -04:00