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 |
|
Imbris
|
9aece17286
|
fix rebase error
Former-commit-id: 9d3866f860c80468c5087d8f8dbffd7c8a8441f9
|
2019-03-20 01:24:28 -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 |
|
Imbris
|
16ed207437
|
add main menu and more hud elements
Former-commit-id: 29557c100e2b82597ced04df09f41c4f132ffc5e
|
2019-03-20 01:24:25 -04:00 |
|
Imbris
|
3d5c11855a
|
add ui scaling
Former-commit-id: 7c6c3c8fc7d16c4a2cd0e5eff36248d6009652d2
|
2019-03-20 01:24:23 -04:00 |
|
Imberflur
|
e35e2fffc1
|
add support for drawing portions of images in the ui
Former-commit-id: 98a939fcdde6ed202c884cdaae56326e3f90d61d
|
2019-03-20 01:24:23 -04:00 |
|
Imberflur
|
a20517684a
|
remove variable aliasing in test_hud
Former-commit-id: d84d517197643650e8f6dce18e27e67ffd06163d
|
2019-03-20 01:24:23 -04:00 |
|
Imberflur
|
1cce7e1096
|
use new ui images for bag, fix flickering of bag
Former-commit-id: ac93916d648ad14cca142ac68e39dcc940bfe5f7
|
2019-03-20 01:24:22 -04:00 |
|
Imberflur
|
71da6e6588
|
rewrite/address/remove some ui TODOs and comments
Former-commit-id: bbcbb0ee6e8d4049ad98a5cea6274ce9ef0027e0
|
2019-03-20 01:24:22 -04:00 |
|
Imberflur
|
1962320f7e
|
add ui text rendering
Former-commit-id: 5b9b809c660a2fdd178688bdaa63d16128debe08
|
2019-03-20 01:24:21 -04:00 |
|
Imberflur
|
e68fa6b579
|
separate implementation code from generic UI code
Former-commit-id: 9c77ca03c4d834188ef863645ab2c26f31763b6c
|
2019-03-20 01:24:21 -04:00 |
|
Imberflur
|
3f052cae1c
|
setup ui image rendering, started creating test ui with iteraction
Former-commit-id: 73235ad6b25ab160e9cde3ad2513d4dd32660161
|
2019-03-20 01:24:20 -04:00 |
|
Imberflur
|
d685706c9b
|
remove old ui files
Former-commit-id: 82979b9df64ffa120f385e625648e04113c6a917
|
2019-03-20 01:24:19 -04:00 |
|
Imberflur
|
628a91af00
|
move conrod ui rendering and setup into ui::Ui
Former-commit-id: 1dc43fb7d73671d0b798238fecfcbf8d07ffbfcb
|
2019-03-20 01:24:18 -04:00 |
|
Imberflur
|
1df2cf2804
|
starting testing of conrod based ui
Former-commit-id: d417d2372ed95ae82e8d3766c558fb3498056987
|
2019-03-20 01:24:18 -04:00 |
|
Joshua Barretto
|
a32d977b32
|
Merge branch 'master' into 'master'
Networked entities
See merge request veloren/fresh!12
Former-commit-id: 0aab14fdc18f0567c662589dda5d2cf518072431
|
2019-03-19 19:54:09 +00:00 |
|
Joshua Barretto
|
26906d8674
|
Minor changes
Former-commit-id: 39beb7858926cb62a1f2d0db5c74e71c804c5962
|
2019-03-19 19:53:35 +00:00 |
|
Joshua Barretto
|
3214164070
|
Working with upstream
Former-commit-id: 6543387e4df9a96a443c510c9e382ace3731d2f6
|
2019-03-19 14:12:42 +00:00 |
|
Joshua Barretto
|
c75625f179
|
Physics update adjustment
Former-commit-id: 10a8828b1ac496c7419672b88049fbda848d9d9d
|
2019-03-19 11:35:38 +00:00 |
|
Joshua Barretto
|
e2f75c118e
|
Figure changes
Former-commit-id: c4cfb35c950f938cb8c7f8169518333db6364ad2
|
2019-03-19 11:35:38 +00:00 |
|
Joshua Barretto
|
8a0adab381
|
Fixed ping timeout logic
Former-commit-id: 080ca9d4149ec0ecddd92c475d77e4fc92f6edaa
|
2019-03-19 11:35:38 +00:00 |
|
Joshua Barretto
|
ffc4e6ebd4
|
Improved State API design
Former-commit-id: a32ab93409b1044fe2838f684d30ca2b963d4eb2
|
2019-03-19 11:35:38 +00:00 |
|
Joshua Barretto
|
99bd0630b7
|
Added post refactor unit tests
Former-commit-id: 66ea368de32dc6dfe22fc752476b71856e0588a0
|
2019-03-19 11:35:38 +00:00 |
|