ZappoMan
|
a338d96b9d
|
only render the overlay if we're actually rendering the overlay
|
2015-02-27 18:00:51 -08:00 |
|
ZappoMan
|
9cc66f3da7
|
cleanup stats display behavior, reset default settings for timing details
|
2015-02-27 17:57:42 -08:00 |
|
Sam Gateau
|
5652852d1a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
|
2015-02-27 17:35:59 -08:00 |
|
Sam Gateau
|
f92efa13c8
|
fix typo
|
2015-02-27 17:35:08 -08:00 |
|
Sam Gateau
|
5ab3cbb7ec
|
Fixed the 2 remianing issues before PR, the shadow program needed to have the binding assigned and the Head of the avatar isn't getting it's BBox evaluated
|
2015-02-27 17:11:16 -08:00 |
|
Philip Rosedale
|
af9108c79f
|
Merge pull request #4338 from ctrlaltdavid/20368
DO NOT MERGE - QA for 20368
|
2015-02-27 14:16:55 -08:00 |
|
Philip Rosedale
|
9eee213bce
|
Merge pull request #4353 from Atlante45/relax_face_tracker
Relax blendshapes
|
2015-02-27 13:36:22 -08:00 |
|
Sam Gateau
|
ea88cbd75f
|
Merge with upstream master
|
2015-02-27 13:19:50 -08:00 |
|
David Rowe
|
797b1649a6
|
Merge branch 'master' into 20368
Conflicts:
interface/src/devices/DdeFaceTracker.cpp
|
2015-02-27 12:48:21 -08:00 |
|
Brad Hefta-Gaub
|
08dc883b0e
|
Merge pull request #4351 from huffman/update-light-properties
Update light properties (primarily for editEntities.js)
|
2015-02-27 10:54:19 -08:00 |
|
Philip Rosedale
|
35205fbbf3
|
Merge pull request #4347 from samcake/temp1
Introducing the SunSkyStage
|
2015-02-27 10:37:02 -08:00 |
|
Atlante45
|
fa8e1549f6
|
Relax blendshapes
|
2015-02-27 19:33:01 +01:00 |
|
Atlante45
|
db90fcdb62
|
Simplify expression
|
2015-02-27 16:09:15 +01:00 |
|
Atlante45
|
8615bb7cff
|
Make relaxation go to EPSILON within TIME
|
2015-02-27 15:58:28 +01:00 |
|
Atlante45
|
9849efe013
|
Exponential relaxation
|
2015-02-27 15:33:24 +01:00 |
|
Stephen Birarda
|
fc2f6d47bb
|
remove references to PrioVR in interface code
|
2015-02-26 17:28:00 -08:00 |
|
Sam Gateau
|
d8ebb0c5b9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
|
2015-02-26 14:19:23 -08:00 |
|
David Rowe
|
21f12c1d6c
|
Use cache ID when rendering talk bubble sphere
|
2015-02-26 13:50:43 -08:00 |
|
Andrew Meadows
|
9ad88c3793
|
Referentials do math using meters
|
2015-02-26 13:42:08 -08:00 |
|
Atlante45
|
fdf9fdd877
|
Relax head/lean when not tracking
|
2015-02-26 20:05:47 +01:00 |
|
Ryan Huffman
|
e42b708b56
|
Update deferredLightingEffect::add*Light methods
|
2015-02-26 11:03:47 -08:00 |
|
Sam Gateau
|
fcb293d0b2
|
CLean up before pr
|
2015-02-26 10:45:00 -08:00 |
|
Atlante45
|
e37ef226fc
|
Simplify lookForward compute
|
2015-02-26 19:21:14 +01:00 |
|
Atlante45
|
682b3f5e61
|
Remove unused angular velocity
|
2015-02-26 19:18:52 +01:00 |
|
Atlante45
|
f560f97c6b
|
Only update active FaceTracker
|
2015-02-26 19:18:05 +01:00 |
|
Atlante45
|
b6968a6b15
|
Update Facetrackers
|
2015-02-26 19:15:49 +01:00 |
|
Atlante45
|
8eb4abc49c
|
Rework FaceTracker
|
2015-02-26 19:14:09 +01:00 |
|
Sam Gateau
|
a757229c0e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
|
2015-02-25 19:18:01 -08:00 |
|
Sam Gateau
|
6b29e314c2
|
Adding the Stage of the Scene and exposing control of the sun light from javascript
|
2015-02-25 19:05:27 -08:00 |
|
Andrew Meadows
|
7b68916010
|
Merge pull request #4343 from ZappoMan/hangOnExit
BUG FIX: Hang on exit
|
2015-02-25 17:02:26 -08:00 |
|
ZappoMan
|
b03928cec7
|
some cleanup
|
2015-02-25 16:31:43 -08:00 |
|
ZappoMan
|
af43ba3444
|
used a registered quad for the audio box since its color constantly changes
|
2015-02-25 15:21:24 -08:00 |
|
Andrew Meadows
|
8d4ea143ce
|
easy conversions of: InDomainUnits --> InMeters
|
2015-02-25 14:48:06 -08:00 |
|
Andrew Meadows
|
2f749e3c51
|
merge upstream/master into andrew/isentropic
Conflicts:
libraries/entities/src/TextEntityItem.h
|
2015-02-25 14:40:32 -08:00 |
|
Andrew Meadows
|
2ffb19a0ed
|
getPosition() --> getPositionInDomainUnits()
and friends
|
2015-02-25 14:35:04 -08:00 |
|
Leonardo Murillo
|
006b3ed0ac
|
Merge pull request #4300 from birarda/dependencies
NOT MERGEABLE - add some externals as cmake external projects
|
2015-02-25 13:22:49 -08:00 |
|
ZappoMan
|
912b851eb7
|
remove crufty references to QGLWidget
|
2015-02-25 12:54:34 -08:00 |
|
ZappoMan
|
d1e648b392
|
remove unused references to QGLWidget* parent in Overlay and Overlays
|
2015-02-25 12:34:38 -08:00 |
|
Brad Hefta-Gaub
|
6d237f3f79
|
Merge pull request #4339 from huffman/fix-plane-pick
Fix plane pick
|
2015-02-25 12:23:45 -08:00 |
|
ZappoMan
|
a89691fc66
|
switch GLCanvas back to being owned by Application
|
2015-02-25 12:11:35 -08:00 |
|
ZappoMan
|
e66f12f958
|
add shutdown short circuiting to datagram processor
|
2015-02-25 10:56:08 -08:00 |
|
David Rowe
|
23e172a0a1
|
Remove attempt at individual eyebrow control
|
2015-02-25 10:44:57 -08:00 |
|
David Rowe
|
c5fba3e0ce
|
Improve mouth resting position and smile
|
2015-02-25 10:44:08 -08:00 |
|
Ryan Huffman
|
c499352ad8
|
Update billboard and planar overlays to use new findRayRectangleIntersection signature
|
2015-02-25 10:27:11 -08:00 |
|
Clément Brisset
|
b1e46c1bc8
|
Merge pull request #4337 from ZappoMan/crashonexit
Fixes to various Crashes on shutdown
|
2015-02-25 08:47:36 -08:00 |
|
Brad Hefta-Gaub
|
0f4e098a61
|
Merge pull request #4334 from huffman/edit-ray-improvement
Fix BillboardOverlay::findRayIntersection
|
2015-02-24 20:13:05 -08:00 |
|
Brad Hefta-Gaub
|
8c26be49d7
|
Merge pull request #4330 from huffman/edit-off-on-domain-change
Turn editEntities off on domain change
|
2015-02-24 20:11:39 -08:00 |
|
David Rowe
|
b0ffaaa8b7
|
Smooth DDE blendshape coefficients a little
|
2015-02-24 18:53:35 -08:00 |
|
David Rowe
|
7a95ed2baa
|
Scale and clamp DDE blendshape coefficients
|
2015-02-24 17:38:20 -08:00 |
|
ZappoMan
|
310654831c
|
clean up comments remove dead code
|
2015-02-24 17:34:19 -08:00 |
|
ZappoMan
|
eab09eaf28
|
removed extra debugging
|
2015-02-24 17:15:58 -08:00 |
|
Ryan Huffman
|
eb21b74439
|
Replace Planar3DOverlay::findRayIntersection with GeometryUtil::findRayRectangleIntersection
|
2015-02-24 17:01:24 -08:00 |
|
Ryan Huffman
|
be7959bbcd
|
Fix BillboardOverlay findRayIntersection implementation
|
2015-02-24 17:00:55 -08:00 |
|
ZappoMan
|
89f7f2da2e
|
don't do idle process and painting if we're shutting down the application
|
2015-02-24 15:57:34 -08:00 |
|
ZappoMan
|
ca432a415f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into crashonexit
|
2015-02-24 15:33:41 -08:00 |
|
Ryan Huffman
|
89c10ca2ec
|
Fix BillboardOverlay::findRayIntersection
|
2015-02-24 14:36:24 -08:00 |
|
David Rowe
|
e91a28a0a4
|
Rework DDE blendshape derivation and remove scaling and smoothing
|
2015-02-24 14:33:55 -08:00 |
|
ZappoMan
|
fd93b99f03
|
more hacking on script shutdown behavior
|
2015-02-24 14:02:46 -08:00 |
|
Andrew Meadows
|
1b669af79d
|
Merge pull request #4307 from Atlante45/fix_warnings
Fix warnings
|
2015-02-24 12:19:32 -08:00 |
|
Andrew Meadows
|
efcac708b6
|
Merge pull request #4331 from PhilipRosedale/master
Toyball is a textured baseball, added ability to get controller angular velocity
|
2015-02-24 12:19:20 -08:00 |
|
samcake
|
5202d2136a
|
Merge pull request #4319 from huffman/avatar-billboards
Fix avatar billboards all rendering as the same billboard
|
2015-02-24 11:22:38 -08:00 |
|
Philip Rosedale
|
d74856e01b
|
add angularVelocity to controller
|
2015-02-24 11:21:04 -08:00 |
|
Ryan Huffman
|
4641bd0cd9
|
Add Window.domainChanged signal for scripting
|
2015-02-24 10:47:37 -08:00 |
|
ZappoMan
|
6be8f4c0ec
|
more work on improving shutdown behavior
|
2015-02-23 17:32:31 -08:00 |
|
Sam Gateau
|
04a39275ef
|
Trying to setup correctly the projection matrix for all the different cases...
|
2015-02-23 16:47:43 -08:00 |
|
Sam Gateau
|
687c76a6f8
|
trying to ge the shadow to render correctly
|
2015-02-23 13:12:29 -08:00 |
|
Andrew Meadows
|
0455ccf7be
|
Merge pull request #4313 from ctrlaltdavid/20355
CR for 20355 - Initial Integration with DDE
|
2015-02-23 09:47:19 -08:00 |
|
ZappoMan
|
85cec79ff5
|
removing debug messages
|
2015-02-23 09:44:22 -08:00 |
|
Andrew Meadows
|
2519f66037
|
Merge pull request #4311 from huffman/application-dpi-scale
Application dpi scale
|
2015-02-23 09:43:12 -08:00 |
|
Stephen Birarda
|
437d5c7bdf
|
repairs to include locations for QXmpp and SDL2
|
2015-02-23 09:26:35 -08:00 |
|
Sam Gateau
|
90bff36fd3
|
trying to ge the shadow to render correctly
|
2015-02-22 18:48:48 -08:00 |
|
David Rowe
|
f169ab1238
|
Tidy and document DDE face tracker UDP socket opening and closing
|
2015-02-21 11:26:48 -08:00 |
|
David Rowe
|
8d9685ee39
|
Fix Face Tracking menu operation
|
2015-02-21 11:01:07 -08:00 |
|
ZappoMan
|
2e7a43a7fb
|
more hacking
|
2015-02-20 18:47:47 -08:00 |
|
Ryan Huffman
|
e6d9a1b251
|
Merge branch 'master' of github.com:highfidelity/hifi into application-dpi-scale
Conflicts:
interface/src/ui/LoginDialog.cpp
|
2015-02-20 18:09:55 -08:00 |
|
ZappoMan
|
8c4474b2d0
|
more hacking
|
2015-02-20 17:55:04 -08:00 |
|
ZappoMan
|
0b607fa390
|
first cut at shutting down scripts ahead of other cleanup
|
2015-02-20 15:28:25 -08:00 |
|
Ryan Huffman
|
5c3cae471b
|
Fix avatar billboards all rendering as the same billboard
|
2015-02-20 09:48:04 -08:00 |
|
Andrew Meadows
|
aa667464c0
|
merge upstream/master into andrew/thermonuclear
|
2015-02-20 08:26:51 -08:00 |
|
Andrew Meadows
|
599ef68df8
|
fix for scratchy audio on windows
|
2015-02-20 08:26:11 -08:00 |
|
Ryan Huffman
|
4a8e3193a9
|
Add more comments to UIUtil::scaleWidgetFontSizes
|
2015-02-19 12:01:27 -08:00 |
|
Clément Brisset
|
d2ed782626
|
Merge pull request #4308 from Triplelexx/20315
CR for Job #20315 - Update contents of the "welcome to Interface" dialog
|
2015-02-19 10:27:27 -08:00 |
|
Andrew Meadows
|
21405135f9
|
Merge pull request #4310 from talentraspel/20323
CR for Job #20323 - BUG: another crash on exit in interface
|
2015-02-19 09:52:23 -08:00 |
|
Ryan Huffman
|
a8999964f6
|
Cleanup dpi scaling comments
|
2015-02-18 16:21:51 -08:00 |
|
Ryan Huffman
|
4751974c45
|
Revert "Add scaling for high-dpi Windows/Linux displays"
This reverts commit 2828b65bea.
|
2015-02-18 16:16:50 -08:00 |
|
Ryan Huffman
|
03eb1a984f
|
Revert "Fix dpi scaling in getViewportDimensions"
This reverts commit 9b719273ab.
|
2015-02-18 16:15:53 -08:00 |
|
Ryan Huffman
|
22d46e3e6b
|
Update runningscripts script font to match parent
|
2015-02-18 15:33:24 -08:00 |
|
Ryan Huffman
|
9b719273ab
|
Fix dpi scaling in getViewportDimensions
|
2015-02-18 15:30:39 -08:00 |
|
Ryan Huffman
|
2828b65bea
|
Add scaling for high-dpi Windows/Linux displays
|
2015-02-18 15:09:41 -08:00 |
|
David Rowe
|
24d03deb21
|
Fix typo
|
2015-02-18 15:02:44 -08:00 |
|
Ryan Huffman
|
b2e1d8a38c
|
Remove font scaling based on system DPI
|
2015-02-18 14:37:56 -08:00 |
|
Ryan Huffman
|
7dab39a2f1
|
Add qDebug message to scaleWidgetFontSizes
|
2015-02-18 14:16:33 -08:00 |
|
Ryan Huffman
|
ff1fb07b2d
|
Add high-dpi support to scaleWidgetFontSizes
|
2015-02-18 14:04:02 -08:00 |
|
David Rowe
|
889851f6ea
|
Fix typo
|
2015-02-18 13:51:50 -08:00 |
|
Ryan Huffman
|
e048f7a36c
|
Add font scaling to running scripts window
|
2015-02-18 13:34:28 -08:00 |
|
Ryan Huffman
|
9550339a2a
|
Move preferences dialog font scaling to UIUtil
|
2015-02-18 13:34:01 -08:00 |
|
Ryan Huffman
|
ba66155d46
|
Add font scaling to login dialog
|
2015-02-18 13:33:39 -08:00 |
|
Ryan Huffman
|
0d60c09d03
|
Add UI font scaling to UIUtil
|
2015-02-18 13:33:19 -08:00 |
|
David Rowe
|
d704af21ac
|
Generalize "faceshift" data handling to "facetracker"
DDE face tracking data is now broadcast to other avatars.
|
2015-02-18 12:41:54 -08:00 |
|
David Rowe
|
a66af77b23
|
Update DDE face tracker to work with menu item
|
2015-02-18 12:40:59 -08:00 |
|
David Rowe
|
c446e72226
|
Add Face Tracking menu item to select the face tracker to use
Includes new DDE Face Regression option.
|
2015-02-18 12:39:51 -08:00 |
|
Ryan Huffman
|
ab542c3599
|
Update DPI scaling to not update default fonts
|
2015-02-18 12:21:10 -08:00 |
|
Ryan Huffman
|
a5b737314d
|
Add auto-scale to preferences dialog
|
2015-02-18 11:44:15 -08:00 |
|
Kai Ludwig
|
d659ac573a
|
now all application timers should get stopped correctly on exit
|
2015-02-18 19:53:45 +01:00 |
|
Atlante45
|
5230b805d2
|
Fix warnings
|
2015-02-18 19:24:29 +01:00 |
|
Clément Brisset
|
3f117ce322
|
Merge pull request #4293 from AndrewMeadows/thermonuclear
fix crash in AudioScope for bad memory access
|
2015-02-18 06:03:03 -08:00 |
|
Triplelexx
|
1bcb3f7c75
|
Merge remote-tracking branch 'upstream/master' into 20315
|
2015-02-17 20:45:44 +00:00 |
|
Seth Alves
|
dd64eeb282
|
fix uninitialized geometry cache id in Line3DOverlay
|
2015-02-17 11:47:29 -08:00 |
|
Andrew Meadows
|
9895df6e7e
|
merge upstream/master into andrew/thermonuclear
|
2015-02-17 10:05:36 -08:00 |
|
Andrew Meadows
|
bc664435e7
|
Merge pull request #4296 from thoys/20318
CR for Job #20318 - BUG: Login menu item not popping up
|
2015-02-17 09:28:53 -08:00 |
|
Andrew Meadows
|
dba206337b
|
Merge pull request #4294 from thoys/20348
CR for Job #20348 - Change audio meter background back to white
|
2015-02-17 09:24:05 -08:00 |
|
Andrew Meadows
|
d896f3a811
|
Merge pull request #4252 from thoys/20224
CR for Job #20224 - Make virtualKeyboard.js go to locations and support gamepads
|
2015-02-17 09:03:17 -08:00 |
|
Thijs Wenker
|
4a3550ce0e
|
toggleQAction(); in constructor to make the right initial button connection
|
2015-02-17 02:27:07 +01:00 |
|
Thijs Wenker
|
42e4eee15e
|
audio meter background "back in black" / "paint it black"
|
2015-02-16 23:14:27 +01:00 |
|
Andrew Meadows
|
57797329d1
|
do sample size arithmetic before scaling by sizeof
|
2015-02-16 12:14:03 -08:00 |
|
Stephen Birarda
|
8acaa062a2
|
Merge pull request #4281 from Atlante45/fix_mute_environnement
Fix mute environnement
|
2015-02-16 09:11:47 -08:00 |
|
Brad Hefta-Gaub
|
9b6049489b
|
Merge pull request #4280 from AndrewMeadows/inertia
remove a couple crash modes on shutdown
|
2015-02-13 17:11:56 -08:00 |
|
Brad Hefta-Gaub
|
2f492082c1
|
Merge pull request #4287 from sethalves/fix-Rectangle3d-drawing-problem
fix Rectangle3d drawing problem
|
2015-02-13 16:30:46 -08:00 |
|
Andrew Meadows
|
9122364c3b
|
merge upstream/master into andrew/inertia
|
2015-02-13 16:20:09 -08:00 |
|
Andrew Meadows
|
cfbf8fdca7
|
explicit cleanup of loaded model animations
in Application dtor
|
2015-02-13 16:19:10 -08:00 |
|
Triplelexx
|
f615915fba
|
Merge pull request #1 from nbq/fortriplelexx
Clickable Links In InfoView
|
2015-02-14 00:14:19 +00:00 |
|
Jason Hawks
|
01b0810fec
|
added framework to make links clickable to InfoView
|
2015-02-13 18:52:33 -05:00 |
|
ZappoMan
|
1fc0225939
|
change ScriptCache and SoundCache to derive from Dependency
|
2015-02-13 15:33:41 -08:00 |
|
Seth Alves
|
42511f3b7f
|
M-x mangle buffer
|
2015-02-13 15:23:22 -08:00 |
|
Triplelexx
|
81d4af86a7
|
Merge remote-tracking branch 'upstream/master' into 20315
|
2015-02-13 23:23:19 +00:00 |
|
Seth Alves
|
98b445b22f
|
the geometryCacheID for Rectangle3DOverlay wasn't being initialized (so was randomish). if they overlapped, some would be drawn looking like others
|
2015-02-13 15:21:03 -08:00 |
|
Andrew Meadows
|
589077bce6
|
try again: move stuff around in ~Application
|
2015-02-13 14:01:56 -08:00 |
|
Andrew Meadows
|
37be7251fe
|
merge upstream/master into andrew/inertia
Conflicts:
interface/src/Application.cpp
|
2015-02-13 11:10:13 -08:00 |
|
Andrew Meadows
|
5113258d72
|
Merge pull request #4279 from birarda/android
fix cleanup of AudioClient, avoid gvr-interface crash on OS X
|
2015-02-13 10:58:50 -08:00 |
|
Brad Hefta-Gaub
|
1827d9f3cd
|
Merge pull request #4256 from samcake/temp1
Getting rid of glLIghts and replacing by the model::Light
|
2015-02-13 10:49:53 -08:00 |
|
Stephen Birarda
|
e3475d4d7f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into android
|
2015-02-13 10:19:00 -08:00 |
|
Andrew Meadows
|
d69efa03d8
|
Merge pull request #4276 from birarda/master
repairs to memory management for AudioInjectors
|
2015-02-13 10:15:07 -08:00 |
|
Atlante45
|
7a107adbc1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fix_mute_environnement
|
2015-02-13 11:00:41 +01:00 |
|
Atlante45
|
4b7d4d7290
|
Don't use DataStream to write MuteEnv packet
|
2015-02-13 10:56:04 +01:00 |
|
Brad Hefta-Gaub
|
3531463978
|
Merge pull request #4265 from Triplelexx/#20300
#20300
|
2015-02-12 17:19:01 -08:00 |
|
Andrew Meadows
|
c3b432c4b5
|
wrap explicit exit() in #ifndef DEBUG
|
2015-02-12 17:02:21 -08:00 |
|
Andrew Meadows
|
07a12f8b4c
|
remove a couple crash modes on shutdown
|
2015-02-12 16:55:14 -08:00 |
|
Triplelexx
|
a968c0dcf9
|
Code revision & integration
Change C++ source to use new HTML file. Old file deleted.
HTML formatting revised, some incorrect code pulled.
|
2015-02-13 00:07:56 +00:00 |
|
Thijs Wenker
|
062c2cbcee
|
HUD LookAt positions could be NULL now if whenever they're out of range
HMD.HUDLookAtPosition2D -> HMD.getHUDLookAtPosition2D()
HMD.HUDLookAtPosition3D -> HMD.getHUDLookAtPosition3D()
|
2015-02-12 22:55:44 +01:00 |
|
Stephen Birarda
|
6c25205856
|
fix audio cleanup and close action in Application
|
2015-02-12 13:35:22 -08:00 |
|
Stephen Birarda
|
7becf62ba9
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2015-02-12 10:28:04 -08:00 |
|
Brad Hefta-Gaub
|
fa5eebd93e
|
Merge pull request #4269 from AndrewMeadows/thermonuclear
ModelEntityItem gets _shapeType
|
2015-02-12 10:06:01 -08:00 |
|
Andrew Meadows
|
5553f0f531
|
Merge pull request #4275 from ctrlaltdavid/20306
CR for Job #20306 - When you load Interface on a PC if takes up the entire screen, this needs to change
|
2015-02-12 09:50:12 -08:00 |
|
Andrew Meadows
|
7304585103
|
Merge pull request #4271 from huffman/fix-overlays-text-size
Fix overlays text size
|
2015-02-12 09:35:37 -08:00 |
|
David Rowe
|
6f03035169
|
Explicit casts for OSX and Linux
|
2015-02-11 18:05:25 -08:00 |
|
David Rowe
|
967afd8d67
|
Restore to windowed, maximized, or full screen appropriately at start-up
|
2015-02-11 16:13:04 -08:00 |
|
Stephen Birarda
|
7b485829c4
|
cleanup AudioInjector memory management
|
2015-02-11 15:52:00 -08:00 |
|
Thijs Wenker
|
cb09656624
|
Merge branch 'master' of https://github.com/worklist/hifi into 20224
|
2015-02-11 22:58:27 +01:00 |
|
Andrew Meadows
|
9f59addbc2
|
merge upstream/master into andrew/thermonuclear
|
2015-02-11 13:35:28 -08:00 |
|
Ryan Huffman
|
a527bd85ba
|
Update Text3DOverlay::textSize to use new TextRenderer::getExtents
|
2015-02-11 12:13:26 -08:00 |
|
Seth Alves
|
a281695132
|
keep bandwidths stats visible even if stats are expanded
|
2015-02-11 11:35:52 -08:00 |
|
Seth Alves
|
62507721c7
|
put bandwidth stats in first overlay column rather than in their own
|
2015-02-11 11:05:44 -08:00 |
|
Ryan Huffman
|
d7e18d6f6d
|
Update TextOverlay::textSize to use new TextRenderer::getExtents
|
2015-02-11 11:04:04 -08:00 |
|
Andrew Meadows
|
68c1e9ef71
|
Merge pull request #4260 from birarda/master
replace data with metaverse for highfidelity urls, allow optional gvr-interface build
|
2015-02-11 09:02:18 -08:00 |
|
Andrew Meadows
|
d9b57de649
|
merge upstream/master into andrew/thermonuclear
|
2015-02-11 08:56:34 -08:00 |
|
Triplelexx
|
e2f942c026
|
Coding standard fixes
Corrected else format, removed additional comment to fit other
declarations and break block.
|
2015-02-11 06:11:38 +00:00 |
|
Triplelexx
|
260f960ccc
|
Indentation correction
Indention was still incorrect I believe. 😢
|
2015-02-11 03:49:28 +00:00 |
|
Triplelexx
|
837f8d71a4
|
Coding standard fixes
Coding standard fixes
Indentation and space missing
|
2015-02-11 03:17:28 +00:00 |
|
Triplelexx
|
84d7ae6b3a
|
Change conditional limit to >=
edge case
|
2015-02-11 00:18:08 +00:00 |
|
Triplelexx
|
93366e068f
|
Remove all references to AUDIO_METER_INSET
further cleaning
|
2015-02-11 00:16:40 +00:00 |
|
Triplelexx
|
d59ee7c561
|
Removed meter inset
changes to bar color make the inset very visible
|
2015-02-10 23:57:09 +00:00 |
|
Triplelexx
|
e473661568
|
Fix meter showing out of bounds
add conditional check for exception when audioLevel is NAN.
|
2015-02-10 23:55:56 +00:00 |
|
Triplelexx
|
8e0ac763eb
|
Changed color of audio bar background
Worklist mentions:
Additionally, change the color of the bar to #4CC1B8 / 76,193,184
|
2015-02-10 22:41:43 +00:00 |
|
Stephen Birarda
|
542283b4b2
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2015-02-10 12:25:12 -08:00 |
|
Brad Hefta-Gaub
|
d84398524b
|
Merge pull request #4258 from ctrlaltdavid/fix-windows-windowing
Fix maximized Windows window unintentionally changing to windowed
|
2015-02-10 12:01:29 -08:00 |
|
Stephen Birarda
|
d2d7507903
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2015-02-10 10:53:53 -08:00 |
|
Thijs Wenker
|
525fe7881e
|
Merge branch 'master' of https://github.com/worklist/hifi into 20224
|
2015-02-10 19:45:39 +01:00 |
|
Stephen Birarda
|
fe79d8902e
|
replace data with metaverse for highfidelity urls
|
2015-02-10 10:05:38 -08:00 |
|
David Rowe
|
45c0d0e6a9
|
Fix Windows --url command line parameter handling
|
2015-02-09 23:50:43 -08:00 |
|
David Rowe
|
4fa2b3a6e9
|
Fix maximized Windows window unintentionally changing to windowed
This stops a maximized Windows window changing to being windowed when
you click on a menu item.
|
2015-02-09 22:07:12 -08:00 |
|
ZappoMan
|
2f981686fa
|
fix bad colors on windows
|
2015-02-09 15:38:50 -08:00 |
|
Sam Gateau
|
ed8d433ad5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
|
2015-02-09 15:27:06 -08:00 |
|
ZappoMan
|
ea33c66681
|
fix formating issue in performance stats
|
2015-02-09 15:04:43 -08:00 |
|
Thijs Wenker
|
13e1ec2464
|
Merge branch 'master' of https://github.com/worklist/hifi into 20224
|
2015-02-09 22:53:58 +01:00 |
|
Andrew Meadows
|
e6a6946027
|
merge upstream/master into andrew/thermonuclear
|
2015-02-09 12:44:52 -08:00 |
|
David Rowe
|
468433e70a
|
Fix VSync menu item on Windows
|
2015-02-09 12:01:53 -08:00 |
|
Thijs Wenker
|
e53b38e497
|
style / make sure the magnifier isn't rendered when we don't want it
|
2015-02-09 17:16:54 +01:00 |
|
Sam Gateau
|
ace6dc4faf
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
|
2015-02-08 23:23:06 -08:00 |
|
Thijs Wenker
|
b532119db7
|
Merge branch 'master' of https://github.com/worklist/hifi into 20224
|
2015-02-08 17:49:03 +01:00 |
|
Thijs Wenker
|
3ccbe50092
|
remove warnings for non-RSSDK builds
|
2015-02-07 19:07:10 +01:00 |
|
Thijs Wenker
|
818aac01d1
|
Merge branch 'rssdk_fix_missing_constants' into 20224
|
2015-02-07 13:44:55 +01:00 |
|
Thijs Wenker
|
c7b19277ee
|
rssdk fix missing constants
|
2015-02-07 13:40:51 +01:00 |
|
Thijs Wenker
|
0e66305456
|
changed HMDScriptingInterface MyAvatar to new way of retrieving this object
|
2015-02-07 13:37:33 +01:00 |
|
Brad Hefta-Gaub
|
ca0cf1f1f1
|
Merge pull request #4244 from birarda/binary-fonts
move fonts to sdff bin files, load with qrc
|
2015-02-06 16:37:39 -08:00 |
|
Sam Gateau
|
469ee29f0b
|
Merge branch 'temp0' of https://github.com/samcake/hifi into temp1
|
2015-02-06 16:30:47 -08:00 |
|
Sam Gateau
|
bdf9164c7b
|
debugging the new global light pass
|
2015-02-06 16:30:07 -08:00 |
|
Thijs Wenker
|
e3ca1efe6b
|
Merge branch 'master' of https://github.com/worklist/hifi into 20224
|
2015-02-07 00:34:38 +01:00 |
|
Stephen Birarda
|
41d2da8712
|
remove doubled Q_INIT_RESOURCE calls
|
2015-02-06 15:28:36 -08:00 |
|
Brad Hefta-Gaub
|
d3b387c1e0
|
Merge pull request #4247 from Atlante45/fix_3d_text_billboards
Fix funky text 3D overlays
|
2015-02-06 15:01:47 -08:00 |
|
Stephen Birarda
|
6a58d8b0a3
|
resolve conflicts on merge with upstream master
|
2015-02-06 14:21:07 -08:00 |
|
Brad Hefta-Gaub
|
b3fb1b2403
|
Merge pull request #4246 from ctrlaltdavid/20282
CR for Job #20282 - Finish implementing Planar3DOverlay intersection code
|
2015-02-06 14:19:35 -08:00 |
|
Brad Hefta-Gaub
|
a4541758cf
|
Merge pull request #4245 from ctrlaltdavid/20301
CR for Job #20301 - Windows: If I'm running Interface go to a place via hifi://, don't start another instance of the app
|
2015-02-06 14:19:10 -08:00 |
|
Atlante45
|
920082331f
|
Fix funky text 3D overlays
|
2015-02-06 14:15:10 -08:00 |
|
Stephen Birarda
|
d68b0958a7
|
resolve conflicts on merge with upstream/master
|
2015-02-06 14:09:20 -08:00 |
|
Brad Hefta-Gaub
|
390d2be48f
|
Merge pull request #4189 from birarda/android
add the gvr-interface target for GearVR
|
2015-02-06 14:07:28 -08:00 |
|
David Rowe
|
67e2e748e7
|
Merge branch 'master' into 20282
|
2015-02-06 13:25:43 -08:00 |
|
David Rowe
|
ec590791df
|
Merge branch 'master' into 20301
|
2015-02-06 13:23:59 -08:00 |
|
Stephen Birarda
|
9a98e07b2d
|
call Q_INIT_RESOURCE from mains to handle static link
|
2015-02-06 12:39:14 -08:00 |
|
Stephen Birarda
|
5e864278a3
|
fix packet processing, PerfWarn label
|
2015-02-06 12:21:05 -08:00 |
|
Stephen Birarda
|
c96085eb91
|
repairs to warnings shown in Xcode
|
2015-02-06 10:12:04 -08:00 |
|