Brad Davis
5b817ccc21
Make all 2D overlays QML
2016-01-28 16:03:26 -08:00
Brad Davis
18d6a09dc9
Better preferences dialog initial state
2016-01-28 09:20:31 -08:00
Brad Davis
664100b9b1
Attachment dialog
2016-01-26 21:55:40 -08:00
Brad Davis
fee920723a
Cleaning up test project
2016-01-26 17:25:20 -08:00
Brad Davis
e52e35df8c
Better initial window positioning
2016-01-23 22:06:13 -08:00
Brad Davis
71ae36f5c0
Button prefs and conditionally enabled prefs
2016-01-22 19:06:30 -08:00
Brad Davis
858bbbf987
Adding OffscreenUI API for QInputDialog functionality
2016-01-22 17:31:03 -08:00
Brad Davis
c7186590ea
Support for directory browsing
2016-01-22 17:30:09 -08:00
Brad Davis
205ab05506
First pass on preferences dialog
...
Conflicts:
tests/ui/qmlscratch.pro
2016-01-22 17:30:07 -08:00
Brad Davis
f343598d91
Focus hack for menu fix
2016-01-22 00:55:32 -08:00
Brad Davis
3d46eda165
Frame construction in onCompleted was messing up the browser keyboard focus
2016-01-22 00:55:31 -08:00
Brad Davis
d2900200a1
More cleanup & menu fixing
2016-01-20 11:23:56 -08:00
Brad Davis
5aa8398adb
Working on keyboard focus issues
2016-01-17 20:56:07 -08:00
Brad Davis
746c388f7a
Cleanup of QML windowing and message boxes
2016-01-15 23:14:49 -08:00
Brad Davis
6098c4a1d6
Revert "Revert "Migrate QML based web views to Qt WebEngine""
...
This reverts commit 1f3adeb666
2015-12-18 17:18:46 -08:00
Brad Davis
1f3adeb666
Revert "Migrate QML based web views to Qt WebEngine"
2015-12-18 17:09:38 -08:00
Brad Davis
88b88a3306
Fixing warnings
2015-12-18 14:32:35 -08:00
Brad Davis
82c865af2c
Rename QmlWebWindow to OverlayWebWindow, move ctor registration to script engine
2015-12-17 12:20:38 -08:00
Brad Davis
fa5bab08b1
Support web content inside QML
2015-12-16 16:25:38 -08:00
Atlante45
ce51350b65
Fix warnings on windows 64bit
2015-12-11 15:42:15 -08:00
Leonardo Murillo
9ad865c7f0
checkpoint
2015-11-20 15:19:45 -06:00
Brad Davis
5cbb2562cd
Move GL utilities out to their own library
2015-10-27 15:53:42 -07:00
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
