Commit graph

87 commits

Author SHA1 Message Date
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
barnold1953
84d183b2bc Switched Oculus magnify method to a manual mode 2014-06-16 14:46:40 -07:00
barnold1953
53d4cc795a Removed unused UI types that clutter code 2014-06-13 16:09:45 -07:00
barnold1953
587c0e5a9d Render Oculus pointers separate from texture for better quality 2014-06-13 16:01:59 -07:00
barnold1953
c593117ac5 New reticle for sixense and oculus mouse movement 2014-06-13 15:03:09 -07:00
barnold1953
e4a0275f57 Exposed sixense and mouse options and oculus UI angle to preferences 2014-06-13 10:53:11 -07:00
barnold1953
a13ef5c3bf Made applicationoverlay more readable 2014-06-12 13:19:02 -07:00
barnold1953
18543ff313 Support for multiple oculus overlay magnifiers 2014-06-12 12:07:25 -07:00
barnold1953
936f04cece Simple raypicking for scripts with oculus rift. 2014-06-09 11:55:29 -07:00
barnold1953
4e699c0f84 Fixed coding standard and build error 2014-06-05 10:34:06 -07:00
barnold1953
e60c671c05 Switched Oculus UI to hemisphere. Added curved semicircle UI 2014-06-04 17:24:20 -07:00
barnold1953
d4fd1e9515 Stopped Oculus UI from glowing. 2014-06-03 16:01:47 -07:00
barnold1953
f4391bcdbe _distance variable 2014-06-02 17:23:32 -07:00
barnold1953
90754e320d Curved Oculus overlay around camera as a semicircle 2014-06-02 16:05:07 -07:00
barnold1953
ebfb11c1ce Renamed OverlayRenderer to ApplicationOverlay and moved it up a directory 2014-05-28 10:46:46 -07:00
Renamed from interface/src/ui/overlays/OverlayRenderer.h (Browse further)