Brad Davis
|
ca1af77763
|
Working on cursor manager
|
2015-06-10 13:24:56 -07:00 |
|
ZappoMan
|
a0e51469d3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
|
2015-05-28 12:36:34 -07:00 |
|
Brad Davis
|
e5bec42512
|
Fix mouse emulation picking and pointer positioning for the hydra
|
2015-05-27 23:36:00 -07:00 |
|
Ryan Huffman
|
3f22b5f8b3
|
Add RenderArgs to more render methods
|
2015-05-22 15:25:53 -07:00 |
|
Ryan Huffman
|
5ac02f66ca
|
Remove const from ApplicationOverlay::renderOverlay
|
2015-05-22 09:58:20 -07:00 |
|
Ryan Huffman
|
4a4c9c75fc
|
Add gpu::context to RenderArgs and start using RenderArgs in place of the flags
|
2015-05-22 09:50:51 -07:00 |
|
Brad Davis
|
6797174b97
|
Fix picking in the HMD
|
2015-05-14 19:15:47 -07:00 |
|
Bradley Austin Davis
|
fc73676b4d
|
Merge branch 'master' into plugins_pt1
|
2015-05-06 11:43:25 -07:00 |
|
Brad Davis
|
302aa9db47
|
Removing access to the gl widget and display managers
|
2015-05-02 00:49:52 -07:00 |
|
David Rowe
|
bc05159504
|
Add face tracking toggle button beside microphone toggle button
|
2015-04-30 23:14:22 -07:00 |
|
Brad Davis
|
aba2b395a6
|
Working on testing the QML ui
|
2015-04-15 12:35:30 -07:00 |
|
Brad Davis
|
d14d5f3d29
|
Working on new-UI implementations of address bar and login
|
2015-04-15 00:36:04 -07:00 |
|
Atlante45
|
1cc4384404
|
Add new frame of reference for cursor
|
2015-04-07 17:13:30 +02:00 |
|
ZappoMan
|
6cff99f9d6
|
menu and display tweaks
|
2015-03-26 16:36:46 -07:00 |
|
Thijs Wenker
|
46618db697
|
Merge branch 'master' of https://github.com/worklist/hifi into 20224
Conflicts:
interface/src/ui/ApplicationOverlay.h
|
2015-01-28 19:35:17 +01:00 |
|
Atlante45
|
229791a9f2
|
Move Oculus UI ratio to ApplicationOverlay
|
2015-01-17 19:45:48 -08:00 |
|
Thijs Wenker
|
74d56fb754
|
Merge branch 'master' of https://github.com/worklist/hifi into 20224
|
2015-01-13 22:42:02 +01:00 |
|
Atlante45
|
cf7089e145
|
Move constant back to Menu
|
2015-01-12 18:49:05 -08:00 |
|
Thijs Wenker
|
3da5677aaf
|
added HMD interface to toggle magnifier
|
2015-01-13 00:43:16 +01:00 |
|
ZappoMan
|
a9b7367fa9
|
more work on eliminating immediate mode calls
|
2015-01-05 20:51:05 -08:00 |
|
ZappoMan
|
be137534b5
|
first cut at registered quads to reduce copies of constantly changing quads
|
2014-12-30 12:38:16 -08:00 |
|
Atlante45
|
299389ccef
|
Fixed typo
|
2014-12-08 09:59:33 -08:00 |
|
Atlante45
|
1bb08ef30f
|
Centered reticule
|
2014-12-05 17:10:58 -08:00 |
|
Atlante45
|
90d4e7bae9
|
Comments
|
2014-12-04 19:38:39 -08:00 |
|
Atlante45
|
7026af7b9a
|
Centrilized Oculus interference in pickRay
|
2014-12-04 17:26:14 -08:00 |
|
Atlante45
|
3b6936b47d
|
Changed Mag and reticules data representation
|
2014-12-04 11:16:01 -08:00 |
|
Atlante45
|
bd39688c62
|
Magnifiy window tweaks
|
2014-12-03 17:04:26 -08:00 |
|
Atlante45
|
73004d1bee
|
Decoupled reticules from Overlays view
|
2014-12-03 14:40:47 -08:00 |
|
Atlante45
|
bf21376c90
|
TexturedHemisphere class
|
2014-12-02 13:34:11 -08:00 |
|
Atlante45
|
3c5f33f0ac
|
Hemisphere vbo refactoring
|
2014-12-02 12:28:04 -08:00 |
|
Ryan Huffman
|
4852fcc034
|
Add red border to main window when not connected to domain
|
2014-08-11 18:43:49 -07:00 |
|
barnold1953
|
16fd8f224c
|
Imrpoved repeat texture method, its almost finished
|
2014-07-18 21:42:20 -07:00 |
|
barnold1953
|
baf825789e
|
Made Oculus UI radius not a magic number
|
2014-07-10 10:28:56 -07:00 |
|
barnold1953
|
004db004a6
|
Dynamically resize lasers so they always end on UI
|
2014-07-09 17:03:09 -07:00 |
|
barnold1953
|
56ff74dd56
|
Removed ApplicationOverlay::resize()
|
2014-07-09 16:39:05 -07:00 |
|
barnold1953
|
6e92beeb1c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK
Conflicts:
interface/src/Application.cpp
interface/src/ui/ApplicationOverlay.h
|
2014-07-09 16:32:02 -07:00 |
|
barnold1953
|
8147f2cd91
|
Fixed some magnification window bugs
|
2014-07-09 16:30:00 -07:00 |
|
barnold1953
|
090f1fd852
|
Fixed bug with 3rd person UI ray picking
|
2014-07-09 16:09:06 -07:00 |
|
barnold1953
|
e64f34a257
|
Separated mouse and controller pointers
|
2014-07-09 12:03:32 -07:00 |
|
David Rowe
|
51f7e8904d
|
Integrate UI toggling menu item and Hydra UI toggling
They work together and both fade the UI in / out.
|
2014-07-08 21:04:30 -07:00 |
|
barnold1953
|
cc63f706a7
|
Functional sixense "laser" oculus selection mode.
|
2014-07-08 11:43:24 -07:00 |
|
David Rowe
|
2ad2b6cd1c
|
Resize the overlay framebuffer when the application window is resized
|
2014-07-03 18:23:37 -07:00 |
|
barnold1953
|
67ecde7d31
|
Made tree editor voxel world stationary and not crash
|
2014-07-01 21:39:19 -07:00 |
|
barnold1953
|
64725dd21b
|
Unneeded comment
|
2014-06-17 17:15:43 -07:00 |
|
barnold1953
|
fa32ad5b11
|
De-janked code by removing magic numbers
|
2014-06-17 17:14:26 -07:00 |
|
barnold1953
|
bee84a064c
|
Dont render red border for mouse magnifier
|
2014-06-17 12:41:53 -07:00 |
|
barnold1953
|
7bb8e4d571
|
Animated magnification opening and closing
|
2014-06-17 11:20:02 -07:00 |
|
barnold1953
|
dc663dedf8
|
Fixed compiler warnings
|
2014-06-17 10:45:59 -07:00 |
|
barnold1953
|
3052996a9e
|
Pressing trigger and bumper at same time toggles UI
|
2014-06-17 10:37:15 -07:00 |
|
barnold1953
|
2b374470b0
|
Allow clicking on magnified controls
|
2014-06-16 15:24:53 -07:00 |
|