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

11407 commits

Author SHA1 Message Date
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
Atlante45
cc58cb0f03 Update domain-server and Application setting handles 2015-02-02 20:06:13 -08:00
Stephen Birarda
9a0c102fb6 remove some extra spaces in Application 2015-02-02 17:27:53 -08:00
Atlante45
1e64fc84e8 Moved startup Application info settings load out of Application 2015-02-02 17:19:54 -08:00
Stephen Birarda
ef82b90b89 add back the Application getter in ApplicationOverlay 2015-02-02 17:19:33 -08:00
Stephen Birarda
67c21be5dc remove old audioIO connections for bandwidth 2015-02-02 17:17:22 -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
c1ae98fa1a quiet some compiler warnings about signed vs unsigned comparisons 2015-02-02 15:02:29 -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
David Rowe
6e82679997 Permanently re-enable audio selection on Windows 2015-02-02 11:19:11 -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
Brad Davis
60317b3526 Working on signed distance fields text rendering 2015-01-31 21:42:54 -08: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
Brad Davis
71b677ef5c Removing nsight dependency as it breaks on my machine 2015-01-31 19:43:55 -08:00
Seth Alves
77582f50df Merge branch 'master' of github.com:highfidelity/hifi into rework-bandwidth-meter 2015-01-31 10:53:33 -08:00
Seth Alves
97035b6cd9 move some magic numbers to constants 2015-01-31 07:42:01 -08:00
Atlante45
1cfd98b2d7 Name threads 2015-01-31 00:50:12 -08:00
David Rowe
3c7cdc16ce Merge branch 'master' into 20280 
Conflicts:
	interface/src/Application.h
 2015-01-30 18:44:14 -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
e73a000bb8 Merge pull request #4208 from birarda/master 
update to @problem's new interface icon
 2015-01-30 16:53:32 -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
Stephen Birarda
f78f6ab4cf fix check for debug/release icon 2015-01-30 15:41:44 -08:00
Stephen Birarda
2c74502394 move Interface icon back in icon sub-folder 2015-01-30 15:26:29 -08:00
Stephen Birarda
c4a2da15d1 change interface icon to lowercase 2015-01-30 15:26:07 -08:00
Seth Alves
067deefeb6 avoid use of snprintf 2015-01-30 15:23:40 -08:00
Stephen Birarda
ae87dac523 update to new interface icon 2015-01-30 15:22:21 -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
Seth Alves
eda7785d3b minor edit to make diff nicer 2015-01-30 14:41:03 -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
5c9d64c482 Merge branch 'master' of github.com:highfidelity/hifi into rework-bandwidth-meter 2015-01-30 13:46:43 -08:00
Seth Alves
620efb2bbe change display style of bandwidth detail dialog, include a totals line 2015-01-30 13:43:28 -08:00
samcake
efbf043f7d Merge pull request #4202 from Atlante45/master 
Edge case when removing all scripts
 2015-01-30 13:01:53 -08:00
Atlante45
fae59ab939 Edge case when removing all scripts 2015-01-30 12:20:00 -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
dd9d054286 Start on refactoring of bandwidth metrics 2015-01-30 11:44:57 -08:00
Atlante45
d9152136ea Remove unused header 2015-01-30 11:41:48 -08:00
samcake
1c89e27718 Merge pull request #4201 from Atlante45/master 
Fix not saving stopped scripts
 2015-01-30 11:39:40 -08:00
Atlante45
18c77e1cca Fix not saving stopped scripts 2015-01-30 11:27:45 -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
Atlante45
ff5ce25d19 Merge branch 'master' of https://github.com/highfidelity/hifi into android 2015-01-29 16:55:51 -08:00
Atlante45
2d973e5288 Move updateMyAvatar to AvatarManager 2015-01-29 16:55:32 -08:00
Atlante45
6b7a391885 move a couple avatar initialisations outside avatar maanger 2015-01-29 16:00:57 -08:00
Sam Gateau
a2ec6ea2e0 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-01-29 15:35:15 -08: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
Atlante45
381ccfac37 Merge branch 'android' of git://github.com/birarda/hifi into android 2015-01-29 14:10:39 -08:00
Atlante45
c7fa91d11c Privatize AvatarManager constructor 2015-01-29 14:07:42 -08:00
ZappoMan
8c0db268e6 fix build buster 2015-01-29 13:41:39 -08:00
Brad Hefta-Gaub
8a32bd2eed Merge pull request #4164 from ctrlaltdavid/20183 
CR for 20183 Add Oculus support to notifications.js
 2015-01-29 13:38:49 -08:00
Stephen Birarda
763994da5a handle gverb move to audio-client 2015-01-29 12:44:03 -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
Atlante45
ff88b7d4e6 Merge branch 'android' of git://github.com/birarda/hifi into android 2015-01-29 10:59:54 -08:00
ZappoMan
0f390a98b8 attempt to get color working for 3d textured quads 2015-01-29 10:50:13 -08:00
Stephen Birarda
fa166f012f set size of GVRMainWindow to note 4 size 2015-01-29 10:11:46 -08:00
ZappoMan
018b38e56d fix warning 2015-01-28 18:51:10 -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
ZappoMan
6821f31f14 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 
Conflicts:
	libraries/gpu/src/gpu/GLBackend.cpp
 2015-01-28 10:46:30 -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
David Rowe
7286a9c5fb Merge branch 'master' into 20276 2015-01-27 19:08:40 -08:00
Atlante45
98fc1836d8 Revert "Use QDickCache for every QNAM" 
This reverts commit 2f39b93823.
 2015-01-27 18:09:22 -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
David Rowe
2ee1570a40 Merge branch 'master' into 20276 2015-01-27 16:38:41 -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
505f3f143b Merge branch 'android' of git://github.com/birarda/hifi into android 2015-01-27 16:13:35 -08:00
Atlante45
a28195a334 Move setApplication/Organisation to setupEssentials 2015-01-27 15:28:06 -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
d420674edd apply orientation change to listening position for audio 2015-01-27 14:50:02 -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
David Rowe
44083dd343 Add user warning if domain has mismatched packet versions 2015-01-27 13:10:11 -08: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
Andrew Meadows
f2f054f689 Merge pull request #4161 from ey6es/master 
Partial implementation of "granularity" setting for metavoxel tools.
 2015-01-27 12:52:32 -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
af2177a4ac Remove gl include 2015-01-27 02:00:41 -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
dbdb87a1a2 Moved Menu dependency out of audio 2015-01-27 01:21:59 -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
Atlante45
4278407137 Account for avatar scale in Hand(Data) get/set 
When using localToWorld/WorldToLocal type functions
 2015-01-26 16:48:33 -08:00
David Rowe
9aaa3a6fe4 Temporarily re-enable audio selection on Windows 
This is to test current behavior on different users' PCs before
re-enabling permanently.
 2015-01-26 11:48:44 -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
Atlante45
9f58865937 Add AvatarHashMap and AvatarManager to DM 2015-01-23 11:46:11 -08:00
Thijs Wenker
42cf9e846a Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-23 19:10:08 +01:00
Andrew Meadows
5672403900 Merge pull request #4154 from huffman/win-dpi-fixes 
Update runningScriptsWidgets px -> pt
 2015-01-23 08:05:24 -08:00
Andrzej Kapolka
b8a15f0726 Another tweak. 2015-01-22 22:04:10 -08:00
Andrzej Kapolka
c124dffd6a Another slight improvement. 2015-01-22 21:26:08 -08:00
Andrzej Kapolka
e65090bab9 Another slight stitching improvement. 2015-01-22 21:08:48 -08:00
David Rowe
22347dd794 Add AudioDevice.deviceChanged() signal and use to update audio menu 2015-01-22 19:11:55 -08:00
Ryan Huffman
0e6f2d7252 Update runningScriptsWidgets px -> pt 2015-01-22 16:22:36 -08:00
Andrzej Kapolka
c1c9f698df Merge branch 'master' of https://github.com/highfidelity/hifi 2015-01-22 14:55:37 -08:00
Andrzej Kapolka
805d5ace13 Another slight stitching improvement. 2015-01-22 14:55:14 -08:00
Andrew Meadows
b2f2a3ad27 Merge pull request #4149 from huffman/improve-loading 
Update ImageOverlay to use TextureCache
 2015-01-22 09:26:10 -08: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
Andrzej Kapolka
cc9bbc3490 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-01-21 17:47:40 -08:00
Andrzej Kapolka
0d8380a288 Put the indices for our extra triangles into the spatial hash. 2015-01-21 17:47:13 -08:00
Andrzej Kapolka
8bd944e32e Incremental improvement to stitching. 2015-01-21 16:10:00 -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
Andrew Meadows
1b7074e52a purge EntityCollisionSystem 2015-01-21 14:16:34 -08:00
Andrew Meadows
1c38b08e8f remane emitEntityCollision... to entityCollision... 2015-01-21 14:07:23 -08:00
Stephen Birarda
343b09c855 remove AudioClient dependency on Recorder 2015-01-21 13:21:37 -08:00
Andrzej Kapolka
8636f0c48e Simplification. 2015-01-21 12:57:24 -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
Andrzej Kapolka
87e3339791 Fix for normal selection with degenerate triangles. 2015-01-21 12:28:05 -08:00
Stephen Birarda
b2a9cdde8b migrate Audio header in AudioToolBox 2015-01-21 12:04:33 -08:00
Stephen Birarda
429d660dd6 migrate Audio includes to AudioClient 2015-01-21 12:04:06 -08:00
Stephen Birarda
d2af9a2911 have Application pass audio pos/orientation to AudioClient 2015-01-21 12:03:11 -08:00
Stephen Birarda
e28ca27ccd add a position and orientation getter for AudioClient 2015-01-21 11:55:12 -08:00
Stephen Birarda
0eced09f1d intial removal of Audio to audio-client 2015-01-21 11:49:06 -08:00
Andrew Meadows
e49c76656f merge upstream/master into andrew/isentropic 
Conflicts:
	libraries/physics/src/PhysicsEngine.cpp
 2015-01-21 11:35:36 -08:00
Andrew Meadows
86583f3f3f physics collisions emit script collision events 2015-01-21 11:27:32 -08:00
Atlante45
11ea3e4047 Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess 2015-01-21 11:15:31 -08:00
Atlante45
2f39b93823 Use QDickCache for every QNAM 2015-01-21 11:12:11 -08:00
Thijs Wenker
87b2c362fc style 2015-01-21 17:19:51 +01:00
David Rowe
504bd5e1b1 Expose default eye position to JavaScript 2015-01-21 08:14:46 -08:00
Thijs Wenker
719f76d42f Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-21 15:09:11 +01:00
Thijs Wenker
9e51bece63 More accurate HMD-cursor on virtual keyboard, thanks Simon and @ctrlaltdavid for the help on this! 2015-01-21 15:07:32 +01:00
Andrzej Kapolka
10c4408d94 Slight stitching tweak. 2015-01-20 21:52:56 -08:00
Andrzej Kapolka
79e18b161d Simplification. 2015-01-20 18:42:40 -08:00
Andrzej Kapolka
35547a5a02 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-01-20 18:30:50 -08:00
Andrzej Kapolka
460a307ebe Better stitching. 2015-01-20 18:12:00 -08: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
Atlante45
77bab2a8c2 Setup Thread and timer for settings 2015-01-20 17:11:46 -08:00
Atlante45
2b3f12a7c4 More settings hooks 2015-01-20 16:52:42 -08:00
Atlante45
8d37f5ae00 More setting handles 2015-01-20 15:35:22 -08:00
Andrzej Kapolka
b2079ab849 Go ahead and generate mipmaps for the terrain color texture. 2015-01-20 14:42:48 -08:00
Atlante45
f254591c88 Don't use (set)Geometry to save/restore mainWindow 2015-01-20 14:03:26 -08:00
Andrzej Kapolka
fa466da072 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-01-20 13:08:25 -08:00
Andrzej Kapolka
b4cd13f0be Fix for misaligned color/material textures when resolution is greater than the 
height map.
 2015-01-20 13:07:35 -08:00
Ryan Huffman
0d9dbaccf7 Merge branch 'master' of github.com:highfidelity/hifi into entity-list-updates 2015-01-20 11:44:13 -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
Stephen Birarda
b4d6a44fc2 Merge branch 'master' of https://github.com/highfidelity/hifi into android 2015-01-20 11:15:54 -08:00
Atlante45
88872825fa Don't call settings in render loop 2015-01-20 10:56:58 -08:00
Atlante45
997f9384da Remove window default geometry 2015-01-20 02:11:51 -08:00
Atlante45
e4fa9e508e Moved loadSetting to MyAvatar 2015-01-20 00:56:25 -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
Atlante45
27390e6c99 Replaced wrong namespace 2015-01-19 22:36:46 -08:00
Atlante45
23bab601c5 LODManager uses new settings 2015-01-19 21:27:21 -08:00
David Rowe
214a18c446 Guard against derefencing NULL 2015-01-19 19:33:12 -08:00
Andrzej Kapolka
16de6a130b Scratch that last change; it wasn't the problem. 2015-01-19 17:29:43 -08:00
Andrzej Kapolka
a16b54a34a Let's try not using the "augmented" data, since we don't need it. 2015-01-19 17:23:31 -08:00
Andrzej Kapolka
dafa44570a That was not the shader change I wanted to check in. This was. 2015-01-19 17:15:58 -08:00
Atlante45
d15d8e0ad6 ScriptsLocation uses new settings 2015-01-19 16:45:10 -08:00
Atlante45
dc972df59d Fixed load/saveAction types 2015-01-19 16:44:54 -08:00
Andrzej Kapolka
e5f3d48ffb Fix for splatted textures against empty regions. 2015-01-19 16:33:41 -08:00
Atlante45
c1e195d17b Remove load/saveSettings from Menu/Application 
Tweaked scanMenuBar too
 2015-01-19 16:24:58 -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
Stephen Birarda
60bdd206eb Merge branch 'master' of https://github.com/highfidelity/hifi into android 2015-01-19 12:35:22 -08:00
Brad Hefta-Gaub
699964ebb9 Merge pull request #4111 from AndrewMeadows/bispinor 
require Bullet
 2015-01-19 12:30:14 -08:00
Andrzej Kapolka
f0d09860ad Removed a couple magic numbers. 2015-01-19 11:46:12 -08:00
Stephen Birarda
10be0ee984 resolve conflicts on merge with upstream master 2015-01-19 10:26:56 -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
3dfc725101 Move toggleSixense out of #if HAVE_SIXENSE 2015-01-18 20:37:30 -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
Atlante45
9b442cbe7a Previous script location uses new settings 2015-01-18 18:34:37 -08:00
Atlante45
6bcf49c4e6 Running Script use new Settings 2015-01-18 18:30:43 -08:00
Atlante45
6bda5de5e5 Move (re)storeSizeAndGeometry out of Application 
Moved to MainWindow
 2015-01-18 18:24:44 -08:00
Atlante45
5266ae5397 firstRun uses new Settings 2015-01-18 18:24:28 -08:00
Atlante45
293f2f7f01 Fix broken slot connection 2015-01-18 18:07:33 -08:00
Andrzej Kapolka
a9f7533477 Set/erase brushes. 2015-01-18 16:20:55 -08:00
Andrzej Kapolka
52641bd20f Fix for buffer crash. 2015-01-18 15:17:45 -08:00
Atlante45
e006ae34f7 Removed headers in Menu.cpp 
Replaced with qApp in Menu
 2015-01-18 07:31:47 -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
e7a2b0296b Removed Menu::bumpSettings() 2015-01-18 06:57:59 -08:00
Atlante45
0e40a61eaa Removed unused method 2015-01-18 06:53:06 -08:00
Atlante45
8933da7bc7 Moved SpeechRecognizer out of Menu 
Added it in the DM
 2015-01-18 06:50:34 -08:00
Atlante45
7f702d3bff Removed loadRSSDKFile() from Menu 2015-01-18 06:31:55 -08:00
Atlante45
9e3b4c6834 Remove unused variable 2015-01-18 06:26:58 -08:00
Atlante45
3bce8204da Moved toggleSixense out of Menu 
Moved into SixenseManager
 2015-01-18 06:25:27 -08:00
Atlante45
8a827dbb3e Remove unneeded sendFakeEnterEvent() 2015-01-18 06:18:41 -08:00
Atlante45
17e0b0b551 Remove unused wallet private key for now 2015-01-18 06:16:57 -08:00
Atlante45
180de82e52 Remove warning 2015-01-18 06:16:53 -08:00
Atlante45
5930e06849 Moved Snapshot location out of Menu 
Moved into Snapshot
 2015-01-18 06:02:03 -08:00
Atlante45
488d8a03d5 Moved getShadowEnabled out of Menu 
Moved to Application
 2015-01-18 05:52:19 -08:00
Atlante45
df69466887 Moved copyPath/Address out of Menu 
Moved into AddressManager
 2015-01-18 05:48:14 -08:00
Atlante45
d313c23871 Fixed unused variable warning 2015-01-18 05:41:05 -08:00
Atlante45
fdce0baee9 Removed vsync slot from menu 2015-01-18 05:39:53 -08:00
Atlante45
bac448af5d Mute mute slot out of Menu 2015-01-18 05:29:25 -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
Andrzej Kapolka
27255fbb4a Hermite display fix. 2015-01-18 01:04:45 -08:00
Andrzej Kapolka
393d537c16 Edge fix. 2015-01-18 00:26:43 -08:00
Andrzej Kapolka
61cbafadd4 More corner cases. 2015-01-18 00:18:35 -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
b743a51fa0 Moved SixenseManager header from Menu .h to .cpp 2015-01-17 22:14:48 -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
9edb3e84cb Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2015-01-17 20:17:49 -08:00
Andrzej Kapolka
5bb441b6ef Added a "voxelize" brush for debugging. 2015-01-17 20:17:28 -08:00
Atlante45
2eff7867b5 Remove LODManager::load/saveSettings() for now 2015-01-17 20:09:48 -08:00
Atlante45
229791a9f2 Move Oculus UI ratio to ApplicationOverlay 2015-01-17 19:45:48 -08:00
Atlante45
8175b4bb44 Remove unused getter/setter 2015-01-17 18:23:43 -08:00
Atlante45
10ec36874f Remove Menu deprecated members 2015-01-17 17:59:24 -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
Atlante45
f34add9c9c Moved Bookmarks related funct out of Menu 
Took everything Bookmarks related in Menu and moved it over to
Bookmarks.
 2015-01-16 16:30:33 -08:00
Ryan Huffman
ba752040dd Update WebWindow to redefine EventBridge after refresh 2015-01-16 16:24:19 -08:00
Andrzej Kapolka
2497b2fe39 If there's no directly intersecting spanner, find the closest heightfield that 
we can project onto.
 2015-01-16 15:41:08 -08:00
Atlante45
8996bf8e0d Use qApp 
Reuse qApp global variable following Qt's pattern
 2015-01-16 15:26:42 -08:00
Atlante45
0041d489cc Move stuf around in Menu for easier cleanup 2015-01-16 14:37:38 -08:00
Andrew Meadows
d5119b3532 merge upstream/master into andrew/bispinor 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/physics/src/EntityMotionState.h
	libraries/physics/src/ObjectMotionState.cpp
	libraries/physics/src/PhysicsEngine.cpp
	libraries/physics/src/PhysicsEngine.h
 2015-01-16 14:36:27 -08:00
Andrzej Kapolka
45b36b383c More progress on stitching, etc. 2015-01-16 14:32:15 -08:00
Brad Hefta-Gaub
81cd3e9e7f Merge pull request #4127 from birarda/master 
put user location without curly braces
 2015-01-16 13:35:09 -08:00
Philip Rosedale
1ff90bec5d Merge pull request #4124 from AndrewMeadows/inertia 
support for simple kinematic motion
 2015-01-16 13:33:44 -08:00
Stephen Birarda
9c1196a2a6 put user location without curly braces 2015-01-16 12:08:56 -08:00
Andrzej Kapolka
b6c843497d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2015-01-16 11:56:04 -08:00
Sam Gateau
bb362b748f Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-01-16 09:39:23 -08:00
Sam Gateau
d1fb071208 Adding ambient sphere in the lighting equation and menu to control te presets 2015-01-16 09:38:53 -08:00
Andrzej Kapolka
f81c117ae5 Stitching progress. 2015-01-15 17:59:55 -08:00
Andrew Meadows
3fed38793e merge andrew/origin/inertia to andrew/local/inertia 2015-01-15 17:55:51 -08:00
Andrew Meadows
250fd98fee support for simple kinematic motion 2015-01-15 17:51:01 -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
Clément Brisset
400f98b11d Merge pull request #4118 from birarda/master 
migrate to new places API
 2015-01-15 15:05:26 -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
Thijs Wenker
12136e5305 cursor follows look at rotation now 2015-01-15 22:25:59 +01:00
Stephen Birarda
93c3b2fb74 repairs for new DependencyManager format 2015-01-15 13:14:26 -08:00
Stephen Birarda
e538669343 resolve conflicts on merge with upstream 2015-01-15 13:12:05 -08:00
David Rowe
5195ae2424 Merge branch 'master' into 20269 2015-01-15 11:01:17 -08:00
David Rowe
91e321565a Change menu item text 2015-01-15 10:38:17 -08:00
Philip Rosedale
048d190350 Merge pull request #4108 from ctrlaltdavid/20263 
CR for Job #20263 - Create a "Bookmarks" capability
 2015-01-15 10:30:41 -08:00
Andrew Meadows
ff171a5782 Bullet is now required dependency 2015-01-15 10:27:43 -08:00
Philip Rosedale
67c3f9a3db Merge pull request #4107 from huffman/fix-update-my-avatar 
Fix issue with avatar data being sent too often
 2015-01-15 10:22:18 -08:00
David Rowe
52876ecb16 Fix merge 2015-01-15 10:07:51 -08:00
David Rowe
95efe9857b Merge branch 'master' into 20263 2015-01-15 09:52:19 -08:00
Ryan Huffman
00487fb175 Fix issue with avatar data being sent too often 2015-01-15 09:45:51 -08:00
David Rowe
544d412122 Add menu items that copy location address and location path 
And Rename File > Go to File > Location
 2015-01-15 09:33:35 -08:00
David Rowe
ebe80075dc Tidy 2015-01-14 23:20:47 -08:00
David Rowe
426cd71fc6 Persist bookmarks to file 2015-01-14 22:58:13 -08:00
David Rowe
d9bd7f019f Simplify bookmark handling 2015-01-14 22:20:45 -08:00
David Rowe
1ffe22d5e9 Sanitize bookmark names 2015-01-14 18:31:54 -08:00
Stephen Birarda
79d214619d update lobby for new places API 2015-01-14 18:18:26 -08:00
David Rowe
da58d5a381 Delete Bookmark menu item and dialog box 2015-01-14 18:15:39 -08:00
Thijs Wenker
8ffea45736 QFileDialog include 2015-01-15 02:59:37 +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
Thijs Wenker
80a81043ed Merge branch 'master' of https://github.com/highfidelity/hifi into 20216 
Conflicts:
	interface/src/Menu.cpp
 2015-01-15 02:28:31 +01:00
Stephen Birarda
ef87b59a0c remove method declarations for location changes 2015-01-14 17:02:18 -08:00
Stephen Birarda
69869a696b remove name this location call from application 2015-01-14 17:00:21 -08:00
Stephen Birarda
e5fe24e088 remove My Locations and Name This Location 2015-01-14 16:58:15 -08:00
Stephen Birarda
f745dfdb91 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-01-14 16:54:51 -08:00
ZappoMan
2f549c776c Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-14 14:41:51 -08:00
David Rowe
a78ab5a5b3 Teleport to selected bookmark 2015-01-14 10:14:56 -08:00
Thijs Wenker
2611e2f364 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-14 15:40:46 +01:00
David Rowe
01f7efe767 Remove ellipsis from Collide With menu item 
Noticed in passing.
 2015-01-13 22:48:05 -08:00
David Rowe
fa6faa771a Add bookmarks with Bookmark Location menu item 
The menu of bookmarks is kept sorted.
 2015-01-13 22:39:16 -08:00
Atlante45
48f1cbe644 Fixed QSharedPointer in connect() 2015-01-13 20:54:15 -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
Atlante45
38729c5790 Made dependencies inherit from Dependency 2015-01-13 20:38:01 -08:00
Atlante45
36db547c0f Setup DependencyManager before any member of Application 2015-01-13 20:35:45 -08:00
David Rowe
7130c579f5 First pass at Bookmarks class 
In-memory for starters.
 2015-01-13 18:47:59 -08:00
Clément Brisset
3034b8f733 Merge pull request #4091 from ctrlaltdavid/20229 
CR for Job #20229 - Expose the downloads section for models and metavoxels to javascript
 2015-01-13 17:07:17 -08:00
Clément Brisset
5635ac3d7b Merge pull request #4090 from ctrlaltdavid/no-show-voxel-nodes 
Remove menu item for Show Voxel Nodes which is no longer available
 2015-01-13 17:06:58 -08:00
Clément Brisset
aff0554a62 Merge pull request #4079 from thoys/fix-GetVersionEx-deprication-warnings 
[WINDOWS ONLY] replaced GetVersionEx with new Version helpers to resolve deprecation warnings.
 2015-01-13 17:06:26 -08:00
ZappoMan
1b0a5c881b Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-13 16:14:29 -08:00
Stephen Birarda
6d2c87c7a3 put current domain hostname if no place name present 2015-01-13 15:15:39 -08:00
Stephen Birarda
6e1ba17c6e handle application title change for place name change 2015-01-13 15:07:45 -08:00
Thijs Wenker
0f6ad4eba0 HMD.VRMode -> HMD.active , and hooked it to a function which isn't dependent on HMD type, since there will be more HMD's than Oculus supported in the near future. 2015-01-14 00:07:15 +01:00
Stephen Birarda
92b8cd2d1e handle storage of user location in new format 2015-01-13 15:02:04 -08:00
Thijs Wenker
ca4d493ec9 added HMD.VRMode to HMDScriptingInterface 2015-01-14 00:01:50 +01:00
Stephen Birarda
16261a5fc1 more updates for new place/location APIs 2015-01-13 14:49:24 -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
9ce405a744 Text3DOverlay forward definition 2015-01-12 17:46:38 -08:00
Atlante45
7d39b45f16 Hopefully fixes the windows compile error 2015-01-12 17:34:07 -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
Clément Brisset
60aafba0ce Merge pull request #4077 from huffman/fix-render-hud-windows-linux 
Fix gl projection matrix stack overflow when rendering to HUD
 2015-01-12 16:22:09 -08:00
Clément Brisset
10331c52a8 Merge pull request #4094 from birarda/master 
repairs to AudioScriptingInterface playSound
 2015-01-12 16:18:41 -08:00
Thijs Wenker
8c7099a0bb changed "Load Scripts" label to be better understandable 2015-01-13 01:09:28 +01:00
Stephen Birarda
661221a189 repairs to AudioScriptingInterface playSound 2015-01-12 16:04:00 -08:00
Atlante45
ea3626d87f Merge branch 'master' of https://github.com/highfidelity/hifi into body_not_rotating 2015-01-12 16:03:32 -08:00
Atlante45
934d8d58ef Move some constants out of Menu class files 2015-01-12 16:03:15 -08:00
Atlante45
e30b119464 Some simple code cleanup 2015-01-12 15:55:25 -08:00
Thijs Wenker
336a96bd48 Merge branch 'master' of https://github.com/worklist/hifi into 20255 2015-01-13 00:44:39 +01: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
7bf57b3cca Removed unecessary method/cleanup header 2015-01-12 14:53:31 -08:00
Atlante45
e62fbe2557 Cleanup some headers 2015-01-12 14:09:26 -08:00
Atlante45
fd2b0edf7a Alphabetical order 2015-01-12 14:01:56 -08:00
Atlante45
894c4c9d59 All dialogs in Menu are QPointers 2015-01-12 14:00:23 -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
Andrzej Kapolka
cad8313e56 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2015-01-12 12:00:20 -08:00
David Rowe
022760be1d Remove menu item for Show Voxel Nodes which is no longer available 
And change Show Entity Nodes shortcut from Ctrl-Shift-2 to Ctrl-Shift-1.
 2015-01-12 11:52:51 -08:00
Atlante45
98dd401ea3 Remove duplicate definition 2015-01-12 11:12:19 -08:00
Stephen Birarda
d30490c760 resolve conflicts on merge with upstream master 2015-01-12 09:25:37 -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
David Rowe
968a34f966 Add instructions for building with SDL2 2015-01-11 11:44:16 -08:00
Andrzej Kapolka
d002359989 Stitching improvement. 2015-01-09 16:43:51 -08:00
Thijs Wenker
1d6066c837 replaced GetVersionEx with new Version helpers to resolve deprecation warnings. 2015-01-10 01:41:07 +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
Atlante45
05d2887c94 Move Torso twist to HeadData with Lean 2015-01-09 11:15:01 -08:00
ZappoMan
925b13cc93 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-09 09:19:53 -08:00
Philip Rosedale
285e588266 Merge pull request #4072 from Atlante45/network_replies_cleanup 
Windows crash fix
 2015-01-09 07:42:36 -08:00
Atlante45
891d8d5abf Removed unecessary foreach 2015-01-08 18:22:25 -08:00
Atlante45
1c4903c346 Merge branch 'master' of https://github.com/highfidelity/hifi into head_rotation_fix 2015-01-08 16:33:01 -08:00
ZappoMan
a03c2b79fa first cut at adding colors to GeometryCache and supporting batch internally 2015-01-08 15:52:33 -08:00
Andrzej Kapolka
c99e2c3ec6 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
 2015-01-08 14:57:03 -08:00
Andrzej Kapolka
8b2baf65e8 Color/material fix. 2015-01-08 14:13:23 -08:00
Andrzej Kapolka
ec32739689 CSG improvements. 2015-01-08 12:52:52 -08:00
Atlante45
e73f8baf93 Merge branch 'master' of https://github.com/highfidelity/hifi into head_rotation_fix 2015-01-08 11:54:54 -08:00
Atlante45
4157a3ca40 Remove lean from head rotation 2015-01-08 11:33:14 -08:00
David Rowe
198226450a Suppress warnings about inconsistent DLL linkage of lrintf in Windows 
This warning in Windows builds is due to redefinition of lrintf in gverb
library's ladspa-util.h file.
 2015-01-08 11:26:32 -08:00
Atlante45
0bae05b924 Remove chat message 2015-01-08 11:25:53 -08:00
Andrew Meadows
25b9b50468 Merge pull request #4065 from ZappoMan/voxelEctomy 
fix some warnings and remove more references to voxels
 2015-01-08 08:07:06 -08:00
Andrzej Kapolka
4c3163fae8 Closer to working stitching. 2015-01-07 17:24:26 -08:00
Philip Rosedale
a04ce68fba Merge pull request #4063 from ZappoMan/restoreLookAt 
restore camera lookAt and keepLookingAt features
 2015-01-07 16:31:07 -08:00
ZappoMan
cc19c15c17 remove more references to voxels 2015-01-07 16:09:56 -08:00
ZappoMan
91351d7700 fix warnings 2015-01-07 16:09:26 -08:00
ZappoMan
806e691bbf restore camera lookAt and keepLookingAt features 2015-01-07 13:41:07 -08:00
Thijs Wenker
2690241eb6 fix to add GLEW debug library 2015-01-07 22:08:01 +01:00
Brad Hefta-Gaub
ddea2c4a68 Merge pull request #4058 from huffman/entity-tool-updates 
Entity tool updates
 2015-01-07 12:42:47 -08:00
Ryan Huffman
b471c1fa71 Update hotkey for audio stats 2015-01-07 12:15:53 -08:00
David Rowe
6c4932f9d0 Coding standard 2015-01-07 11:24:10 -08:00
David Rowe
40274df279 Add downloads information changed event for JavaScript 2015-01-07 11:20:46 -08:00
Andrzej Kapolka
1abf111d7f Index fix. 2015-01-07 11:19:40 -08:00
Brad Hefta-Gaub
8ad21d61c4 Merge pull request #4056 from huffman/audio-buffer-starvation-detection 
Audio buffer starvation detection
 2015-01-07 11:18:34 -08:00
Ryan Huffman
50fcf4ba8f Remove output buffer starvation log warnings 2015-01-07 11:06:36 -08:00