Commit Graph

239 Commits

Author SHA1 Message Date
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
5c63f398ba replace typing field with function and cleanup
Former-commit-id: eed8063a12ac475927e9d0eabc0aafc0598ce9ef
2019-05-07 01:27:24 -04:00
timokoesters
f695973bb2 Make fonts work, Remove style
Former-commit-id: 53d158aff30d8c53b86deb62f7079ba06b5119ce
2019-05-07 01:08:27 -04:00
Imbris
775b5e731e integrate blank graphic, remove Graphic from impls
Former-commit-id: 190e03fe98591e8ab29d1202cf462cf6b51ede4d
2019-05-07 00:57:42 -04:00
Imbris
2f9358f167 integrate timo's macro change
Former-commit-id: a7657636efe4ce1db8c1714077262585e662c982
2019-05-07 00:54:35 -04:00
Imbris
9d63253627 enable split out character window
Former-commit-id: 9018814bd43960b9f0f5f8da03794df9c1eb803c
2019-05-07 00:48:38 -04:00
Imbris
990b42a6b0 remove poison err & Segment Asset impl, cleanup
Former-commit-id: a2bf1ed8400da824c18ceb33a02160ecaf7d43fa
2019-05-07 00:47:22 -04:00
Imbris
1d5020634d revamp asset system with a global singleton cache
Former-commit-id: edfc83397ed897fcec37589261c2cfae42d6ec32
2019-05-07 00:44:44 -04:00
timokoesters
c7dd3e96cc Start work on image_ids! and asset loading
Former-commit-id: 1e86e627f8ec6a146aa59558da50658beaad91c6
2019-05-07 00:28:05 -04:00
robojumper
31a8e653c4 Fix panic when minimizing, show backtraces when panicking
Former-commit-id: 0ad401d81a2f7b4d0b766578238d2ab9259f80eb
2019-05-05 20:42:44 +02:00
Forest Anderson
993388e56a Ran fmt on codebase
Former-commit-id: 7fecffa1dc66fffba4f07d45fb80960dc5178f4f
2019-04-29 20:37:19 +00:00
Imbris
0daa8ef3f3 fix scaling artifacts
Former-commit-id: 7b90e7d033438a0c83e254ea7bcc791ad83808b3
2019-04-20 08:59:26 -04:00
Imbris
1143c58e37 add graphic cache clearing on resize
Former-commit-id: 49b3a52036171fd8b66d9fae73bebb15fbf83a0b
2019-04-19 21:35:12 -04:00
Imbris
7707636c4e rearrange ui graphic code
Former-commit-id: d0ea7feee59a1daf4ad93e9b9224750deb75ee45
2019-04-19 15:06:58 -04:00
Imbris
0b4e268dee add blank graphic, ao for voxel graphics in the ui
Former-commit-id: ceaba13fdd47707a8804886b5db2260a8cbba2f1
2019-04-19 15:06:58 -04:00
Imbris
2e69526069 initial setup for .vox rendering
Former-commit-id: bc3d2432c41d9dc3e1f57e569f3aecb9be3fe79a
2019-04-19 15:00:13 -04:00
Imbris
e755afce91 simplify chat keybaord capture
Former-commit-id: 3c5c5c241fe0c0d97059c7b87c0c08104eb5c5fe
2019-04-14 20:45:54 -04:00
Imbris
3812e0b58f stop zooming when scrolling chat
Former-commit-id: a94f26e30029ef4cff1807c2347cbd2490c4afd7
2019-04-14 20:15:12 -04:00
Imbris
5e576f048e use modified version of conrod
Former-commit-id: 6a4697d02e18732dbf9ad679bac761c5a73457fa
2019-04-13 10:52:48 -04:00
Pfauenauge90
3f2a938735 Key Command Changes, Char Window
Former-commit-id: 16c94f35da889ea418e7dc32043e6ebd25f2664b
2019-04-09 18:30:13 +02:00
Pfauenauge90
6ebff7ce2c Merged with UI-Input
Former-commit-id: f18e92dcac87c3b2806065078c70527ffd805876
2019-04-04 16:45:57 +02:00
Imbris
820967838d enable chat with enter while cursor is captured
Former-commit-id: a6b54d6325135462e04c2cec1703f45641c389f2
2019-03-29 22:15:27 -04:00
Imbris
93897f904a fix bug with ui using old win size when switching to previous playstate
Former-commit-id: b6c166882c978806af65f70496626fad33081975
2019-03-28 00:42:04 -04:00
Imbris
f753a64018 fix inconsistent text cursor height
Former-commit-id: da08c7ef8679a6f4626bf5fec0ec66ab5da9cad0
2019-03-24 22:15:29 -04:00
Imbris
fdb0512069 make hud consume key events when typing in the chat box
Former-commit-id: bb1b06827d3d298f68ae6d17f534c7bc31065306
2019-03-21 23:55:42 -04:00
Imbris
b0009f9e14 apply scizzor from conrod, replace [T; 4] with vek::Aabr<T> for ui rects
Former-commit-id: 4eaa8832ddda40882cc45c3a08c5de2fa5e68682
2019-03-20 01:26:24 -04:00
Imbris
e54a1ba369 add ToggleButton widg, make hud return event vec, simplify some widgets
Former-commit-id: aa3fe6de4944f912cb44fa6ecebe928cc849c52c
2019-03-20 01:24:27 -04:00
Imbris
16ed207437 add main menu and more hud elements
Former-commit-id: 29557c100e2b82597ced04df09f41c4f132ffc5e
2019-03-20 01:24:25 -04:00
Imbris
3d5c11855a add ui scaling
Former-commit-id: 7c6c3c8fc7d16c4a2cd0e5eff36248d6009652d2
2019-03-20 01:24:23 -04:00
Imberflur
e35e2fffc1 add support for drawing portions of images in the ui
Former-commit-id: 98a939fcdde6ed202c884cdaae56326e3f90d61d
2019-03-20 01:24:23 -04:00
Imberflur
71da6e6588 rewrite/address/remove some ui TODOs and comments
Former-commit-id: bbcbb0ee6e8d4049ad98a5cea6274ce9ef0027e0
2019-03-20 01:24:22 -04:00
Imberflur
1962320f7e add ui text rendering
Former-commit-id: 5b9b809c660a2fdd178688bdaa63d16128debe08
2019-03-20 01:24:21 -04:00
Imberflur
e68fa6b579 separate implementation code from generic UI code
Former-commit-id: 9c77ca03c4d834188ef863645ab2c26f31763b6c
2019-03-20 01:24:21 -04:00
Imberflur
3f052cae1c setup ui image rendering, started creating test ui with iteraction
Former-commit-id: 73235ad6b25ab160e9cde3ad2513d4dd32660161
2019-03-20 01:24:20 -04:00
Imberflur
d685706c9b remove old ui files
Former-commit-id: 82979b9df64ffa120f385e625648e04113c6a917
2019-03-20 01:24:19 -04:00
Imberflur
628a91af00 move conrod ui rendering and setup into ui::Ui
Former-commit-id: 1dc43fb7d73671d0b798238fecfcbf8d07ffbfcb
2019-03-20 01:24:18 -04:00
Joshua Barretto
2fffe21bc7 Added client localhost connection
Former-commit-id: d4dec70ef3ecad8f40196b87b0f5c8b55c51c44a
2019-03-04 19:58:58 +00:00
Joshua Barretto
c16a257ae3 Added server-cli, UI tests
Former-commit-id: 93bf5b39138920aa7a4a773a8247d716866c4a05
2019-01-30 12:11:34 +00:00