timokoesters
11b308d710
Remove unused code
...
Former-commit-id: 80eb4dcdea740323b510e11b6e08cd6e13709dff
2019-05-09 06:55:26 +02:00
timokoesters
8ad8538c28
Move font_ids! into mod.rs
...
Former-commit-id: 602ea44814a25c068e5c022cedc780e3ddc020ae
2019-05-08 22:25:15 +02:00
timokoesters
0f53242c79
Make use of image_ids! in char selection
...
Former-commit-id: 98a11ae94aa299a8eb9e5e4d69cb99c7753f626b
2019-05-08 20:40:34 +02:00
timokoesters
cc60f95300
Make use of image_ids! in the main menu
...
Former-commit-id: 30b040b0ff046d0ae63394a2331866a6aec6b25f
2019-05-08 20:19:57 +02:00
timokoesters
79f44ee46e
Improve formatting
...
Former-commit-id: b2167cd982c37b3716fa74d3e75d27e5cf3c65ce
2019-05-08 20:19:38 +02:00
Forest Anderson
954be1ed9c
Merge branch 'timo_assets_rebased' into 'master'
...
New asset system, split hud.rs, macros for img and font id structs (Timo)
See merge request veloren/veloren!111
Former-commit-id: 4765e936dd445d651348b2460707faacd5273d61
2019-05-08 02:31:22 +00:00
Imbris
fc535314d8
Remove or uncomment commented code
...
Former-commit-id: 32ac76b649012a0a2756f796b26d48318faad11c
2019-05-07 21:59:35 -04:00
Forest Anderson
75302e909f
Merge branch 'reusable-commit-build-job' into 'master'
...
Reusable commit build job for linux and windows.
See merge request veloren/veloren!104
Former-commit-id: 65896515ab1571917fc56e4d7f102c9452d43c91
2019-05-08 00:53:55 +00:00
timokoesters
bfbe53e9a6
Fix doc test
...
Former-commit-id: e347ad79dd229d72f70820189e6ae6011868c5ef
2019-05-07 20:36:07 +02:00
timokoesters
1c0002fb15
Don't let widgets have mutable access to show
...
Former-commit-id: 4c525c60d25bcc6551ddeabd325992fcd513619d
2019-05-07 19:50:53 +02:00
timokoesters
cf31b7330f
Move minimap into own file
...
Former-commit-id: 7c4a9b0930c899fc8e5089920c3ee5c717561a1a
2019-05-07 19:34:30 +02:00
Imbris
3077c002cc
move conrod font out of common
...
Former-commit-id: 1e7cbce00eddff6c765326671d04d9494639773e
2019-05-07 02:25:26 -04:00
Imbris
9f9e549c90
revert chat clicking change (broke scrolling)
...
Former-commit-id: f43f3fd97c01dc304f29fcc852ab9909e6d00620
2019-05-07 01:50:47 -04:00
Imbris
c6aecbfded
rustfmt
...
Former-commit-id: 7e2cdb284c670b5991c69b6aab042194c806171f
2019-05-07 01:40:03 -04:00
Imbris
6d30c13586
rebase
...
Former-commit-id: d73c1bcd433fea599fb4d342918117b23324c8d2
2019-05-07 01:39:32 -04:00
Imbris
bf65a54488
open input box by clicking anywhere on chat
...
Former-commit-id: f379c52d034b16c5390375899e551b01515cd11e
2019-05-07 01:27:24 -04:00
Imbris
7c192895c2
replace typing field with function and cleanup
...
Former-commit-id: eed8063a12ac475927e9d0eabc0aafc0598ce9ef
2019-05-07 01:27:24 -04:00
Pfauenauge
21c4ab1822
small windows "relative" to opened char window
...
Former-commit-id: 13d07e3bfce60cd17eaf7447a442c47353d9517e
2019-05-07 01:25:33 -04:00
timokoesters
f52d98d3bc
Prepare relative small windows
...
Former-commit-id: 6f1046518b49b302d69d51e0596514bf9ded7952
2019-05-07 01:25:32 -04:00
timokoesters
d6339a5f12
Fix settings to use Show
...
Former-commit-id: 99c31d8c9914f4b9e6fbcc2b1f72a97a260a725b
2019-05-07 01:25:32 -04:00
Pfauenauge
7ce88e0884
Bag Position
...
Former-commit-id: af8435d0c078ea1caa388ff0926ef6dae22ab70b
2019-05-07 01:25:31 -04:00
Pfauenauge
dd7f9ac47a
positioning
...
Former-commit-id: d599e046d1944a41eef5423cf3bb0f17f42a246a
2019-05-07 01:25:31 -04:00
timokoesters
e9cf3b01f1
Fix fonts
...
Former-commit-id: c7929a0b540099ac67b93563d97be4b8c6639190
2019-05-07 01:25:31 -04:00
Imbris
b07aef831d
re-enable chat focusing
...
Former-commit-id: 8cbcbba82bcb85fec11638085cff26049838fe6d
2019-05-07 01:25:30 -04:00
Imbris
41b1ade2d1
Move Hud's show fields to their own struct
...
Former-commit-id: 8f546b2c2f40fb74e4daecc982256b441fcdd7fb
2019-05-07 01:24:12 -04:00
timokoesters
78268f0534
Fix settings
...
Former-commit-id: 694387dc670ac2c39d3fbc8915d4819b638fe431
2019-05-07 01:22:48 -04:00
Pfauenauge90
2ea08d6fa5
positioning
...
Former-commit-id: 90b626c2900e6bf4924dc290764c2860a5bade98
2019-05-07 01:22:47 -04:00
timokoesters
a4a6409915
Separate bag + buttons into own file
...
Former-commit-id: 08e3b640adb85266ce7a739008fa26e1caee0ebf
2019-05-07 01:15:49 -04:00
timokoesters
e54ac51842
Move skillbar into own file
...
Former-commit-id: efab633e9b5c1ffc5071a556203490780615cde6
2019-05-07 01:13:26 -04:00
timokoesters
918da4a20d
Separate settings and small windows and convert chat
...
Former-commit-id: 847b0b8cf64b9d2de10b241d37bb7e21c126d314
2019-05-07 01:12:56 -04:00
Nikita Puzankov
c1d75ddfbe
Make nightly builds use reusable job.
...
Former-commit-id: d1606156f8766b965c6fe2265fcf430826c37254
2019-05-07 05:12:46 +00:00
timokoesters
342909a2b2
Make fonts work, Remove style
...
Former-commit-id: 53d158aff30d8c53b86deb62f7079ba06b5119ce
2019-05-07 01:08:27 -04:00
timokoesters
5eec2fc36b
Remove unnecessary debug from try_open_with_path
...
Former-commit-id: 891d24c247d15f406ebd24ca923b62e6f43bf9ea
2019-05-07 01:00:48 -04:00
timokoesters
a648cd7126
Move map into it's own file
...
Former-commit-id: 5a1b593e3d6b00dad3e3a4d462dfd48592537f64
2019-05-07 01:00:48 -04:00
Imbris
5a04e9d99b
small comment
...
Former-commit-id: 13e443edbb52e1c1423446168235c986b8999de0
2019-05-07 00:59:06 -04:00
Imbris
d4e554241c
add load_expect, change error reporting
...
Former-commit-id: 6064384b14e055701f11c3a1f4931aa6eb27adda
2019-05-07 00:59:05 -04:00
Imbris
7999f59a19
integrate blank graphic, remove Graphic from impls
...
Former-commit-id: 190e03fe98591e8ab29d1202cf462cf6b51ede4d
2019-05-07 00:57:42 -04:00
Imbris
2d3ebd6b24
integrate timo's macro change
...
Former-commit-id: a7657636efe4ce1db8c1714077262585e662c982
2019-05-07 00:54:35 -04:00
Imbris
120b4270d8
formatting tweaks
...
Former-commit-id: 90d46c995737d7077a581e9767209fc338c392fa
2019-05-07 00:48:39 -04:00
Imbris
cbeae203ba
enable split out character window
...
Former-commit-id: 9018814bd43960b9f0f5f8da03794df9c1eb803c
2019-05-07 00:48:38 -04:00
Imbris
00bab4f82f
remove poison err & Segment Asset impl, cleanup
...
Former-commit-id: a2bf1ed8400da824c18ceb33a02160ecaf7d43fa
2019-05-07 00:47:22 -04:00
Imbris
d71d289179
revamp asset system with a global singleton cache
...
Former-commit-id: edfc83397ed897fcec37589261c2cfae42d6ec32
2019-05-07 00:44:44 -04:00
timokoesters
88bf1aaa94
Change macro to make single struct
...
Former-commit-id: ed7876d49fccdc7fb11317c13b59b2b4776daef9
2019-05-07 00:33:06 -04:00
timokoesters
43f261cc83
Split character_window from hud/mod.rs
...
Former-commit-id: 61a09a0ff322dc104d8f4a50eff654706daccde8
2019-05-07 00:33:06 -04:00
timokoesters
a4eaae921f
Fix asset imports
...
Former-commit-id: 57e3f136aa61d4e7431f147a79e8ea29fd992328
2019-05-07 00:30:09 -04:00
timokoesters
426cbd9c3c
Start work on image_ids! and asset loading
...
Former-commit-id: 1e86e627f8ec6a146aa59558da50658beaad91c6
2019-05-07 00:28:05 -04:00
Forest Anderson
82c5bed234
Merge branch 'backtraces_and_panics' into 'master'
...
Fix panic when minimizing, show backtraces when panicking
See merge request veloren/veloren!108
Former-commit-id: 161f1ffe4818cce3535be3913b9da2c476b56334
2019-05-06 14:42:45 +00:00
Joshua Barretto
13cce7d9e1
Merge branch 'post-process' into 'master'
...
Add post-process pipeline
Closes #6
See merge request veloren/veloren!109
Former-commit-id: 0f7cfc0d3e18428bfe013f509af0b35c7a0c0aa8
2019-05-06 12:10:26 +00:00
robojumper
7034419fd8
Slightly improve render target creation code
...
Former-commit-id: 7ce92cce35834b006df9dacb4b4dd3e88d603b4e
2019-05-06 14:06:07 +02:00
robojumper
35e1a43a38
Add post-process pipeline
...
Former-commit-id: aed1fff25f7fd95fe040b0877011cbe57e77eba3
2019-05-06 10:22:47 +02:00
