Joshua Barretto
|
e6a40bbda2
|
Added jumping and Jump animation state
Former-commit-id: 6ae9f7e9c9fb2bc519a0ef2c1c8195376616ed4c
|
2019-05-09 18:57:47 +01:00 |
|
Joshua Barretto
|
5aa8a67800
|
Added jump button
Former-commit-id: 614614fbe0a8cfc29d28010084078d4441734307
|
2019-05-09 18:57:47 +01:00 |
|
Forest Anderson
|
87fab23dc8
|
Merge branch 'panic-clarity' into 'master'
Issue-83: Voxygen, main, extracting payload from PanicInfo
See merge request veloren/veloren!115
Former-commit-id: 459f40cd6a676a75e5e1eb84f73b8ac94dc8ddb5
|
2019-05-09 17:49:43 +00:00 |
|
Vsevolod Timchenko
|
af4192869d
|
whitespaces fmt fix
Former-commit-id: 1f9296d4f773f2da6e222a89f471f30c77b432fa
|
2019-05-09 20:27:07 +03: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
|
a86dc3ae80
|
Remove unused code
Former-commit-id: 80eb4dcdea740323b510e11b6e08cd6e13709dff
|
2019-05-09 06:55:26 +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 |
|
Vsevolod Timchenko
|
1cfd0de2ba
|
Added unpacking
to panic messages, issue #83
Former-commit-id: 55b45773d049834a7a6cf43bbdf656cba7290f74
|
2019-05-08 23:01:02 +03:00 |
|
timokoesters
|
854271f321
|
Make use of image_ids! in char selection
Former-commit-id: 98a11ae94aa299a8eb9e5e4d69cb99c7753f626b
|
2019-05-08 20:40:34 +02:00 |
|
timokoesters
|
31ab734f90
|
Make use of image_ids! in the main menu
Former-commit-id: 30b040b0ff046d0ae63394a2331866a6aec6b25f
|
2019-05-08 20:19:57 +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
|
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 |
|
timokoesters
|
f695973bb2
|
Make fonts work, Remove style
Former-commit-id: 53d158aff30d8c53b86deb62f7079ba06b5119ce
|
2019-05-07 01:08:27 -04:00 |
|
timokoesters
|
e8aa680aad
|
Move map into it's own file
Former-commit-id: 5a1b593e3d6b00dad3e3a4d462dfd48592537f64
|
2019-05-07 01:00:48 -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 |
|