Imbris
|
5404cc548a
|
remove hidden chat scrollbar
Former-commit-id: fc534a2d71bbdbf2989b9772c7d5a64aa44f1ed9
|
2019-04-13 10:52:48 -04:00 |
|
Marcel
|
aba7f2dfae
|
Merge branch 'assets' into 'master'
Assets
See merge request veloren/veloren!20
Former-commit-id: 238a7cc4cc66214c8a7948c874d8f2e052a20c81
|
2019-04-13 01:42:04 +00: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 |
|
Joshua Barretto
|
29d6cb5127
|
Merge branch 'master' into 'master'
Updated mouse wheel zooming to use WindowEvent
See merge request veloren/veloren!7
Former-commit-id: 04b7ffd2cabf7a771729c90d1ae07e89783b7417
|
2019-04-12 11:11:52 +00:00 |
|
Yeedo
|
99a2d9b257
|
Merge branch 'master' of gitlab.com:Yeedo/fresh
Former-commit-id: d50984a6d68b4911d62881792f941b9b167dde3c
|
2019-04-11 23:39:17 +01:00 |
|
Yeedo
|
b88dc1bbde
|
Updated mouse wheel zooming to use WindowEvent
Former-commit-id: 700fa66382f3a8e0fd738a8ce14fb44bc211b5fe
|
2019-04-11 23:12:42 +01:00 |
|
Joshua Barretto
|
5bba91039f
|
Merge branch 'master' into 'master'
SUBMODULE: Update assets submodule
See merge request veloren/veloren!18
Former-commit-id: 11720bf5b96cc41b9e1141db7fa21710905bba0e
|
2019-04-10 22:13:17 +00:00 |
|
RustyBamboo
|
3c3bf88d05
|
SUBMODULE: Update assets submodule
Former-commit-id: 4a684ce74a65185b7734821a24323d4bc842d650
|
2019-04-10 18:11:17 -04:00 |
|
Joshua Barretto
|
1dee192e5b
|
Merge branch 'ui' into 'master'
Key commands, bag changes
See merge request veloren/veloren!16
Former-commit-id: fd08a4a51272c82ff5007cbb88c65efe8b959de2
|
2019-04-09 16:44:32 +00: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 |
|
Joshua Barretto
|
a0001d788a
|
Merge branch 'master' into 'master'
Updated asset repo
See merge request veloren/veloren!17
Former-commit-id: dd30b4130d5e3b912140d2aca6390d01f1427b77
|
2019-04-05 22:34:31 +00:00 |
|
Joshua Barretto
|
9bd97b5176
|
Updated asset submodule
Former-commit-id: 2e14e80ecfee8eb939680c101b45311e96a93cf9
|
2019-04-05 23:33:23 +01: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 |
|
Joshua Barretto
|
fb05f4f93e
|
Tested chat-cli IP
Former-commit-id: 43c452f7785496694137ddd0fabc6e4c4e22c583
|
2019-04-02 12:59:48 +01: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 |
|
Joshua Barretto
|
b0f483184c
|
Merge branch 'ui' into 'master'
Ui
See merge request veloren/fresh!14
Former-commit-id: 0222d01456af717d4956c7aff373fcefe1527042
|
2019-04-01 11:40:43 +00:00 |
|
Imbris
|
6653376492
|
change ui pipeline fns push_quad/tri_to_mesh() into create_quad/tri()
Former-commit-id: 236ef2f0065ddb6e913923c41a37f172b323d610
|
2019-03-31 18:03:46 -04: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 |
|
Imbris
|
087f27b1e8
|
renamed some images
Former-commit-id: 4d946fb640159a9a7db5600f54f43866794272d4
|
2019-03-29 20:48:48 -04:00 |
|
Imbris
|
b619a2945b
|
add chat arrow to asset repo
Former-commit-id: 495fefe1766c59e6a0e48ca9b4deb121dc113c7f
|
2019-03-29 20:32:39 -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 |
|
Imbris
|
cf9780e1ec
|
remove title screen
Former-commit-id: 53b269b28ac38290c50bcf38c266534b673dacd2
|
2019-03-29 03:34:33 -04:00 |
|
Imbris
|
8c94b0fa2c
|
updated assets
Former-commit-id: ed8815d4afaadd37f8009895cae713324adfcd71
|
2019-03-29 03:20:23 -04:00 |
|
Imbris
|
b579c0f34e
|
assets submodule
Former-commit-id: cf7cd4997f68c0c4f6902b14a4ee57fdcf6f26b2
|
2019-03-29 02:59:08 -04:00 |
|
Imbris
|
48d5c70b2a
|
minor fixes
Former-commit-id: 56d6b123d6def65b3f7660eea6490277597813b0
|
2019-03-29 01:56:08 -04:00 |
|
Pfauenauge90
|
07f7e89ca7
|
removed assets from folder, added race desc
Former-commit-id: fd11261bfbf3e5986775dc6b818fced9df6dd09b
|
2019-03-28 23:07:10 -04:00 |
|
Pfauenauge90
|
33c8111502
|
removed unecessary .rar files
Former-commit-id: 3eeafbee3aeead1e28879fdaad37a8df1758937f
|
2019-03-28 23:03:42 -04:00 |
|
Pfauenauge90
|
60df735e3b
|
accessories tab
Former-commit-id: 542362e98e908c9ec7c563d7fdcd43c4b8f922fd
|
2019-03-28 23:03:39 -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
|
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
|
f753a64018
|
fix inconsistent text cursor height
Former-commit-id: da08c7ef8679a6f4626bf5fec0ec66ab5da9cad0
|
2019-03-24 22:15:29 -04:00 |
|
Imbris
|
283a5a2a7d
|
add more elements to character creation screen
Former-commit-id: 0cac8ca7a1f8e836a086250d200d5dca6191e555
|
2019-03-22 22:22:05 -04:00 |
|
Imbris
|
2cdfde905d
|
add character selection screen
Former-commit-id: 457af87f4046a6247530e516af15fd7ef5ea04cb
|
2019-03-22 02:29:09 -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 |
|