Commit Graph

120 Commits

Author SHA1 Message Date
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
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
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
3214164070 Working with upstream
Former-commit-id: 6543387e4df9a96a443c510c9e382ace3731d2f6
2019-03-19 14:12:42 +00:00
Joshua Barretto
e2f75c118e Figure changes
Former-commit-id: c4cfb35c950f938cb8c7f8169518333db6364ad2
2019-03-19 11:35:38 +00:00
Joshua Barretto
664f28a972 Patched in netcode refactor
Former-commit-id: 34a3b9a95129edad6dc8280d9a3cb41581d4d386
2019-03-19 11:35:38 +00:00
Joshua Barretto
a8b0039898 Added networked entity updates, player entity allocation
Former-commit-id: b81d6e38a74f846d64c092d1422dc402f369100c
2019-03-19 11:35:38 +00:00
Joshua Barretto
2fffe21bc7 Added client localhost connection
Former-commit-id: d4dec70ef3ecad8f40196b87b0f5c8b55c51c44a
2019-03-04 19:58:58 +00:00
Joshua Barretto
dbbcc1e80e Added basic networked communications, chat communication
Former-commit-id: 06bafdf69486f4da5fbc416835e34c5bed8c2caa
2019-03-04 19:58:58 +00:00
jshipsey
187b7939d7 adding test assets
Former-commit-id: e6cb2b75321c359ad6fdbf8e4ee1dc90c359f645
2019-03-04 19:58:58 +00:00
jshipsey
966fcc1709 quadruped testing
Former-commit-id: eb863aa33671032799b70833619ebb3d4d77c58a
2019-03-04 19:58:58 +00:00
Imbris
33b8922aa4 move/name velocity constant, rename move_vec, simplify cam rotate_by()
Former-commit-id: 0835a9e91bd0133922f5d4e9731b9f6b6b547a0b
2019-03-02 14:43:51 -05:00
Imberflur
6f5f80f749 add player movement with basic physics ecs system
Former-commit-id: f2e151971a42b25bfd1971311f5a06535a577007
2019-03-01 22:48:30 -05:00
Joshua Barretto
c16a257ae3 Added server-cli, UI tests
Former-commit-id: 93bf5b39138920aa7a4a773a8247d716866c4a05
2019-01-30 12:11:34 +00:00
Joshua Barretto
a1617e7b5c Added window resize handling 2019-01-23 22:39:31 +00:00
Joshua Barretto
8a37662cf0 Cleaned up codebase, added cursor grab toggle 2019-01-23 22:21:47 +00:00
Joshua Barretto
248577bdef Added test terrain loading and meshing 2019-01-23 20:01:58 +00:00
Joshua Barretto
41b6672743 Added Terrain type to scene 2019-01-15 15:13:11 +00:00
Joshua Barretto
bd561dd1aa Added terrain pipeline 2019-01-14 23:13:58 +00:00
Joshua Barretto
ae4f1ae2ea Added vox trait 2019-01-14 18:49:53 +00:00
Joshua Barretto
c5a506dad2 Moved client to session type 2019-01-14 15:47:57 +00:00
Joshua Barretto
0a122431db Restructured animation code 2019-01-14 14:40:22 +00:00
Joshua Barretto
86e70751e0 Moved to Skeleton and Animation traits 2019-01-14 14:18:58 +00:00
Joshua Barretto
8184bc6fc0 Added figures, segments, test .vox files, basic animation test 2019-01-13 20:53:55 +00:00
Joshua Barretto
b37a6b67f9 Added time of day, tick time, basic skybox shader and client to voxygen 2019-01-12 15:57:19 +00:00
Joshua Barretto
96d01a9293 Made it bloo 2019-01-12 14:01:01 +00:00
Joshua Barretto
979f47420d Added camera panning and cursor trapping 2019-01-12 13:56:34 +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