Brad Davis
|
e6fade8c13
|
Prevent tooltips from appearing with stale data
|
2015-06-26 18:16:56 -07:00 |
|
Brad Davis
|
3b987c1e73
|
Fixing always-on link cursor
|
2015-06-26 18:14:31 -07:00 |
|
Stephen Birarda
|
9b84eabd18
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hyperlink-photo
|
2015-06-26 14:40:01 -07:00 |
|
Stephen Birarda
|
18e2b62ecc
|
initial image replacement for hyperlink preview
|
2015-06-26 14:12:26 -07:00 |
|
David Rowe
|
1898c6bd55
|
Merge branch 'master' into 20547
Conflicts:
libraries/networking/src/PacketHeaders.cpp
libraries/networking/src/PacketHeaders.h
|
2015-06-26 13:05:51 -07:00 |
|
Stephen Birarda
|
522b715628
|
remove comment, styling cleanup
|
2015-06-26 11:41:34 -07:00 |
|
Stephen Birarda
|
c6df573933
|
fix some OS X warnings, add description to tooltip
|
2015-06-26 10:50:31 -07:00 |
|
Brad Hefta-Gaub
|
6c4a4866d3
|
Merge pull request #5202 from Atlante45/overlay
Overlay have correct bounds
|
2015-06-24 19:00:55 -07:00 |
|
Atlante45
|
55c490043f
|
Restore InterfaceConfig.h includes
|
2015-06-24 16:13:42 -07:00 |
|
Atlante45
|
e3d22ef94b
|
Fix overlays getBounds + code cleanup
|
2015-06-24 16:13:42 -07:00 |
|
Brad Hefta-Gaub
|
734a11e12a
|
Merge pull request #5199 from jherico/scale_rez_fix
Fixing misplaced UI on scale resolution
|
2015-06-24 16:10:33 -07:00 |
|
Atlante45
|
233d92c315
|
Some code cleanup
|
2015-06-24 15:44:47 -07:00 |
|
Atlante45
|
31a98c5b40
|
Replace pos/rot by a transform in Base3DOverlay
Also keep getBounds a pure virtual methods
|
2015-06-24 15:44:47 -07:00 |
|
Atlante45
|
c22f1aa7e1
|
Overlay2D return correct getBounds
|
2015-06-24 15:44:46 -07:00 |
|
Atlante45
|
e8da8e374c
|
Simplify Overlays payloadGetBounds
|
2015-06-24 15:44:46 -07:00 |
|
Atlante45
|
6bb21b7a48
|
Use dynamic_pointer_cast instead of static_cast
|
2015-06-24 15:44:45 -07:00 |
|
Brad Hefta-Gaub
|
1cb7d0c1a5
|
Merge pull request #5194 from jherico/qml_warnings
Removing qml warnings
|
2015-06-24 15:42:36 -07:00 |
|
Clément Brisset
|
6db4184748
|
Merge pull request #5171 from huffman/fix-edit-rotate
Fix edit.js rotation display
|
2015-06-24 15:35:15 -07:00 |
|
Philip Rosedale
|
0bef506be2
|
Merge pull request #5190 from jherico/mirror_zoom
Mirror zoom
|
2015-06-24 14:43:14 -07:00 |
|
Ryan Huffman
|
4df1bea4ec
|
Merge pull request #5167 from SamGondelman/hmdControls
hmdControls.js for movement when wearing an HMD
|
2015-06-24 14:40:31 -07:00 |
|
Brad Davis
|
fb2fb06371
|
Fixing misplaced UI on scale resolution, PC edition
|
2015-06-23 15:42:32 -07:00 |
|
Ryan Huffman
|
8a1f446f05
|
Fix textoverlay3d text position
|
2015-06-23 14:43:41 -07:00 |
|
Brad Davis
|
da031b039c
|
Removing qml wanrings
|
2015-06-23 10:58:52 -07:00 |
|
Ryan Huffman
|
3e576fea92
|
Remove vertical scaling from Text3DOverlay
|
2015-06-23 10:27:01 -07:00 |
|
Bradley Austin Davis
|
07dce3856a
|
Fixing some math functions
|
2015-06-22 20:10:21 -07:00 |
|
Bradley Austin Davis
|
62af30761e
|
Fixing inverted mirror zoom setting
|
2015-06-22 20:07:51 -07:00 |
|
Brad Hefta-Gaub
|
de39049a56
|
Merge pull request #5187 from jherico/fix_overlay_backgrounds
Fix the 2D text overlay backgrounds to stop using a previously bound …
|
2015-06-22 17:32:06 -07:00 |
|
Brad Hefta-Gaub
|
ee85ad8bf8
|
Merge pull request #5185 from jherico/mouse_flicker
Removing flickering mouse cursor in HMD
|
2015-06-22 17:23:40 -07:00 |
|
Bradley Austin Davis
|
ce3d1bd9a4
|
Fix the 2D text overlay backgrounds to stop using a previously bound texture
|
2015-06-22 16:19:31 -07:00 |
|
Brad Davis
|
8c9deb9d16
|
Removing flickering mouse cursor in HMD
|
2015-06-22 12:04:55 -07:00 |
|
Brad Davis
|
4cd1c52987
|
Fixing HMD position offset bug in picking & stereo rendering in HMD
|
2015-06-22 11:20:48 -07:00 |
|
Brad Davis
|
012b0973b9
|
removing cruft
|
2015-06-21 14:26:19 -07:00 |
|
Bradley Austin Davis
|
5bbfb97c37
|
Fixing blurry UI on retina displays
|
2015-06-21 13:31:18 -07:00 |
|
Brad Davis
|
e66b2d4141
|
Merge remote-tracking branch 'upstream/master' into overlay
|
2015-06-20 22:54:45 -07:00 |
|
Brad Hefta-Gaub
|
13c5c830d7
|
Merge pull request #5173 from huffman/fix-line-bounds
Add correct line3doverlay bounds
|
2015-06-20 11:39:08 -07:00 |
|
Bradley Austin Davis
|
577962cb67
|
Merge branch 'master' into overlay
|
2015-06-20 10:37:55 -07:00 |
|
Brad Davis
|
3ab8025b82
|
Responding to Sam's comments
|
2015-06-19 16:14:05 -07:00 |
|
Niraj Venkat
|
482f12be8c
|
Returning ref to stack to view controller
|
2015-06-19 16:05:45 -07:00 |
|
Brad Davis
|
cc6b589ae5
|
Merge remote-tracking branch 'upstream/master' into overlay
|
2015-06-19 14:48:38 -07:00 |
|
Brad Davis
|
99c217184b
|
Fixing the mic/camera buttons and the mirror UI buttons
|
2015-06-19 14:46:39 -07:00 |
|
Niraj Venkat
|
03c10d15e6
|
Adding lambdas and removing dead code
|
2015-06-19 14:37:21 -07:00 |
|
Niraj Venkat
|
054e12a315
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2015-06-19 11:22:50 -07:00 |
|
Niraj Venkat
|
b15e7cec21
|
Back and forward are red if not possible
|
2015-06-19 11:17:56 -07:00 |
|
Ryan Huffman
|
ff66eb584d
|
Add correct line3doverlay bounds
|
2015-06-19 10:48:07 -07:00 |
|
Ryan Huffman
|
665baff665
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-rotate
Conflicts:
interface/src/ui/overlays/Circle3DOverlay.cpp
libraries/render-utils/src/RenderDeferredTask.cpp
libraries/render-utils/src/RenderDeferredTask.h
|
2015-06-19 10:07:57 -07:00 |
|
Ryan Huffman
|
690e2e38f2
|
Move circle3d and text overlays to batches
|
2015-06-19 09:45:13 -07:00 |
|
Atlante45
|
9c7f24eeb6
|
Add culled option for simple programs
|
2015-06-19 16:50:38 +02:00 |
|
Atlante45
|
67473ac254
|
Fix rotation handle crash
|
2015-06-19 16:40:42 +02:00 |
|
Brad Davis
|
9bef5f011b
|
Reverting mirror functionality
|
2015-06-19 00:03:46 -07:00 |
|
Niraj Venkat
|
afc2db6c6a
|
address bar commit
|
2015-06-18 18:25:48 -07:00 |
|