Commit graph

69926 commits

Author SHA1 Message Date
Cristian Luis Duarte
f9baeaf151 Android - logs during startup - weirdly did not get stuck during tests 2018-07-16 12:28:44 -03:00
John Conklin II
8669b529dc
Merge pull request #13592 from luiscuenca/blueScreenFix
Fix blue screen in VR mode due to NaN values
2018-07-13 09:12:47 -07:00
Ken Cooke
91f74aeb0a
Merge pull request #13586 from Atlante45/feat/stereo-interface
Remove AudioScriptingInterface.setStereoInput’s return value
2018-07-13 06:46:45 -07:00
Seth Alves
5085112722
Merge pull request #13594 from ctrlaltdavid/21677-a
Remove deprecated Window.raiseMainWindow API function
2018-07-12 19:48:33 -07:00
luiscuenca
45f8ed010c formatting 2018-07-12 16:03:15 -07:00
John Conklin II
6e3bede7d0
Merge pull request #13595 from NissimHadar/bug16595
Fix for "PAL orbs are no longer visible through tablet/toolbar and objects in world"
2018-07-12 16:01:01 -07:00
Sam Gondelman
b53772f9ca
Merge pull request #13431 from Cristo86/android_stop_downloads_bg
Android - Prevent pending downloads to happen when going back to home
2018-07-12 15:22:56 -07:00
luiscuenca
1ab6c7a8ac Proper fix 2018-07-12 14:00:55 -07:00
Sam Gondelman
2597568a0a
Merge pull request #13591 from Cristo86/android_revert_pr12888_qmls
Rollback PR 12888 by deleting alternative +android files
2018-07-12 12:06:35 -07:00
Zach Fox
f57fe892c3
Merge pull request #13590 from zfox23/MS16615_openFromPurchases
Fix MS16615: Don't early-remove .app.json we JUST installed
2018-07-12 11:51:52 -07:00
NissimHadar
7b56cfbeae Clear the frame buffer in all cases. 2018-07-12 11:40:53 -07:00
John Conklin II
a8c2f9c861
Merge pull request #13585 from thoys/fix/animationFPSChanging
MS14979: Fix Animation FPS changeability
2018-07-12 11:23:54 -07:00
John Conklin II
b59e9f9899
Merge pull request #13582 from Zvork/scale
Render Scale Resolution applied only to 3D rendering not HUD
2018-07-12 10:56:03 -07:00
John Conklin II
d1280bc464
Merge pull request #13572 from Zvork/fade
Repair Transition effect
2018-07-12 10:54:20 -07:00
John Conklin II
7ea46e26cf
Merge pull request #13587 from wayne-chen/updateControlsReference-case-9539
MS9539: Update Controls Reference pages
2018-07-12 10:53:00 -07:00
John Conklin II
de33ca512f
Merge pull request #13553 from Atlante45/feat/crashpad-mac
Add Crashpad to Mac
2018-07-11 19:16:24 -07:00
David Rowe
46c9853152 Remove deprecated Window.raiseMainWindow API function 2018-07-12 14:04:08 +12:00
luiscuenca
ced4e1e0e0 Fix blue screen after player step returns NaN values 2018-07-11 18:02:19 -07:00
Cristian Luis Duarte
b1d39e4959 Rollback PR 12888 by deleting alternative +android files 2018-07-11 21:21:12 -03:00
Zach Fox
bf4954d667 Fix MS16615: Don't early-remove .app.json we JUST installed 2018-07-11 15:27:43 -07:00
Zach Fox
b036c7f437
Merge pull request #13584 from zfox23/MS14743_anotherSnappyBandaid
MS14743 again: More bandaids for preventing Snappy printouts from falling thru floor
2018-07-11 14:08:13 -07:00
Sam Gondelman
1a599fd818
Merge pull request #13486 from jherico/fix/android_qt_5_10_linux
Move Android builds to Qt 5.11.1
2018-07-11 12:25:37 -07:00
Wayne Chen
cea2b94d2b removing debug print statements 2018-07-11 11:58:17 -07:00
Wayne Chen
179ba6506e Adding check for WindowsMR to the showHelp menu 2018-07-11 11:56:14 -07:00
Clement
e5206a94a8 Revert "setStereoInput always returns true to not break old scripts"
This reverts commit 2bf7db6952.
2018-07-11 11:51:06 -07:00
Wayne Chen
f7e906440f Merge branch 'master' of https://github.com/highfidelity/hifi into updateControlsReference-case-9539 2018-07-11 11:20:10 -07:00
Sam Gateau
54d2f42fa4
Merge pull request #13544 from Zvork/haze
Fix haze on Mac (bug #15515)
2018-07-11 20:04:22 +02:00
Zach Fox
ee08ef981d Slightly increase linear damping 2018-07-11 10:44:24 -07:00
Zach Fox
b5862c0ede
Merge pull request #13583 from zfox23/specCamBumpVersion
Bump version of Spec Cam QML to 2.3
2018-07-11 10:38:59 -07:00
Seth Alves
4cf706dd96
Merge pull request #13574 from AndrewMeadows/grab-kinematic-children
more correct kinematic motion of grabbed things
2018-07-11 10:34:44 -07:00
Sam Gateau
377c072e6d
Merge pull request #13557 from Zvork/bloom
Fix Bloom on Mac and hopefully Windows AMD (bug #15434)
2018-07-11 19:29:44 +02:00
Thijs Wenker
e7345c5a27 fix changing allowTranslation / fps for entity model animation without having to change any other animation property value 2018-07-11 19:15:08 +02:00
Zach Fox
6218f80387 MS14743 again: More bandaids for preventing Snappy printouts from falling thru floor 2018-07-11 10:07:02 -07:00
Zach Fox
1a554e658d Bump version of Spec Cam QML to 2.3 2018-07-11 09:47:11 -07:00
Zach Fox
9a1ad6aba2
Merge pull request #13578 from zfox23/MS16600_dupeSpecCams
Fix MS16600: Prevent duplicate Spectator Camera models after crash
2018-07-11 09:34:54 -07:00
Zach Fox
9729457222
Merge pull request #13563 from zfox23/MS16480_disableOverlays
Fix MS16480: Disable active ContextOverlays when disabling ContextOverlayInterface
2018-07-11 08:50:35 -07:00
Olivier Prat
22420dbf78 Fixed render resolution scale with TAA 2018-07-11 12:28:46 +02:00
Olivier Prat
703fc20856 Separate scale between 3D rendering and HUD 2018-07-11 12:17:36 +02:00
Olivier Prat
9f4fd47b85 Not using render resolution scale in application and display plugin 2018-07-11 10:11:49 +02:00
Clement
85f56e2aa7 Remove Mac domain exception 2018-07-10 17:41:07 -07:00
Wayne Chen
81aac274ed Updating controls reference page 2018-07-10 17:34:03 -07:00
Clement
b5252da3f2 CR 2018-07-10 16:53:11 -07:00
Zach Fox
2fad55e5d0 Prevent PAL from re-enabling ContextOverlayInterface when it's not supposed to 2018-07-10 15:56:13 -07:00
Zach Fox
d3c0236602 Merge branch 'master' of github.com:highfidelity/hifi into MS16480_disableOverlays 2018-07-10 15:02:05 -07:00
Zach Fox
b573b16df8 Fix MS16600: Prevent duplicate Spectator Camera models after crash 2018-07-10 14:12:21 -07:00
Howard Stearns
5cf6cc0270
Merge pull request #13575 from howard-stearns/fix-connections-count
fix PAL connections count
2018-07-10 14:58:15 -05:00
howard-stearns
8b713a437f don't store undefined in a qml int. 2018-07-10 12:14:31 -07:00
howard-stearns
886df959d1 expose totalPages and totalEntries, and use the later to display
connections count
2018-07-10 11:26:23 -07:00
Andrew Meadows
8ea18e3359 integrate active kinematic even when grabbed 2018-07-10 11:20:18 -07:00
Andrew Meadows
dd6be374fa cleanup and optimization rotational integration 2018-07-10 11:18:38 -07:00