Commit graph

61504 commits

Author SHA1 Message Date
Ryan Downe Karpf
c255e29fa5
Merge pull request #11828 from luiscuenca/pr-for-rc-59
Fix not restoring animations after changing view modes RC59
2017-11-16 14:19:12 -08:00
John Conklin II
d4afd7fa0d
Merge pull request #11827 from jherico/bug/fb9107_rc59
Fix for black screen on HMDs on startup
2017-11-16 11:22:37 -08:00
Brad Davis
0755e4aa21 Fix for black screen on HMD derived display plugins 2017-11-16 08:55:10 -08:00
luiscuenca
9f9c1e2d97 9267 Fix not restoring animations after changing view modes 2017-11-15 18:17:10 -07:00
John Conklin II
21503a635f
Merge pull request #11811 from birarda/feat/entity-server-flap
Hold entity data until client is presumably reachable and has queried
2017-11-15 16:16:50 -08:00
Stephen Birarda
557ee458ec wait for node active socket before constructing packets 2017-11-14 17:08:01 -08:00
Stephen Birarda
05a38a78c5 don't send octree data without first query 2017-11-14 14:08:27 -08:00
John Conklin II
49abb441e6
Merge pull request #11807 from Atlante45/case8495
RC-59 patch - Disable mirror camera in HMD mode
2017-11-14 13:06:47 -08:00
luiscuenca
7af1a5ca69 clean up unused lastmode 2017-11-13 16:04:03 -08:00
luiscuenca
5d4a3b65e4 Allow script to change to mirror camera in HMD 2017-11-13 16:04:03 -08:00
luiscuenca
8596d78aa6 Not posible to change to mirror mode using js 2017-11-13 16:04:03 -08:00
luiscuenca
d1318ae99e 8495 No mirror camera in HMD mode 2017-11-13 16:04:03 -08:00
Ryan Downe Karpf
9ff4541ee3
Merge pull request #11782 from hyperlogic/remove-vs2010-inttypes-hack
Remove hack for missing inttypes.h header on VS2010
2017-11-12 10:59:19 -08:00
Ryan Downe Karpf
f8b1c7978c
Merge pull request #11772 from 1P-Cusack/FogBugz/Case_6569
[Case 6569]: Silent failure is possible during Model Creation
2017-11-12 08:36:10 -08:00
Ken Cooke
89dbbb44ed
Merge pull request #11780 from kencooke/audio-codec-update
Audio codec update for all platforms (includes Android)
2017-11-11 11:33:33 -08:00
Sam Gateau
ecf67cc331
Merge pull request #11650 from Zvork/outline
Multiple Outline Groups
2017-11-10 15:45:03 -08:00
Andrew Meadows
469b68011c
Merge pull request #11566 from hyperlogic/bug-fix/div-by-zero
div by zero fixes, detected by address sanitizer
2017-11-10 13:47:40 -08:00
Sam Gateau
f857b37d2e
Merge pull request #11758 from NissimHadar/hazeUIFix
Improved Haze UI in Create menu
2017-11-10 11:58:06 -08:00
Anthony Thibault
08c12a1ced
Merge pull request #11704 from AndrewMeadows/shape-manager-key
cleanup ShapeInfo hash generation
2017-11-10 11:31:46 -08:00
Melissa Brown
f7eb57a54c
Merge pull request #11653 from vladest/fix_sriptslog_multiply_window
Fix scriptslog multiply window
2017-11-10 11:11:46 -08:00
Anthony J. Thibault
ba4c0f189e code review feedback
removed discontinuity in safeDeltaTime, which is used to prevent division by zero.
2017-11-10 10:25:29 -08:00
Anthony J. Thibault
4169e11e77 Merge branch 'master' into bug-fix/div-by-zero 2017-11-10 10:15:26 -08:00
Sam Gondelman
9010a02bee
Merge pull request #11790 from SamGondelman/overlayFlash
Fix laser end not disappearing
2017-11-09 17:10:07 -08:00
Anthony Thibault
38cc56db7f
Merge pull request #11785 from luiscuenca/case6944
6944 Avatar scale is preserved across domains
2017-11-09 16:38:45 -08:00
SamGondelman
9188ae9fb5 fix laser end not disappearing 2017-11-09 16:26:37 -08:00
luiscuenca
355b465109 make leaveDomain slot private 2017-11-09 16:05:53 -07:00
Anthony Thibault
de9eeff7d2
Merge pull request #11783 from hyperlogic/bug-fix/rig-skeleton-dangling-pointer
Fix for address sanitizer warning
2017-11-09 14:19:03 -08:00
David Kelly
31dc140ea6
Merge pull request #11771 from zfox23/commerce_seedingFrontend
Commerce: Seeding Frontend
2017-11-09 14:45:10 -07:00
Ken Cooke
c324f342b4 Fix to check ANDROID before UNIX 2017-11-09 13:39:13 -08:00
Sam Gondelman
d1e41e6bf0
Merge pull request #11786 from SamGondelman/overlayFlash
Fix overlay flash on visibility and position change
2017-11-09 13:36:49 -08:00
SamGondelman
224386317d send overlay visibility through transaction 2017-11-09 12:14:40 -08:00
luiscuenca
10f484c668 6944 Avatar scale is saved across domains 2017-11-09 12:21:23 -07:00
Anthony J. Thibault
9724a5e5b8 Fix for address sanitizer warning
This fixes a potential null pointer dereference.
2017-11-09 10:53:36 -08:00
Ken Cooke
9a1386bf0d Fix build errors on Linux 2017-11-09 10:34:52 -08:00
Anthony J. Thibault
5507bcea3c Remove hack for missing inttypes.h header on VS2010 2017-11-09 10:34:01 -08:00
Olivier Prat
4f7ed38e98 Fixed potential link errors on Mac 2017-11-09 11:26:08 +01:00
Ken Cooke
6d019b4302 Update the audio codecs 2017-11-08 18:16:42 -08:00
Clément Brisset
40baca6ee1
Merge pull request #11756 from ctrlaltdavid/21592
Fix import from URL adding multiple copies of imported entities
2017-11-08 18:01:48 -08:00
Clément Brisset
57202126ae
Merge pull request #11766 from ctrlaltdavid/21595
Label models.json.gz paths in server Content tab with operating system
2017-11-08 18:00:06 -08:00
Elisa Lupin-Jimenez
1e526605ba
Merge pull request #11778 from elisa-lj11/blocks
Fixed Blocks downloads (now Google Poly)
2017-11-08 17:53:26 -08:00
Zach Fox
19b7c6e025 Remove machine fingerprint from receiveAt 2017-11-08 17:15:27 -08:00
Seth Alves
b9652dd114
Merge pull request #11775 from misslivirose/feat/emit-scale-change
add skeleton scale change signal so scripts can detect scaling change
2017-11-08 16:57:52 -08:00
Nissim Hadar
7cb9514feb Converted 'Glare Angle' control to a slider. 2017-11-08 16:50:44 -08:00
Nissim Hadar
5a56ea5894 Merge branch 'master' into hazeUIFix 2017-11-08 16:44:59 -08:00
Nissim Hadar
5c7ebc0af3 Converted 'Glare Angle' control to a slider. 2017-11-08 16:44:05 -08:00
Zach Fox
72ba892dbd
Merge pull request #11777 from zfox23/commerce_injectionTempFix
Revert 11728 and fix marketplace JS injection - should revisit
2017-11-08 16:37:57 -08:00
Nissim Hadar
2920c6f9a9 Merge branch 'master' into hazeUIFix 2017-11-08 15:42:20 -08:00
Nissim Hadar
c1b5d00993 Converted 'Background Blend' control to a slider. 2017-11-08 15:41:24 -08:00
LaShonda Hopper
0e90c92cf5 [Case 6569] Minor: Break up line to pass column count guidelines.
Changes Committed:
    modified:   interface/resources/qml/hifi/tablet/NewModelDialog.qml
2017-11-08 18:35:12 -05:00
LaShonda Hopper
a057cb914f [Case 6569] Fixes clipping of cancel button by window edge.
Changes Committed:
    modified:   interface/resources/qml/hifi/tablet/NewModelDialog.qml
2017-11-08 18:27:25 -05:00