Imbris
81c5a070c5
move conrod font out of common
...
Former-commit-id: 1e7cbce00eddff6c765326671d04d9494639773e
2019-05-07 02:25:26 -04: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
Nikita Puzankov
f68b1ba17b
Make nightly builds use reusable job.
...
Former-commit-id: d1606156f8766b965c6fe2265fcf430826c37254
2019-05-07 05:12:46 +00:00
timokoesters
f695973bb2
Make fonts work, Remove style
...
Former-commit-id: 53d158aff30d8c53b86deb62f7079ba06b5119ce
2019-05-07 01:08:27 -04:00
timokoesters
53a78e1c2f
Remove unnecessary debug from try_open_with_path
...
Former-commit-id: 891d24c247d15f406ebd24ca923b62e6f43bf9ea
2019-05-07 01:00:48 -04:00
timokoesters
e8aa680aad
Move map into it's own file
...
Former-commit-id: 5a1b593e3d6b00dad3e3a4d462dfd48592537f64
2019-05-07 01:00:48 -04:00
Imbris
cb507ebfa0
small comment
...
Former-commit-id: 13e443edbb52e1c1423446168235c986b8999de0
2019-05-07 00:59:06 -04:00
Imbris
8232ffbd33
add load_expect, change error reporting
...
Former-commit-id: 6064384b14e055701f11c3a1f4931aa6eb27adda
2019-05-07 00:59:05 -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
33fbcd1e93
formatting tweaks
...
Former-commit-id: 90d46c995737d7077a581e9767209fc338c392fa
2019-05-07 00:48:39 -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
b83d45c464
Change macro to make single struct
...
Former-commit-id: ed7876d49fccdc7fb11317c13b59b2b4776daef9
2019-05-07 00:33:06 -04:00
timokoesters
f028aa5a2c
Split character_window from hud/mod.rs
...
Former-commit-id: 61a09a0ff322dc104d8f4a50eff654706daccde8
2019-05-07 00:33:06 -04:00
timokoesters
3f0f8b84d1
Fix asset imports
...
Former-commit-id: 57e3f136aa61d4e7431f147a79e8ea29fd992328
2019-05-07 00:30:09 -04:00
timokoesters
c7dd3e96cc
Start work on image_ids! and asset loading
...
Former-commit-id: 1e86e627f8ec6a146aa59558da50658beaad91c6
2019-05-07 00:28:05 -04:00
Forest Anderson
6699d7cba2
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
aec2803c4a
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
209b29a870
Slightly improve render target creation code
...
Former-commit-id: 7ce92cce35834b006df9dacb4b4dd3e88d603b4e
2019-05-06 14:06:07 +02:00
robojumper
821ab80c5b
Add post-process pipeline
...
Former-commit-id: aed1fff25f7fd95fe040b0877011cbe57e77eba3
2019-05-06 10:22:47 +02: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
370ec5cbd6
Merge branch 'camera_improvements' into 'master'
...
Smoother and terrain-aware camera
Closes #29 and #40
See merge request veloren/veloren!106
Former-commit-id: dc69df19ddd23dc503aebf701e6ae5fb6ad3feed
2019-05-05 16:52:06 +00:00
robojumper
b2c2d89447
Run cargo fmt
...
Former-commit-id: c038eee51ee522fc170f7dcee94c533ad2708df2
2019-05-05 17:54:08 +02:00
robojumper
647d1dcc9c
Smoother and terrain-aware camera
...
Former-commit-id: 46b4e90d03792c9efb7d6b728c0d0cd60b1f5058
2019-05-05 17:44:56 +02:00
Forest Anderson
aa9c01af35
Merge branch 'master' into 'master'
...
Update help window to use player's keybindings
Closes #42
See merge request veloren/veloren!71
Former-commit-id: b35965946b9558a19f29610357d62982f7554588
2019-05-04 17:52:16 +00:00
Forest Anderson
01b993bab1
Merge branch 'add-lfs-asset-storage-system' into 'master'
...
Added LFS config, removed modules
Closes #71
See merge request veloren/veloren!103
Former-commit-id: d8e2e0dc15a4d16d433f76c814ee02aeb4957e76
2019-05-04 12:18:14 +00:00
Forest
315ce93225
Add lfs files
...
Former-commit-id: 6f7f0a40fa2fa1aee1f0276ec36466af80d15aa2
2019-05-03 22:33:56 -04:00
Forest
7e84f0171d
Rm assets folder
...
Former-commit-id: 884896ec20991bd293c6ad4b2150c23a98a823a7
2019-05-03 22:32:22 -04:00
Forest Anderson
f6f5139de0
Merge branch 'hotfix-esc-menu-buttons' into 'master'
...
esc menu buttons visuals fix
See merge request veloren/veloren!105
Former-commit-id: de70d02bfb3ddafe06d640bd95d0a8e12ba5a95d
2019-05-03 20:31:03 +00:00
Pfauenauge
48d254c7ae
esc menu buttons visuals fix
...
Former-commit-id: 742857d2f7bcf19a543890bf780d9b46fbca9e0e
2019-05-03 22:25:23 +02:00
Nikita Puzankov
d086654541
Reusable commit build job for linux and windows.
...
Former-commit-id: ee3dd9d3664fb8841fb6580db746f2160231543b
2019-05-03 19:06:14 +00:00
