Commit Graph

102 Commits

Author SHA1 Message Date
Louis Pearson
7ec6e09332 Add basic singleplayer support
Former-commit-id: 929b05faca5d2b95a96349dfc17a62b3165289a1
2019-04-17 07:41:34 -06:00
Piotr
ddb32eec30 Animation States
Former-commit-id: 769f09dc44143b5e54623ea819db2d6149429184
2019-04-16 14:29:44 +00:00
Imbris
b7439b9107 ignore tx.send() result
Former-commit-id: 2d4b2d258f8fd3b030bb7f1e9596ccb6750d50ff
2019-04-14 20:23:26 -04:00
Imbris
e377e8ff09 Add asynchronus client creation to Voxygen
Former-commit-id: 0c11cc8a7ddc7b425e036c2357c233e376002c6e
2019-04-14 23:28:29 +00:00
Joshua Barretto
3d9f8105e6 Started work on server-side chunks
Former-commit-id: 84a6bd7358f67a77043c4b11c787538f073c8d28
2019-04-14 14:23:43 +01:00
Joshua Barretto
62b91eb01b Integrated Sphynx
Former-commit-id: 5d96983a385bb77a2876aa7439158252b7e2f0fc
2019-04-14 14:23:43 +01:00
Pfauenauge90
8e69464588 Charselection Help Text
Former-commit-id: 463a3aad1c8d0b8e98f0b5464103016c401d1d32
2019-04-14 15:19:12 +02:00
Pfauenauge90
6b32d2bcb6 Updated race descriptions
Former-commit-id: 2384a6f01a27000d39ba9e399468e1d7897b6b1f
2019-04-14 15:19:12 +02: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
fb83c836a1 make to_server() blocking, post fixes & cleanup, use server address
Former-commit-id: 7debc790e158a996ed58271d3307214e42b850bd
2019-04-14 15:04:44 +02: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
6ebff7ce2c Merged with UI-Input
Former-commit-id: f18e92dcac87c3b2806065078c70527ffd805876
2019-04-04 16:45:57 +02:00
Pfauenauge90
0ce80ec9ad Inventory Window
Former-commit-id: 4f8c6fbef1dd4afea587ece7187a17648ff3e301
2019-04-01 22:31:29 +02: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
Pfauenauge90
07f7e89ca7 removed assets from folder, added race desc
Former-commit-id: fd11261bfbf3e5986775dc6b818fced9df6dd09b
2019-03-28 23:07:10 -04:00
Pfauenauge90
60df735e3b accessories tab
Former-commit-id: 542362e98e908c9ec7c563d7fdcd43c4b8f922fd
2019-03-28 23:03:39 -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
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
d82adb7e71 add char selection playstate
Former-commit-id: 1d97cf90686532cb354d12f79a129a0a9c7fde98
2019-03-20 01:26:24 -04:00
Imbris
9aece17286 fix rebase error
Former-commit-id: 9d3866f860c80468c5087d8f8dbffd7c8a8441f9
2019-03-20 01:24:28 -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
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
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
2fffe21bc7 Added client localhost connection
Former-commit-id: d4dec70ef3ecad8f40196b87b0f5c8b55c51c44a
2019-03-04 19:58:58 +00:00
Joshua Barretto
c16a257ae3 Added server-cli, UI tests
Former-commit-id: 93bf5b39138920aa7a4a773a8247d716866c4a05
2019-01-30 12:11:34 +00:00
Joshua Barretto
c5a506dad2 Moved client to session type 2019-01-14 15:47:57 +00:00
Joshua Barretto
96d01a9293 Made it bloo 2019-01-12 14:01:01 +00:00
Joshua Barretto
45d5a0a396 Added cursor trapping, more documentation 2019-01-12 01:14:58 +00:00
Joshua Barretto
c9d877de7a Added session, documented, improved structure 2019-01-11 23:18:34 +00:00
Joshua Barretto
d559d633ab Added pipeline components 2019-01-11 20:14:37 +00:00
Joshua Barretto
d8c87984d5 Switch back to old gfx backend 2019-01-11 17:30:13 +00:00
Joshua Barretto
5d6ec363a5 Added triangle test 2019-01-07 21:10:31 +00:00
Joshua Barretto
6f358fc762 Added RenderCtx 2019-01-02 22:08:13 +00:00
Joshua Barretto
7a29286053 Started adding voxygen and windowing code 2019-01-02 21:25:01 +00:00