Pfauenauge
|
48d254c7ae
|
esc menu buttons visuals fix
Former-commit-id: 742857d2f7bcf19a543890bf780d9b46fbca9e0e
|
2019-05-03 22:25:23 +02:00 |
|
Forest
|
75f8a638f7
|
Ran clean code
Former-commit-id: 77b012d79af3cb9e56c008df1802c89a38f3374c
|
2019-05-03 09:49:05 -04:00 |
|
Pfauenauge
|
8240997f8c
|
New Buttons and Input Frame
Former-commit-id: cf05992eca9e6a75cedda8c873ef268e4bbaade8
|
2019-05-03 13:48:55 +02:00 |
|
Pfauenauge90
|
b3bac9a46e
|
Controls Window
Former-commit-id: 785b039f9241da2f0ba66e7e2db2a14a9b8b54c9
|
2019-05-03 13:48:54 +02:00 |
|
Pfauenauge
|
c188affb4e
|
rebase
Former-commit-id: 9c50e08fc7c4e8afa06f1f995ea1aebd386764c2
|
2019-05-03 13:48:53 +02:00 |
|
Pfauenauge
|
c312a8cece
|
rebase
Former-commit-id: 214203f0d1ccb4e6457395e84b01e4d41467ecdb
|
2019-05-03 13:48:52 +02:00 |
|
Pfauenauge
|
dc4ea871ea
|
Controls Window Contents
Former-commit-id: f3317475e6a06c63ae0a648b29168474b9cf7544
|
2019-05-03 13:48:26 +02:00 |
|
Pfauenauge
|
02ba0d969f
|
Controls Window Text
Former-commit-id: 7f33117748c84644e9f6d7833b5ff44e035e7d76
|
2019-05-03 13:48:25 +02:00 |
|
Pfauenauge
|
188e523128
|
rebase
Former-commit-id: f44030800c380054af2fef4532bbe93731f128e4
|
2019-05-03 13:46:13 +02:00 |
|
Pfauenauge
|
12347ead0b
|
settings window
Former-commit-id: 3cefa7cc816206fd777f4a94a9b9a1689ed9aa03
|
2019-05-03 13:46:12 +02:00 |
|
Pfauenauge
|
cbd754bd90
|
settings window
Former-commit-id: a7a72ab6b1db411fcfcf3e03d1db4fce56370af3
|
2019-05-03 13:46:12 +02:00 |
|
Pfauenauge
|
1109c55671
|
Map Window, Settings Window
Former-commit-id: 337f21010b8c4250a1eaa7ddfbe8d5f2ea1ac412
|
2019-05-03 13:46:12 +02:00 |
|
Pfauenauge
|
5852efd896
|
settings window
Former-commit-id: 41d85bdc41507bb8c26e5cda2db3135200db7be5
|
2019-05-03 13:46:11 +02:00 |
|
Pfauenauge
|
1f369d37bf
|
Map Window, Settings Window
Former-commit-id: e01861cab1a42540a8b92db46debf95ede3978aa
|
2019-05-03 13:46:11 +02:00 |
|
Pfauenauge
|
632ecabef9
|
Map Window, Settings Window
Former-commit-id: a94f57941d95cc271a5642e54af7e6ddf373cd18
|
2019-05-03 13:40:48 +02:00 |
|
Yeedo
|
b7ba7f0795
|
Use shorter help text format, compact stuff into one format!()
Former-commit-id: 345bef9a2f0714986e4ba6fb24b0bc150023a12e
|
2019-05-01 23:15:43 +01:00 |
|
Yeedo
|
f1e268986b
|
cargo fmt, also remove a stray <<<<HEAD thing
Former-commit-id: 2be13ebd752d8f90fb22358597878dc8dd8df1ef
|
2019-04-29 22:23:31 +01:00 |
|
Yeedo
|
164feaa616
|
fix merge conflicts
Former-commit-id: 72614e5d57607a2095161857df45ce746e8c1b06
|
2019-04-29 22:13:14 +01:00 |
|
Forest Anderson
|
993388e56a
|
Ran fmt on codebase
Former-commit-id: 7fecffa1dc66fffba4f07d45fb80960dc5178f4f
|
2019-04-29 20:37:19 +00:00 |
|
Monty Marz
|
c7b61d5626
|
New Settings Window and Map Window
Former-commit-id: ca6d1c937193cb29afb2dd484c596b79c947f36e
|
2019-04-29 19:04:52 +00:00 |
|
Pfauenauge
|
3773653072
|
Closable minimap
Former-commit-id: bc92efc783adb780c11c507bd4084e09494a7e32
|
2019-04-28 15:56:40 +02:00 |
|
Yeedo
|
44f8e834fc
|
Redo settings -> help text, add supplement_events to Window.
Former-commit-id: a0e023c1cce1677cd1178490df9c569b774db6b6
|
2019-04-28 14:19:08 +01:00 |
|
Yeedo
|
488132f63b
|
Update help window to use player's keybindings (fix #42)
Former-commit-id: b1d374e83ab134a094b664ada8f35916e4734602
|
2019-04-28 14:19:08 +01:00 |
|
Yeedo
|
be9a399269
|
Redo settings -> help text, add supplement_events to Window.
Former-commit-id: 1e679a6fc3300b6269672650564405c031b151ae
|
2019-04-28 14:19:08 +01:00 |
|
Yeedo
|
50c6518d89
|
Update help window to use player's keybindings (fix #42)
Former-commit-id: 5f35a153f05b48ae8c21ae9735080c5c7392e2dc
|
2019-04-28 14:19:08 +01:00 |
|
Pfauenauge90
|
0afbba3303
|
FPS display moved, changes to windows
Former-commit-id: 141d250e29273f59edf661eff7fc7ebd88754435
|
2019-04-28 13:18:00 +02:00 |
|
Pfauenauge90
|
33515bd04c
|
removed test_assets in voxygen
Former-commit-id: 6f2a995cf6905066e41d4224016b3d63dfbcacca
|
2019-04-28 13:18:00 +02:00 |
|
Pfauenauge
|
d7be49def1
|
Minimap changes, grass colour adjusted
Former-commit-id: 9dd743eb6277c76c0b596592bc8bec4a875038b5
|
2019-04-25 23:43:32 +02:00 |
|
Pfauenauge
|
bf8bb9180b
|
bag visuals fix
Former-commit-id: e73f822883badd76d823c69984675a76e9bbbf1e
|
2019-04-25 22:33:14 +02:00 |
|
Forest Anderson
|
cabb06717b
|
Merge branch 'show-mouse-esc' into 'master'
Show mouse on Esc, hide when pressing again
Closes #28
See merge request veloren/veloren!61
Former-commit-id: 37d5792a563f4cce2f2c9f13d3d46cf098caf27f
|
2019-04-25 18:27:08 +00:00 |
|
timokoesters
|
e36ca0bc59
|
Fix unnecessary if
Former-commit-id: 303b140a06045a7eb3406402d5e30480571a713d
|
2019-04-25 10:27:18 +02:00 |
|
timokoesters
|
a981d57379
|
Fix formatting
Former-commit-id: 5fd593a918f22d02b2c5be246c81ef1e8042ad69
|
2019-04-24 22:33:34 +02:00 |
|
timokoesters
|
8314fc9439
|
Update UI
Former-commit-id: 644483e15f2d4db6ab2400ffe4fb202729769217
|
2019-04-24 21:55:22 +02:00 |
|
sxv20_
|
0127cae5d0
|
remove TODO comment
Former-commit-id: cd90cd0403d03b6c8c9477a7377ad25288cc1488
|
2019-04-23 18:36:29 +01:00 |
|
sxv20_
|
ded36d7c8d
|
Add debug window, debug window toggle
Former-commit-id: f0eee8c127dab7c6f552e00ca26632fe1798ee5d
|
2019-04-22 20:24:54 +01:00 |
|
sxv20_
|
64c97f47fc
|
Add prototype FPS counter to HUD
Former-commit-id: c75778ff22ddd44d6e398a559193bc0d0c2e62fe
|
2019-04-22 20:24:16 +01:00 |
|
timokoesters
|
f8d1340199
|
Show mouse on Esc, hide when pressing again
Former-commit-id: 440fd99b32b2490cb87add2e095cdd17fece0b57
|
2019-04-22 20:23:40 +02:00 |
|
Imbris
|
7fa37e0c2a
|
update asset loading to not use env
Former-commit-id: 1858f3e06a26502c8bb6a3237e216d551377f6c6
|
2019-04-20 18:02:48 -04:00 |
|
Imbris
|
d6d4155fc4
|
rearrange hud event handling slighlty
Former-commit-id: 8043d6c6197112123c371258407ea886a5ae3595
|
2019-04-20 14:08:39 -04:00 |
|
Imbris
|
67584a49ce
|
hide chat input when not typing
Former-commit-id: a1982ef2edf991c94cea359a2892cbf13ef8e980
|
2019-04-20 11:43:38 -04:00 |
|
Imbris
|
83ed5200b0
|
hide entire hud when toggling interface
Former-commit-id: 969564ecfd85df0477db4216cd8974adf2df1921
|
2019-04-20 11:34:45 -04:00 |
|
Imbris
|
2147774665
|
Stop sending empty messages
Former-commit-id: 0f2ed6d0adbbf07566ae1cee1cb0c0498c0c15d8
|
2019-04-20 11:34:45 -04:00 |
|
Imbris
|
eef5dd28b5
|
Fix chat spacing
Former-commit-id: 2e823a1deb51e2fc77a1662b291ed1b5d01b3e70
|
2019-04-20 10:46:36 -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 |
|
Joshua Barretto
|
56e50f4d58
|
Minor fixes
Former-commit-id: 54c2b050fd9be82916d66c872fa9ab5f5354f9dd
|
2019-04-18 14:21:25 +01:00 |
|
Pfauenauge90
|
1ea7b5031d
|
Help window Closing button fixed
Former-commit-id: 75c539985527e38b13bf7aa382d3b9491ef19fed
|
2019-04-17 23:06:21 +02:00 |
|
Pfauenauge90
|
2e671899e0
|
Error Window, Alpha Version Display
Former-commit-id: 59ee7e42ca522cdcdbec7b07dbee4d3249213aab
|
2019-04-17 23:06:21 +02:00 |
|
Pfauenauge90
|
a23e71a258
|
Rebase and Login Error
Former-commit-id: 226fca5f37aa9c94fdd3e1a030c7de4703deba4c
|
2019-04-17 23:06:21 +02:00 |
|
Imbris
|
3658a50685
|
Fix most spacing issues in chat
Former-commit-id: 90a4080123b77630888967423b030153b9f81709
|
2019-04-16 20:17:15 -04:00 |
|
Imbris
|
571e319a62
|
make zooming always work if cursor is grabbed
Former-commit-id: e07bb0746fa117f045d62919a4ca55a8eb0c6cf7
|
2019-04-14 20:53:42 -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 |
|
Pfauenauge90
|
51047236a0
|
chat changes
Former-commit-id: c2a5ae0d34e1e93d8f6feb4a9e5cf69045db7275
|
2019-04-14 15:19:12 +02:00 |
|
Pfauenauge90
|
bc420e41d6
|
help window, chat padding, font colours
Former-commit-id: 8d42f8e05cd11f669e4e56873e31a8530272b3b2
|
2019-04-14 15:19:11 +02:00 |
|
Pfauenauge90
|
a45e9e708c
|
Help window, chat padding, font colours
Former-commit-id: 18643504fd8e94ed991c137e9ea91dfa094686c7
|
2019-04-14 15:17:38 +02:00 |
|
Pfauenauge90
|
822901b08b
|
Chat padding, Font Colours to white, Help Window
Former-commit-id: d36a878971f92fbf16eb44d3102b4328832e6563
|
2019-04-14 15:15:42 +02:00 |
|
Imbris
|
2e14f7d559
|
update colors to match gamma scaling
Former-commit-id: 461b5cf751d329a219250bc8090b016f54f3ec96
|
2019-04-14 15:12:29 +02:00 |
|
Imbris
|
fb83c836a1
|
make to_server() blocking, post fixes & cleanup, use server address
Former-commit-id: 7debc790e158a996ed58271d3307214e42b850bd
|
2019-04-14 15:04:44 +02:00 |
|
Imbris
|
5404cc548a
|
remove hidden chat scrollbar
Former-commit-id: fc534a2d71bbdbf2989b9772c7d5a64aa44f1ed9
|
2019-04-13 10:52:48 -04:00 |
|
Marcel Märtens
|
251cccffe5
|
add simple interface to get assets from various locations
Former-commit-id: 2ee6c4ef811e935eb8684a2cd827a97b8ad0be7a
|
2019-04-13 03:40:59 +02:00 |
|
Pfauenauge90
|
3f2a938735
|
Key Command Changes, Char Window
Former-commit-id: 16c94f35da889ea418e7dc32043e6ebd25f2664b
|
2019-04-09 18:30:13 +02:00 |
|
Pfauenauge
|
4607ad612d
|
Minor changes to font sizes
Former-commit-id: d998532c9b858cea5704b307b8bc6ef0ef3c75d7
|
2019-04-07 00:05:56 +02:00 |
|
Pfauenauge
|
8ecb849970
|
Char Window, Mana, Health, Exp-Bar
Former-commit-id: 546d29aae7441232892c7b7438708e93fb440128
|
2019-04-06 00:36:04 +02:00 |
|
Pfauenauge90
|
c1af42522d
|
char window additions
Former-commit-id: 63dfbd68594fc7ecb6e9caf610c9c5165c9e88d4
|
2019-04-04 19:35:33 +02:00 |
|
Pfauenauge90
|
6ebff7ce2c
|
Merged with UI-Input
Former-commit-id: f18e92dcac87c3b2806065078c70527ffd805876
|
2019-04-04 16:45:57 +02:00 |
|
Pfauenauge90
|
6d6c585808
|
char window
Former-commit-id: e3a6e5aadf20f60e6db237d63382cd55cd8211b9
|
2019-04-04 15:51:36 +02:00 |
|
Pfauenauge90
|
b29343490f
|
disabled chat arrows
Former-commit-id: 5a5ea8e7101c16ae780af1fb9b3e6e4ba59a98b4
|
2019-04-02 16:25:14 +02:00 |
|
Pfauenauge90
|
a4f96b4642
|
Inventory
Former-commit-id: 01df86c3a652e4a36d37edfdcc90dc350c1e5b04
|
2019-04-02 06:54:27 +02:00 |
|
Pfauenauge90
|
8378663cca
|
Added controls to open menus
Former-commit-id: cfa167aef56e12def40a083effe37d1b0216c00f
|
2019-04-02 03:05:18 +02:00 |
|
Pfauenauge90
|
87a41a30a7
|
Bag Additions
Former-commit-id: 62e02ad0d67916b8ee12674e564931e92c08ee95
|
2019-04-02 01:26:42 +02:00 |
|
Pfauenauge90
|
0ce80ec9ad
|
Inventory Window
Former-commit-id: 4f8c6fbef1dd4afea587ece7187a17648ff3e301
|
2019-04-01 22:31:29 +02:00 |
|
Imbris
|
ca454d0c8b
|
make chat arrow only appear when scrolled up and enable it
Former-commit-id: 72bf830acea7fa273d90b996ce7bcf88f215d1bf
|
2019-03-29 22:59:31 -04:00 |
|
Imbris
|
820967838d
|
enable chat with enter while cursor is captured
Former-commit-id: a6b54d6325135462e04c2cec1703f45641c389f2
|
2019-03-29 22:15:27 -04:00 |
|
Pfauenauge
|
702e8321b1
|
Added chat arrow
Former-commit-id: 387bf73af19e23678a9048ab3870665c88ff47b9
|
2019-03-30 01:11:10 +01:00 |
|
Pfauenauge
|
51e41ade07
|
Filepath fixes
Former-commit-id: b3134806904d8fb0b7fb1ee4dc05ea96af1474e8
|
2019-03-29 22:36:15 +01:00 |
|
Pfauenauge
|
99e364dc54
|
Asset Path Changes
Former-commit-id: 8d31707d0e5c6db8328e0a389296f4f1a7f7cd69
|
2019-03-29 21:08:14 +01:00 |
|
Pfauenauge90
|
60df735e3b
|
accessories tab
Former-commit-id: 542362e98e908c9ec7c563d7fdcd43c4b8f922fd
|
2019-03-28 23:03:39 -04:00 |
|
Imbris
|
bee273fc9e
|
replace mmap button bools with an enum
Former-commit-id: e7c7e17b3473d250e2fd23f6a75f3012297c7bd5
|
2019-03-28 00:00:51 -04:00 |
|
Imbris
|
589110c2f5
|
modify chat visually, replace whitney with opensans, add to charcreation
Former-commit-id: 50ec03271ae5e9e7995144fd2d0701f62a68e5f7
|
2019-03-27 22:25:08 -04:00 |
|
Imbris
|
283a5a2a7d
|
add more elements to character creation screen
Former-commit-id: 0cac8ca7a1f8e836a086250d200d5dca6191e555
|
2019-03-22 22:22:05 -04:00 |
|
Imbris
|
aef3179448
|
remove chat message echoing by ui
Former-commit-id: f97358f3bdb39048ed705abff17cbd4c949dbaf3
|
2019-03-21 23:55:52 -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
|
d82adb7e71
|
add char selection playstate
Former-commit-id: 1d97cf90686532cb354d12f79a129a0a9c7fde98
|
2019-03-20 01:26:24 -04:00 |
|
Imbris
|
03b20fa1bd
|
connect chat box to network
Former-commit-id: 581c724ee31564c7473120d5431ceb2182afb207
|
2019-03-20 01:26:22 -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
|
f837492284
|
add chat box, minimap buttons, ui windows, etc
Former-commit-id: 09d3e20b917a9ac9ef6333ee9bb913d01a7fb52c
|
2019-03-20 01:24:27 -04:00 |
|