Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 00:44:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
29012 commits 25 branches 0 tags 1.1 GiB
Commit graph

35 commits

Author SHA1 Message Date
Niraj Venkat
34e400ac67 Changing var name to 'DebugAmbientOcclusion' 2015-07-27 17:14:09 -07:00
ZappoMan
819fa852b8 first pass at GlowEctomy 2015-07-15 12:47:59 -07:00
Howard Stearns
5196648b22 Remove obsolete enum member. 2015-07-14 09:57:19 -07:00
Howard Stearns
51be245159 Remove old octreeFade code that wasn't working anyway. 2015-07-10 16:55:45 -07:00
Seiji Emery
a48adf5ce5 Cleanup + formatting 2015-06-30 14:12:58 -07:00
Seiji Emery
0ee0c92f2f Re-added stuff 2015-06-24 14:54:54 -07:00
Seiji Emery
1f0d9a250a Reverted render-utils and ui tests to be manual tests (not unit tests, and not incorporating QtTest). 2015-06-23 17:13:43 -07:00
Seiji Emery
d75f3b1398 Fixed test target dependencies (which were not getting added into the *-tests build targets) 2015-06-20 11:49:26 -07:00
Seiji Emery
64922ecc62 Setup cmake build files for QtTest-based unit tests. 2015-06-19 21:39:34 -07:00
Brad Hefta-Gaub
4de6d645e5 Merge pull request #4701 from jherico/infoview 
Infoviews & Browser in QML
 2015-05-06 12:12:21 -07:00
David Rowe
35dbb9491c Merge branch 'master' into 20518 2015-05-05 13:13:49 -07:00
Bradley Austin Davis
d2a8681139 Merge branch 'master' into infoview 2015-05-05 10:31:19 -07:00
David Rowe
d053379831 Add "Mute Face Tracking" menu item 2015-04-30 23:14:21 -07:00
Brad Davis
87ef98005d menu polish 2015-04-29 02:42:57 -07:00
Bradley Austin Davis
75f6ad3b99 Working on menus look 2015-04-29 00:43:18 -07:00
Brad Davis
0fb8884f9c Merge branch 'browser' into infoview 
Conflicts:
	tests/ui/src/main.cpp
 2015-04-28 17:54:04 -07:00
Brad Davis
9836ffed97 Merge branch 'vr_menus' into infoview 
Conflicts:
	tests/ui/src/main.cpp
 2015-04-28 01:17:51 -07:00
Brad Davis
4bb5e562ea Browser work 2015-04-27 22:39:48 -07:00
Brad Davis
19ca543c2c Cleaning up code and tweaking menu layout 2015-04-27 19:07:53 -07:00
Brad Davis
c799ecbf83 Fixing bad merge 2015-04-27 12:16:04 -07:00
Brad Davis
d8b814082e Removing extraneous header 2015-04-27 12:15:16 -07:00
Brad Davis
14b660baf7 Merge branch 'vr_menus' into infoview 
Conflicts:
	tests/ui/src/main.cpp
 2015-04-27 11:43:49 -07:00
Brad Davis
76ce34a74b Scanning for code style 2015-04-27 11:41:10 -07:00
Brad Davis
d55d467d3f Tweaking VR menu for PR 2015-04-27 11:35:57 -07:00
Brad Davis
fa31ba0754 Info-view 2015-04-26 10:37:14 -07:00
Brad Davis
a96f69a673 Switching to a wrapper mechanism for VR menus 2015-04-25 16:20:15 -07:00
Brad Davis
ee30588fd4 More menu work 2015-04-25 10:41:06 -07:00
Brad Davis
fbdb9b143e Merge branch 'ui-refactor' into m_and_m 
Conflicts:
	interface/resources/qml/HifiMenu.qml
	interface/resources/qml/MessageDialog.qml
	interface/resources/qml/Root.qml
	interface/resources/qml/TestRoot.qml
	interface/resources/qml/controls/Dialog.qml
	interface/src/Application.cpp
	interface/src/ui/LoginDialog.cpp
	libraries/ui/src/MessageDialog.cpp
	libraries/ui/src/MessageDialog.h
	libraries/ui/src/OffscreenQmlDialog.h
	libraries/ui/src/OffscreenUi.cpp
	libraries/ui/src/OffscreenUi.h
	tests/ui/src/main.cpp
 2015-04-24 18:02:12 -07:00
Brad Davis
e7b8efc2d9 Cleaning up unused stuff 2015-04-24 16:44:48 -07:00
Brad Davis
08d60c6a01 Fixing message dialog 2015-04-24 16:19:39 -07:00
Brad Davis
99a6e1f86c Breaking up offscreen UI work 2015-04-24 13:21:21 -07:00
Brad Davis
1ff8c67576 More work on menus and some code cleanup 2015-04-24 12:54:11 -07:00
Brad Davis
f17387fab4 Working on menus 2015-04-23 21:23:21 -07:00
Brad Davis
bb1c73adc7 Working on menus 2015-04-23 14:24:01 -07:00
Brad Davis
8cb298a55b Working on menus 2015-04-23 14:23:15 -07:00