Stephen Birarda
7bd98354d8
add override to supress warnings in ui-test
2015-10-05 15:53:52 -07:00
Stephen Birarda
80cf7b6c76
resolve conflicts on merge with upstream/master
2015-08-27 14:50:04 -07:00
Seth Alves
695ffa29c7
call setup_memory_debugger from common macros rather than from every CMakeLists.txt file
2015-08-26 11:09:59 -07:00
Atlante45
179ee73e26
Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol
2015-08-26 16:50:33 +02:00
Seth Alves
c25082d86f
use -fsanitize=address in all code rather than just the top-level links
2015-08-20 10:14:16 -07:00
Stephen Birarda
fd43c48eac
resolve conflicts on merge with birarda/protocol
2015-08-18 11:48:36 -07:00
Brad Hefta-Gaub
31a49a551a
Merge pull request #5556 from jherico/bart
...
QML framerate improvments
2015-08-14 11:11:14 -07:00
Brad Davis
0fa3044231
QML framerate improvments
2015-08-12 16:24:34 -07:00
David Rowe
e6473fc8b9
Merge branch 'master' into 20639
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Menu.h
tests/ui/src/main.cpp
2015-08-11 12:34:28 -07:00
David Rowe
b70c1a4960
Merge branch 'master' into 20639
2015-08-07 12:33:13 -07:00
Bradley Austin Davis
7e60aee1bf
Merge branch 'master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/avatar/Head.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/avatar/MyAvatar.h
interface/src/avatar/SkeletonModel.cpp
interface/src/avatar/SkeletonModel.h
interface/src/devices/3DConnexionClient.cpp
interface/src/ui/overlays/Overlays.cpp
2015-08-06 11:03:37 -07:00
David Rowe
d7b42e264e
Merge branch 'master' into 20639
...
Conflicts:
interface/CMakeLists.txt
2015-08-05 16:49:06 -07:00
Atlante45
3dc8bd47ae
Fix warning and remove unused headers
2015-08-05 16:46:44 -07:00
David Rowe
fae26d901c
Add menu option to render look-at targets
2015-08-04 18:34:56 -07:00
Bradley Austin Davis
53ccbfc4fa
Merge branch 'core' into plugins
2015-08-03 22:25:50 -07:00
Bradley Austin Davis
f19653f3e2
Integrate glew
2015-08-01 20:08:19 -07:00
Stephen Birarda
41c6220731
resolve conflicts on merge with upstream/master
2015-07-31 17:27:23 -07:00
Brad Davis
f7a2513f26
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Menu.cpp
interface/src/Menu.h
interface/src/avatar/MyAvatar.h
tests/ui/src/main.cpp
2015-07-30 12:55:22 -07:00
Howard Stearns
838711e526
Remove avatar->shift hips for idle animations.
...
See https://app.asana.com/0/32622044445063/43127903156601
2015-07-29 15:27:50 -07:00
Andrew Meadows
a1e6fdc4b2
Merge pull request #5435 from MarcelEdward/hifi-2-20069
...
Hifi 2 20069
2015-07-29 11:13:30 -07:00
SamGondelman
782a5c491e
removed hand lasers because they had been renamed so they weren't removed
2015-07-28 12:56:31 -07:00
Atlante45
8b71462dc1
Remove unnecessary headers
2015-07-28 10:36:00 -07:00
Brad Davis
a049b14d13
Merge remote-tracking branch 'upstream/master' into plugins
2015-07-28 10:04:19 -07:00
Niraj Venkat
34e400ac67
Changing var name to 'DebugAmbientOcclusion'
2015-07-27 17:14:09 -07:00
Marcel Verhagen
32d0513962
The 3Dconnextion files from https://github.com/highfidelity/hifi/pull/5351
...
For now without a merge conflict.
Updated the menu name.
Still have to look at the fast zooming and yaw on windows, probably have to add a var to prevent the button changes to be pushed to fast. Not sure why the yaw thing does not always work, could be that the position is also send at the same time and the input mapper does not not process all those synchronical. Probably will have to do something with masking the postion when the rotation is set for yaw.
2015-07-27 19:04:49 +02:00
SamGondelman
e3bc4b3b89
working on plugin menu manipulation
2015-07-21 13:45:33 -07:00
Anthony J. Thibault
e8da4b9586
merge with plugins, needs testing
2015-07-16 18:47:39 -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
Anthony J. Thibault
d75353eeb2
added left/right hand click actions, vive controller should be able to emulate mouse events
2015-07-07 14:35:55 -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
