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

11279 commits

Author SHA1 Message Date
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
Stephen Birarda
2ad8ac866d make correct version of bullet for windows 2015-02-23 12:50:53 -08:00
Stephen Birarda
2f4adbc2f7 also use release icon for RelWithDebInfo 2015-02-23 11:40:38 -08:00
Stephen Birarda
9878a93338 add a definition for shared QXmpp on win 2015-02-23 11:13:10 -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
Stephen Birarda
d08f7d6255 check if QXmpp is dynamic or static 2015-02-23 08:24:52 -08:00
Clément Brisset
c6b1375863 Merge pull request #4322 from AndrewMeadows/thermonuclear 
workaround for scratchy audio on Windows
 2015-02-23 07:18:30 -08:00
Sam Gateau
e9360a77f2 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-02-23 07:04:36 -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
Stephen Birarda
c64f172311 add qxmpp as external project 2015-02-20 16:06:37 -08:00
ZappoMan
0b607fa390 first cut at shutting down scripts ahead of other cleanup 2015-02-20 15:28:25 -08:00
Stephen Birarda
bc0bd462cb add an external project for SDL 2 2015-02-20 15:26:16 -08:00
Stephen Birarda
5e264f8241 add GLEW as dependency external project 2015-02-20 13:47:38 -08:00
David Rowe
3a95614ca4 Update Faceshift readme.txt with Windows instructions 2015-02-20 11:29:51 -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
Stephen Birarda
44f8e599e2 test the possibility that zlib is no longer required 2015-02-19 15:29:28 -08:00
Stephen Birarda
c3b9198ec3 cleanup handling of external projects if OS not handled 2015-02-19 15:19:52 -08:00
Ryan Huffman
4dfe725721 Update preferences dialog to use layouts throughout 2015-02-19 14:02:15 -08:00
Stephen Birarda
6b08b2993a fix for bullet system include to silence warnings 2015-02-19 13:03:16 -08:00
Stephen Birarda
6f055ca0d7 add an external project to handle bullet 2015-02-19 12:01:40 -08:00
Ryan Huffman
4a8e3193a9 Add more comments to UIUtil::scaleWidgetFontSizes 2015-02-19 12:01:27 -08:00
Jason Hawks
d0b47a66ab removed at symbol and added enter for teleport box 2015-02-19 14:49:00 -05: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
51f5719e0f Update font sizes in running scripts window 2015-02-18 14:59:52 -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
Stephen Birarda
b2e587dbbd remove use of include_dependency_includes and use cmake 2015-02-18 14:12:05 -08:00
Ryan Huffman
ff1fb07b2d Add high-dpi support to scaleWidgetFontSizes 2015-02-18 14:04:02 -08:00
Ryan Huffman
4a383ff177 Update font sizes in running scripts panel 2015-02-18 13:56:41 -08:00
David Rowe
889851f6ea Fix typo 2015-02-18 13:51:50 -08:00
Ryan Huffman
a069a2f21c Add default font to running scripts window 2015-02-18 13:34:48 -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
Ryan Huffman
f44ec6da12 Set global font size in preferencesDialog 2015-02-18 12:49:11 -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
18a92464b5 Remove custom font sizes on preferences dialog 2015-02-18 12:23:56 -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
Stephen Birarda
1f7c3a0eb2 Merge branch 'master' of https://github.com/highfidelity/hifi into dependencies 2015-02-18 09:40:10 -08:00
Clément Brisset
6e5c3593b6 Merge pull request #4298 from talentraspel/20339 
removed id "g3322" in start-script.svg because it is no longer used and ...
 2015-02-18 06:13:35 -08: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
Stephen Birarda
c110fcbfad merge with upstream/master 2015-02-17 17:34:48 -08:00
Stephen Birarda
6fc74eb830 fix cmake build type check for interface icon 2015-02-17 14:56:34 -08:00
Stephen Birarda
97fa1412e2 copy dlls beside windows executable for all executables 2015-02-17 14:45:26 -08:00
Stephen Birarda
767601de4f use a cache variable to pass around lib paths 2015-02-17 14:09:26 -08:00
Stephen Birarda
250b25154c test for recursive dll dir search 2015-02-17 13:41:37 -08:00
Stephen Birarda
bc899eaa58 add fixup_bundle step for WIN32 interface 2015-02-17 13:17:23 -08:00
Triplelexx
1bcb3f7c75 Merge remote-tracking branch 'upstream/master' into 20315 2015-02-17 20:45:44 +00:00
Triplelexx
ffc6a6883e Add images to welcome page 
Replaced SVG placeholder items with images in interface-welcome.html.
 2015-02-17 20:45:01 +00:00
Seth Alves
dd64eeb282 fix uninitialized geometry cache id in Line3DOverlay 2015-02-17 11:47:29 -08:00
Stephen Birarda
e99012efbb updates to build guides to remove soxr 2015-02-17 10:33:12 -08:00
Andrew Meadows
9895df6e7e merge upstream/master into andrew/thermonuclear 2015-02-17 10:05:36 -08:00
Andrew Meadows
53855c89e9 Merge pull request #4289 from birarda/dependencies 
add gverb and glm as cmake external projects
 2015-02-17 10:00:29 -08:00
Kai Ludwig
0de598586c removed id "g3322" in start-script.svg because it is no longer used and causes a "link rect899 hasn't been detected!" message on script editor open. 2015-02-17 18:37:23 +01: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
Stephen Birarda
8c998a65ee use the glm find_package and check externals 2015-02-13 12:50:32 -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
df8e51f835 use external project glm in more targets 2015-02-13 10:21:21 -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
Stephen Birarda
2c7e225ef7 use cmake ExternalProject for glm in Interface 2015-02-13 10:14:47 -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
Triplelexx
4936aac61c Code fixes 
Fix for CentOS showing too small.
Horizontal bar removed.
 2015-02-13 04:42:23 +00: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
Triplelexx
2e62e6b1e9 Create interface-welcome.html 
Initial commit for feedback. I need to double-check against Worklist
coding standards.
 2015-02-12 22:44:49 +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
Stephen Birarda
219e78425b resolve conflicts on merge with upstream master 2015-02-06 09:49:46 -08:00
Andrew Meadows
5ea785f4ad Merge pull request #4232 from thoys/cursor_is_visible_and_oculus_cursor_visibility 
Ability to make cursor invisible again (both OS-cursor and oculus rectile) and js-interface to cursorVisible boolean
 2015-02-06 08:58:14 -08:00
Thijs Wenker
27147fde2a add Write function to the Window.cursurVisible property 2015-02-06 14:45:22 +01:00
Sam Gateau
1b22a3ef36 connecting the globalLight info to the DeferredLightingEffect 2015-02-05 17:30:57 -08:00
David Rowe
9e34b36839 Send hifi command line url to other instance 2015-02-05 17:17:31 -08:00
David Rowe
ab758648c7 Show and focus on the other Interface instance 2015-02-05 16:44:26 -08:00
David Rowe
1fa50fa54d Run only one instance of Windows Interface at a time 
OSX automatically does this.
 2015-02-05 13:09:06 -08:00
Brad Davis
230d761ec3 fix display name scaling 2015-02-05 10:47:35 -08:00
David Rowe
3ceb1123b3 Cater for ellipses in circle3d overlay intersection 2015-02-05 09:39:16 -08:00
David Rowe
2f6749ff69 Implement dimensions test for 3D planar overlay intersection 2015-02-05 09:38:45 -08:00
David Rowe
056365932b Make circle3d dimension property specify overall size not half size 2015-02-05 09:37:08 -08:00
Brad Davis
e1af9f8126 Merge remote-tracking branch 'upstream/master' into text-renderer 2015-02-04 21:04:47 -08:00
Clément Brisset
6a4577b6a5 Merge pull request #4231 from ZappoMan/crashonexit 
BUG FIXES: Crash on Exit with partially loaded scene & (near)-infinite loop in skipForward physics
 2015-02-04 16:16:56 -08:00
Brad Hefta-Gaub
af91eee5a0 Merge pull request #4220 from sethalves/rework-bandwidth-meter 
fix several signed/unsigned comps, avoid sprintf in overlay code
 2015-02-04 16:06:22 -08:00
Thijs Wenker
de3afa0637 keep a boolean for cursorHidden state, so we know when to hide the VR-mode-cursor while the normal cursor is hidden 2015-02-05 00:19:45 +01:00
Thijs Wenker
9dbcefed2a Fix for making cursor invisible over the glwidget and js-interface to cursorVisible boolean 2015-02-04 23:23:27 +01:00
Brad Hefta-Gaub
8311d1a00a Merge pull request #4228 from ctrlaltdavid/20279 
CR for Job #20279 - Tools > Audio device selection doesn't work on Windows
 2015-02-04 13:59:14 -08:00
ZappoMan
4061e14c2d move static members of ResourceManager into DependencyManager 2015-02-04 13:24:37 -08:00
Brad Davis
1745ba9a7e More OSX work, refactoring functions to shared, removing erroneuous Qt 5.4 dependency, fixing PrioVR text api usage 2015-02-04 12:42:27 -08:00
Seth Alves
bcf0846310 merge from master 2015-02-04 11:30:22 -08:00
Seth Alves
a645d784d8 uint32_t rather than uint, which mac doesn't like 2015-02-04 11:26:05 -08:00
Thijs Wenker
38aab9570b Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-02-04 19:55:12 +01:00
Stephen Birarda
30afadc7b7 fixes for new settings API 2015-02-04 10:53:05 -08:00
Stephen Birarda
11f3161029 resolve conflicts on merge with upstream/master 2015-02-04 10:38:05 -08:00
Brad Davis
8ca70c9e80 Removing some dev modifications 2015-02-03 23:30:43 -08:00
Brad Davis
f471597a73 Merge branch 'develop' into text-renderer 2015-02-03 23:07:19 -08:00
Brad Davis
d34c2ae26a Merge branch 'master' into develop 2015-02-03 23:06:49 -08:00
Brad Davis
cb7f4ca672 Pre-pull checking 2015-02-03 23:06:09 -08:00
Brad Hefta-Gaub
de58c4a007 Merge pull request #4217 from Atlante45/master 
Fix for fps bug/field of view
 2015-02-03 19:13:52 -08:00
Brad Hefta-Gaub
01f594b535 Merge pull request #4221 from AndrewMeadows/bispinor 
proof Andrew has a working Windows build on his laptop
 2015-02-03 19:07:01 -08:00
Brad Davis
0c78af9abb Working on text rendering refactor 2015-02-03 18:57:39 -08:00
Brad Hefta-Gaub
b9ee1294fa Merge pull request #4216 from ctrlaltdavid/20281 
Fix orientation of non-solid rectangle3d overlays, too
 2015-02-03 18:52:51 -08:00
Brad Davis
d64e7c464a Merge branch 'develop' into text-renderer 2015-02-03 18:44:06 -08:00
Brad Davis
190669d168 Merge branch 'master' into develop 2015-02-03 18:43:51 -08:00
Andrew Meadows
35cbc9a41d pass FBXGeometry by const reference 
this fixes a bug on windows about misaligned data in function call
 2015-02-03 18:40:55 -08:00
Seth Alves
3d23446dcb remove a couple more sprintfs 2015-02-03 17:21:41 -08:00
Seth Alves
c97eb20d69 avoid use of sprintf in overlay code 2015-02-03 17:11:10 -08:00
Atlante45
578ab1a9f2 Leave LOD settings as globals 2015-02-03 16:13:13 -08:00
Seth Alves
8489ee04f3 fix a couple of signed vs unsigned comparisons. 2015-02-03 16:11:04 -08:00
Stephen Birarda
dc84c336ea handle login failure, have AccountManager generate keypair 2015-02-03 16:09:06 -08:00
Atlante45
875507aaaa Missing return 2015-02-03 15:58:24 -08:00
David Rowe
8297bbd5e7 Fix orientation of non-solid rectangle3d overlays, too 2015-02-03 15:52:20 -08:00
Atlante45
375d9eed5b Fix QTimer warning 2015-02-03 15:22:52 -08:00
David Rowe
d9e353e498 Merge branch 'master' into 20280 
Conflicts:
	libraries/networking/src/LimitedNodeList.h
 2015-02-03 14:46:27 -08:00
Brad Hefta-Gaub
b5e62922a2 Merge pull request #4215 from huffman/edit-changes 
A few improvements to editEntities.js
 2015-02-03 13:55:59 -08:00
Brad Hefta-Gaub
81871abd06 Merge pull request #4214 from ctrlaltdavid/20281 
Fix orientation of rectangle3d overlays to match other 3D overlays
 2015-02-03 13:54:19 -08:00
Atlante45
78a9d002db Remove settings from InboundAudioStream 2015-02-03 12:47:25 -08:00
Atlante45
27459ba861 Settings update 2015-02-03 12:27:30 -08:00
Ryan Huffman
ba5a96f541 Add Window.setFocus 2015-02-03 11:44:22 -08:00
David Rowe
7f7cba8a1b Fix orientation of rectangle3d overlays to match other 3D overlays 2015-02-03 10:54:16 -08:00
Atlante45
aacf61609f Merge branch 'master' of https://github.com/highfidelity/hifi 2015-02-03 10:53:44 -08:00
Atlante45
09a9f82256 More settings update 2015-02-03 10:52:50 -08:00
Seth Alves
0fa1273cc9 draw background behind bandwidth overlay stats 2015-02-03 10:51:20 -08:00
Stephen Birarda
e07ce23825 resolve conflicts on merge with upstream master 2015-02-03 10:25:17 -08:00
Atlante45
fdade344a3 Move Audio to new settings 2015-02-03 10:15:11 -08:00
Philip Rosedale
6483df69a4 Merge pull request #4209 from sethalves/rework-bandwidth-meter 
Consolidate Network Bandwidth Metrics
 2015-02-03 09:05:28 -08:00
Ryan Huffman
13ea8ddb9e Add missing _texture to BillboardOverlay copy ctor 2015-02-03 08:52:58 -08:00
Andrew Meadows
28a3c3f469 separate new shape types from legacy 2015-02-03 08:34:06 -08:00
Brad Davis
6cfb51283e Working on the text renderer 2015-02-03 01:49:06 -08:00