Commit graph

1864 commits

Author SHA1 Message Date
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
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
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
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
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
Brad Hefta-Gaub
3531463978 Merge pull request #4265 from Triplelexx/#20300
#20300
2015-02-12 17:19:01 -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
Thijs Wenker
cb09656624 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-02-11 22:58:27 +01: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
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
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
ZappoMan
ea33c66681 fix formating issue in performance stats 2015-02-09 15:04:43 -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
Thijs Wenker
e3ca1efe6b Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-02-07 00:34:38 +01: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
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
Atlante45
920082331f Fix funky text 3D overlays 2015-02-06 14:15:10 -08:00
David Rowe
67e2e748e7 Merge branch 'master' into 20282 2015-02-06 13:25:43 -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
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
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
Seth Alves
bcf0846310 merge from master 2015-02-04 11:30:22 -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
f471597a73 Merge branch 'develop' into text-renderer 2015-02-03 23:07:19 -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 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
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
David Rowe
8297bbd5e7 Fix orientation of non-solid rectangle3d overlays, too 2015-02-03 15:52:20 -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
27459ba861 Settings update 2015-02-03 12:27:30 -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
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
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
Brad Davis
6cfb51283e Working on the text renderer 2015-02-03 01:49:06 -08:00
Stephen Birarda
ef82b90b89 add back the Application getter in ApplicationOverlay 2015-02-02 17:19:33 -08:00
Stephen Birarda
bd0552618f resolve conflicts on merge with upstream/master 2015-02-02 17:10:13 -08:00
Seth Alves
3fdf05ff77 coding standard 2015-02-02 15:36:18 -08:00
Seth Alves
82b8595af8 coding standard 2015-02-02 15:34:08 -08:00
Seth Alves
8e64417607 formatting and cleanups 2015-02-02 12:21:46 -08:00
Seth Alves
4377105410 formatting and cleanups 2015-02-02 12:13:54 -08:00
Seth Alves
779a0086c4 BandwidthRecorder no longer knows about channel displays. cause overlay pps and Mbps to only update once per second 2015-02-02 11:56:50 -08:00
Seth Alves
f1cca2ac92 move bandwidth stats display details out of recorder class into dialog class 2015-02-02 09:26:09 -08:00
Seth Alves
c0a219678c use DependencyManager to keep track of BandwidthRecorder 2015-02-02 08:55:55 -08:00
Seth Alves
b85456b1e9 refactoring, cause BandwidthDialog to only update numbers once per second 2015-02-02 05:28:28 -08:00
Thijs Wenker
d695e8b251 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-02-02 00:18:18 +01:00
Seth Alves
fc07ecf83d use BandwidthRecorder rather than recompute Mbps and pps in Application 2015-01-31 20:40:18 -08:00
Seth Alves
bee895ba0a capture network bandwidth stats from NodeList rather than various places 2015-01-31 20:02:04 -08:00
Atlante45
1cfd98b2d7 Name threads 2015-01-31 00:50:12 -08:00
Ryan Huffman
42bab84990 Merge branch 'master' of github.com:highfidelity/hifi into billboard-update
Conflicts:
	interface/src/ui/overlays/BillboardOverlay.cpp
2015-01-30 16:58:05 -08:00
Brad Hefta-Gaub
918349b227 Merge pull request #4196 from ctrlaltdavid/20277
CR for Job #20277 - Interface user agent string change
2015-01-30 16:52:30 -08:00
Seth Alves
067deefeb6 avoid use of snprintf 2015-01-30 15:23:40 -08:00
Ryan Huffman
1f24658f67 Remove BillboardOverlay::replyFinished() 2015-01-30 14:45:45 -08:00
Ryan Huffman
efd383d269 Update BillboardOverlay to use NetworkTexture 2015-01-30 14:42:41 -08:00
David Rowe
5474c0634e Merge branch 'master' into 20277
Conflicts:
	libraries/script-engine/src/ScriptEngine.cpp
2015-01-30 13:49:45 -08:00
Seth Alves
620efb2bbe change display style of bandwidth detail dialog, include a totals line 2015-01-30 13:43:28 -08:00
Atlante45
4562c29be8 Merge branch 'master' of https://github.com/highfidelity/hifi into android
Conflicts:
	interface/src/avatar/Hand.cpp
2015-01-30 12:02:11 -08:00
Seth Alves
2999a77f87 merge from master 2015-01-30 11:15:01 -08:00
Seth Alves
f0edba9a6b Start on refactoring of bandwidth metrics 2015-01-30 11:11:17 -08:00
samcake
e3fa2e1995 Merge pull request #4191 from ZappoMan/moreImmediateModeRemoval
Removal of glColorXXX()
2015-01-30 10:21:18 -08:00
Thijs Wenker
adc7ed5f72 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-30 02:37:00 +01:00
Sam Gateau
ec54ac7401 Fixing the non loading of some texture because the QImage bit size is not exactly what's expected 2015-01-29 15:24:36 -08:00
Sam Gateau
b2f16be92a Fixing the non loading of some texture because the QImage bit size is not exactly what's expected 2015-01-29 15:17:55 -08:00
Atlante45
647a935eaa Remove app->getAvatar 2015-01-29 15:16:40 -08:00
ZappoMan
418b97a648 attempt to get color working for 3d textured quads 2015-01-29 12:04:34 -08:00
ZappoMan
87e91a5a94 Revert "attempt to get color working for 3d textured quads"
This reverts commit 0f390a98b8.
2015-01-29 11:44:36 -08:00
ZappoMan
0f390a98b8 attempt to get color working for 3d textured quads 2015-01-29 10:50:13 -08:00
ZappoMan
efb044ea5e change renderDashedLine() to take a color paramter 2015-01-28 15:08:59 -08:00
ZappoMan
f9bcb65467 change removing more glColor calls 2015-01-28 14:52:40 -08:00
ZappoMan
2f4e98082b remove glColor calls related to text rendering 2015-01-28 13:54:48 -08:00
Atlante45
4ef87b9919 Merge branch 'master' of https://github.com/highfidelity/hifi into android
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/ui/PreferencesDialog.cpp
	interface/src/ui/Stats.cpp
	libraries/audio-client/src/AudioClient.cpp
	libraries/audio-client/src/AudioClient.h
2015-01-28 13:13:32 -08:00
ZappoMan
7d9de6d0eb added some TODO comments and some cleanup 2015-01-28 11:03:05 -08:00
Thijs Wenker
46618db697 Merge branch 'master' of https://github.com/worklist/hifi into 20224
Conflicts:
	interface/src/ui/ApplicationOverlay.h
2015-01-28 19:35:17 +01:00
ZappoMan
30f985a6fe some cleanup 2015-01-28 10:30:05 -08:00
ZappoMan
5df45c7dce build buster and warnings fixes 2015-01-27 16:55:16 -08:00
ZappoMan
4a6cc5c6f2 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
Conflicts:
	interface/src/avatar/Hand.cpp
	interface/src/ui/overlays/ImageOverlay.cpp
2015-01-27 16:44:11 -08:00
Andrew Meadows
026c39e010 Merge pull request #4131 from Atlante45/pull_out_menu_mess
Settings - Part I
2015-01-27 16:23:23 -08:00
Atlante45
c25ae9d506 Merge branch 'android' of git://github.com/birarda/hifi into android
Conflicts:
	interface/src/Application.cpp
	libraries/entities/src/EntityCollisionSystem.cpp
	libraries/entities/src/EntityCollisionSystem.h
2015-01-27 15:04:17 -08:00
Stephen Birarda
54660dd1a2 resolve conflicts on merge with upstream master 2015-01-27 14:24:48 -08:00
Thijs Wenker
6947436994 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-27 22:29:49 +01:00
Andrew Meadows
e2ffe00c38 Merge pull request #4172 from huffman/fix-image-overlay-rescale
Fix image overlay rescale
2015-01-27 13:07:15 -08:00
Ryan Huffman
6a9f135e1c Cleanup image clipping in ImageOverlay 2015-01-27 08:11:37 -08:00
Ryan Huffman
d27a26967f Update ImageOverlay to take texture rescaling into account 2015-01-27 08:09:47 -08:00
Atlante45
20358a87d6 Moved some headers around 2015-01-27 01:43:01 -08:00
Atlante45
79bf70acb4 Guard QXmpp with #ifdef 2015-01-27 01:41:12 -08:00
Atlante45
71b565c33c Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess
Conflicts:
	interface/src/Application.cpp
2015-01-27 01:21:33 -08:00
David Rowe
812fbc58fb Use custom User-Agent string 2015-01-23 19:13:29 -08:00
Andrzej Kapolka
bc0fa0ed24 Push granularity option down the line in preparation for selectively
increasing resolution.
2015-01-23 13:58:51 -08:00
Atlante45
4fce5113dd Use DM to access AvatarHashMap/Manager 2015-01-23 11:50:27 -08:00
Thijs Wenker
42cf9e846a Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-23 19:10:08 +01:00
Ryan Huffman
0e9e77f166 Fix broken support for color-only ImageOverlay 2015-01-22 08:58:55 -08:00
Ryan Huffman
52193fce38 Remove qDebug 2015-01-22 08:35:38 -08:00
ZappoMan
d3ae9af8ed Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-21 15:18:41 -08:00
Ryan Huffman
ba2f7d88ce Update ImageOverlay to use TextureCache 2015-01-21 15:09:09 -08:00
Stephen Birarda
e34fb66be7 Merge branch 'master' of https://github.com/highfidelity/hifi into android 2015-01-21 12:41:20 -08:00
Stephen Birarda
693c52da55 hand off audio bandwidth to BandwidthManager 2015-01-21 12:39:04 -08:00
Stephen Birarda
f885dc229b final fixes for Audio includes in Interface 2015-01-21 12:31:10 -08:00
Stephen Birarda
0eced09f1d intial removal of Audio to audio-client 2015-01-21 11:49:06 -08:00
Thijs Wenker
719f76d42f Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-21 15:09:11 +01:00
Atlante45
e1725d1eee Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess 2015-01-20 17:41:08 -08:00
Clément Brisset
a41ef94f5c Merge pull request #4137 from ctrlaltdavid/null-dereference
Guard against derefencing NULL
2015-01-20 11:31:04 -08:00
Atlante45
88872825fa Don't call settings in render loop 2015-01-20 10:56:58 -08:00
Atlante45
6a00dcbf0a More switches to new Settings 2015-01-20 00:30:29 -08:00
Atlante45
cdb0c22207 interface/ui uses new settings 2015-01-19 22:49:27 -08:00
David Rowe
214a18c446 Guard against derefencing NULL 2015-01-19 19:33:12 -08:00
Atlante45
43597ea29d Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess
Conflicts:
	interface/src/Application.cpp
	interface/src/Menu.cpp
2015-01-19 14:18:22 -08:00
ZappoMan
283ab6dd0c Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
Conflicts:
	interface/src/MetavoxelSystem.cpp
2015-01-19 14:13:46 -08:00
ZappoMan
41c039f283 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-19 13:34:28 -08:00
ZappoMan
bddb7856af more work 2015-01-19 13:34:09 -08:00
Andrzej Kapolka
eb320f37c7 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2015-01-19 12:41:21 -08:00
Andrzej Kapolka
f0d09860ad Removed a couple magic numbers. 2015-01-19 11:46:12 -08:00
David Rowe
9860feec61 Tweak 3D text overlay text size calculations 2015-01-19 09:54:44 -08:00
Atlante45
a2b08cf1cb Hopefully fixes windows compilation error 2015-01-18 20:51:39 -08:00
Atlante45
967028e5cf Removed more QSettings references 2015-01-18 19:29:27 -08:00
Atlante45
c2b7ff1b54 Totally removed Application's setting memember 2015-01-18 19:10:30 -08:00
Atlante45
92e9df0c74 AnimationsDialog uses new settings 2015-01-18 18:38:00 -08:00
Andrzej Kapolka
a9f7533477 Set/erase brushes. 2015-01-18 16:20:55 -08:00
Atlante45
1f31828e08 Moved last methog out of Menu
Also did a bit of Header cleanup
2015-01-18 07:14:52 -08:00
Atlante45
8933da7bc7 Moved SpeechRecognizer out of Menu
Added it in the DM
2015-01-18 06:50:34 -08:00
Atlante45
5930e06849 Moved Snapshot location out of Menu
Moved into Snapshot
2015-01-18 06:02:03 -08:00
Atlante45
90c3c7955a Moved chat out of Menu
Move into DialogsManager
	Done moving dialogs out of Menu!!!
2015-01-18 05:16:33 -08:00
Atlante45
c600a3b0b3 More dialog out of Menu (Almost there)
Moved into DialogsManager
2015-01-18 04:47:13 -08:00
Atlante45
8d483c9e6e Moved some more dialogs out of Menu
All moved into DialogsManager
2015-01-18 04:34:33 -08:00
Atlante45
afadb0b48c Moved more dialogs out of Menu
All moved into DialogsManager
2015-01-18 04:08:34 -08:00
Atlante45
05edbd68bf Moved OctreeStatsDialog out of Menu
Moved it into DialogsManager
2015-01-18 03:48:37 -08:00
Atlante45
fb8639b85c Moved AddressBar out of Menu
Moved into DialogsManager
2015-01-18 03:31:55 -08:00
Atlante45
8f9507cd4c Added DialogsManager
Moved login dialog out of menu into the dialog manager
	More to follow!
2015-01-18 03:31:44 -08:00
Atlante45
e8a396b08b Moved Octree max pps out of Menu
Moved it to OctreeQuery
2015-01-17 23:31:38 -08:00
Atlante45
21a3705b48 Added StandAloneJSConsole class
Moved _jsConsole out of Menu to a global class of it's own
2015-01-17 23:08:30 -08:00
Atlante45
bfceaf2838 Moved FieldOfView related members out of Menu
Moved them to ViewFrustum
2015-01-17 22:37:02 -08:00
Atlante45
47babc2d40 Move Sixense related members out of Menu
Moved to SixenseManager
2015-01-17 22:09:29 -08:00
Atlante45
ef5cfdc3ab Move Faceshift related member out of Menu
Moved it to Faceshift class
2015-01-17 21:35:25 -08:00
Atlante45
8f5f634308 Took audio settings out of Menu
Hooked to actual settings in Audio class
2015-01-17 21:22:02 -08:00
Andrzej Kapolka
5bb441b6ef Added a "voxelize" brush for debugging. 2015-01-17 20:17:28 -08:00
Atlante45
229791a9f2 Move Oculus UI ratio to ApplicationOverlay 2015-01-17 19:45:48 -08:00
Atlante45
3fbc8c5d44 Moved Menu::shouldRenderMesh() to LODManager 2015-01-17 17:56:33 -08:00
Andrzej Kapolka
debc9b735d Fixed edge issue, increased default grid size to correspond to default
heightfield import.
2015-01-17 16:33:35 -08:00
Atlante45
a9047b7b15 LODManager class
Moved most LOD related members in menu to new Dependency
LODManager
	Replaced all Menu::getInstance() call that accessed those
members by DM gets
2015-01-16 17:55:47 -08:00
Thijs Wenker
6bad7a6002 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-17 01:35:35 +01:00
Andrzej Kapolka
b6c843497d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2015-01-16 11:56:04 -08:00
Andrew Meadows
5c9e9e79bf Merge pull request #4092 from thoys/20255
CR for Job #20255 - Visually show the grouping of scripts in the "Running Scripts" dialog
2015-01-15 16:58:24 -08:00
Ryan Huffman
cfb996db0c Add missing paramaters to Base3DOverlay copy ctor 2015-01-15 14:15:59 -08:00
Thijs Wenker
5de4f8f249 Merge branch 'master' of https://github.com/worklist/hifi into 20224
Conflicts:
	examples/libraries/virtualKeyboard.js
2015-01-15 22:59:05 +01:00
Thijs Wenker
d820df4972 ScriptModel destructor 2015-01-15 22:54:32 +01:00
Thijs Wenker
836f16276f Merge branch 'master' of https://github.com/worklist/hifi into 20255 2015-01-15 22:32:30 +01:00
ZappoMan
db94949649 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
2015-01-14 17:55:03 -08:00
ZappoMan
e6388a65b9 rough pass at adding color to geometry cache 2015-01-13 20:53:05 -08:00
Atlante45
476e2124b7 Moved DM::get() calls to auto 2015-01-13 20:51:02 -08:00
Atlante45
f77fab2fe0 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 20:38:52 -08:00
ZappoMan
1b0a5c881b Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-13 16:14:29 -08:00
Thijs Wenker
74d56fb754 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-13 22:42:02 +01:00
Atlante45
4429e144f4 Fix merge accidental code delete 2015-01-13 11:10:13 -08:00
Atlante45
2a82ff9768 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11
Conflicts:
	assignment-client/src/voxels/VoxelServer.cpp
	interface/src/Application.cpp
	interface/src/Audio.cpp
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/PreferencesDialog.cpp
	libraries/networking/src/NodeList.cpp
	libraries/shared/src/DependencyManager.h
2015-01-13 11:03:14 -08:00
Atlante45
cf7089e145 Move constant back to Menu 2015-01-12 18:49:05 -08:00
Atlante45
74d819fe25 Merge branch 'master' of https://github.com/highfidelity/hifi into body_not_rotating 2015-01-12 16:42:35 -08:00
Atlante45
e30b119464 Some simple code cleanup 2015-01-12 15:55:25 -08:00
Thijs Wenker
7acb4e4716 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-13 00:43:47 +01:00
Thijs Wenker
3da5677aaf added HMD interface to toggle magnifier 2015-01-13 00:43:16 +01:00
Atlante45
59c9e0bb50 Wire CachesSizeDialog in Menu 2015-01-12 15:19:36 -08:00
Atlante45
19f321c171 Fixed caches not in DM 2015-01-12 13:56:41 -08:00
Atlante45
38dc1643ef New Caches size dialog 2015-01-12 12:46:11 -08:00
Atlante45
5be5dc716f Make sure every widget has diolog has a parent 2015-01-12 12:45:50 -08:00
Thijs Wenker
e4fd027d15 "load script from URL" button in Running scripts window 2015-01-12 00:49:41 +01:00
Thijs Wenker
8feb51013b running script window treeview fully works 2015-01-12 00:41:38 +01:00
Thijs Wenker
d84a65a5f9 running scripts list -> treeview initial 2015-01-10 01:29:06 +01:00
Ryan Huffman
e00b629133 Fix gl projection matrix stack overflow when rendering to HUD
The projection matrix stack is considerably smaller than the modelview
stack and was overflowing on Windows and Linux machines that were tested.
2015-01-09 16:11:17 -08:00
Andrzej Kapolka
e3074d726b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Conflicts:
	libraries/metavoxels/src/Spanner.cpp
2015-01-09 11:52:05 -08:00
Andrzej Kapolka
d82f269263 Don't show grid for tools where it isn't needed, started on "fill" tool. 2015-01-09 11:46:40 -08:00
ZappoMan
925b13cc93 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-09 09:19:53 -08:00