Seth Alves
79b5882c73
quiet compiler when building with clang on Linux
2018-05-15 11:00:08 -07:00
Seth Alves
78a8e8e500
quiet asan warning
2018-05-15 11:00:08 -07:00
Seth Alves
24404afe26
Merge pull request #13115 from sethalves/fix-autoAdjustLOD-asan
...
fix divide-by-zero asan warning in LODManager::autoAdjustLOD
2018-05-15 10:58:00 -07:00
Seth Alves
6da59d15e5
Merge pull request #13167 from dback2/lowercaseUnequip
...
Desktop equip: fix unequipping with capital U
2018-05-15 10:55:19 -07:00
John Conklin II
574a52fdbe
Merge pull request #13154 from NissimHadar/perfTest_1
...
Added method to test namespace to save JSON object to a file.
2018-05-15 10:30:34 -07:00
John Conklin II
e9cb46a2a5
Merge pull request #13169 from hyperlogic/bug-fix/remove-unused-menu-item
...
OpenVR: Remove reference to HMD Standing Mode menu item
2018-05-15 10:30:00 -07:00
John Conklin II
a76be78386
Merge pull request #13163 from sethalves/fix-near-grab-to-hips
...
fix near-grab attaching entity to hips
2018-05-15 10:28:36 -07:00
Howard Stearns
39ccfc86ef
Merge pull request #13168 from zfox23/MS_15090
...
MS15090: Fix gifting when running marketplaces.js separately
2018-05-15 10:12:29 -07:00
NissimHadar
d4d2f3c957
Moved ownership of test location into the Test Scripting class.
2018-05-14 16:32:04 -07:00
NissimHadar
8e3844a235
Merge branch 'master' of github.com:highfidelity/hifi into perfTest_1
2018-05-14 16:23:36 -07:00
Zach Fox
e15a800639
Merge pull request #13166 from zfox23/showInvalidItemsInPurchases
...
Show invalidated items in My Purchases
2018-05-14 15:42:29 -07:00
Howard Stearns
d7121265d0
Merge pull request #13150 from howard-stearns/fix-lastEdited-vs-pal
...
fix lastEdited vs pal
2018-05-14 15:12:07 -07:00
Anthony J. Thibault
ed726c9d77
OpenVR: Remove reference to HMD Standing Mode menu item
...
This menu item has not existed for over a year.
I was sometimes seeing a crash on startup when the display plugin
attempted to reference this menu item.
2018-05-14 13:51:13 -07:00
John Conklin II
c57b0a957d
Merge pull request #13138 from AndrewMeadows/avoid-div-by-zero
...
avoid div by zero when measuring RigidBody effective acceleration
2018-05-14 13:41:08 -07:00
Zach Fox
83cae54601
Show 'invalidated' label for valid = false
2018-05-14 13:34:20 -07:00
Zach Fox
fbec285923
Merge branch 'master' of github.com:highfidelity/hifi into showInvalidItemsInPurchases
2018-05-14 13:17:46 -07:00
Zach Fox
a881d07e59
MS15090: Fix gifting when running marketplaces.js separately
2018-05-14 13:12:58 -07:00
Sam Gateau
aa75af5ca4
Merge pull request #12814 from Zvork/shadow
...
Shadow bug fix : incorrect shadow map far plane when casting shadow on non-'shadow casters'
2018-05-14 13:00:15 -07:00
David Back
ac78e14585
fix unequipping with capital U
2018-05-14 11:44:25 -07:00
NissimHadar
b5096758fb
Merge branch 'master' of github.com:highfidelity/hifi into perfTest_1
2018-05-14 10:44:57 -07:00
Sam Gateau
d57ddbd3bf
Merge pull request #13139 from NissimHadar/missingImagesMDfiles
...
Autotester: Now remembers the previous folder.
2018-05-14 10:40:00 -07:00
NissimHadar
5f219e27f7
Merge branch 'master' of github.com:highfidelity/hifi into perfTest_1
2018-05-14 10:35:48 -07:00
Zach Fox
2a1c2ba7b1
PurchasedItem logic
2018-05-14 09:54:05 -07:00
Zach Fox
81ebb681bb
Show invalidated items in My Purchases
2018-05-14 09:35:34 -07:00
NissimHadar
a9a783588b
Fixed typo.
2018-05-14 09:25:17 -07:00
NissimHadar
e69871f499
Merge branch 'master' of github.com:highfidelity/hifi into missingImagesMDfiles
2018-05-14 09:23:38 -07:00
Seth Alves
898dec29cb
don't cache value of getControllerJointIndex at startup, because the script may run before the data is available. Instead, refresh the data every few seconds
2018-05-11 17:07:51 -07:00
MiladNazeri
ea26512793
Merge pull request #13147 from ctrlaltdavid/21872-a
...
Fix JSDoc function definitions specifying properties instead of params
2018-05-11 16:20:06 -07:00
Seth Alves
ca56449c1d
Merge pull request #13159 from sethalves/fix-action-assert
...
don't assert when unserializing a 'spring' action
2018-05-11 15:15:51 -07:00
Seth Alves
85a6e2555f
don't assert when unserializing a 'spring' action
2018-05-11 13:55:29 -07:00
Stephen Birarda
4f7ce7345d
Merge pull request #13045 from SimonWalton-HiFi/domain-checkins-tweak
...
Reset pending domain check-in count more frequently
2018-05-11 13:31:03 -07:00
Seth Alves
c624528f72
Merge pull request #13157 from druiz17/fix-qml-crash
...
fix qml crash on start up
2018-05-11 11:38:12 -07:00
John Conklin II
5cd225e4de
Merge pull request #12947 from jherico/feature/splash2
...
Additional work on splash screen
2018-05-11 11:26:37 -07:00
Dante Ruiz
4eba727849
fix qml crash on start up
2018-05-11 10:47:41 -07:00
Zach Fox
a6dd95e31b
Merge pull request #13146 from sethalves/fix-logging-less-when-verbose
...
don't enable so much logging when 'verbose logging' is turned on
2018-05-11 10:44:48 -07:00
Dante Ruiz
9e9852d67b
Merge pull request #12989 from Triplelexx/21774_file_browser
...
Worklist #21774 : Fix Windows.browseAssets() bugs
2018-05-11 08:50:17 -07:00
NissimHadar
39e5b578f8
Merge branch 'master' of github.com:highfidelity/hifi into perfTest_1
2018-05-10 18:08:18 -07:00
NissimHadar
1364f4391d
Can store JSON object.
2018-05-10 18:02:44 -07:00
John Conklin II
4129664368
Merge pull request #13145 from highfidelity/stable
...
Merge RC67 stable into master
2018-05-10 17:07:20 -07:00
NissimHadar
480fa912ba
Merge branch 'master' of github.com:highfidelity/hifi into perfTest_1
2018-05-10 17:05:59 -07:00
howard-stearns
bf26aec260
untabify
2018-05-10 16:39:56 -07:00
howard-stearns
50a53a5174
fix lastEdited vs pal
2018-05-10 16:00:01 -07:00
Seth Alves
826c427e2a
trying to sort-out audio-stream logging
2018-05-10 15:42:59 -07:00
David Rowe
fab85c3f6d
Fix JSDoc function definitions specifying properties instead of params
2018-05-11 09:52:48 +12:00
Seth Alves
32d10641dc
don't enable so much logging when 'verbose logging' is turned on
2018-05-10 14:41:54 -07:00
John Conklin II
bc9e403ab9
Merge pull request #13005 from SimonWalton-HiFi/hmac-auth2
...
Use HMAC authentication for network packets - 2nd attempt
2018-05-10 14:38:18 -07:00
John Conklin II
64d3219ee1
Merge pull request #12746 from gcalero/fix_radar_zoom_in
...
Android: Fix zoom in unresponsive in radar mode
2018-05-10 13:14:52 -07:00
Sam Gateau
fd9669b42d
Merge pull request #13125 from jherico/feature/testing
...
Working on improved unit testing, adding texture transfer testing
2018-05-10 12:29:43 -07:00
Triplelexx
a061e84ad7
remove unused commented code
2018-05-10 19:40:02 +01:00
Brad Davis
cb336bdeab
Fix linux build problems
2018-05-10 10:55:50 -07:00
