Commit graph

67587 commits

Author SHA1 Message Date
John Conklin II
befb411f6e
Merge pull request #13025 from highfidelity/RC67
Beta Release 67 - branched at developer release 8181
2018-05-10 10:11:23 -07:00
NissimHadar
6c07f9554c Merge branch 'master' of github.com:highfidelity/hifi into perfTest_1 2018-05-10 09:13:15 -07:00
Seth Alves
4410402c7d
Merge pull request #13114 from sethalves/more-logging-suppression
more suppression of logging
2018-05-09 17:36:12 -07:00
John Conklin II
75164201d1
Merge pull request #13117 from SamGondelman/android
Test highp floats for Android
2018-05-09 14:36:51 -07:00
Simon Walton
9b6225db40 Bump default packet version 20 -> 21 2018-05-09 14:29:10 -07:00
Gabriel Calero
e0b57a2228 Code review in radar.js 2018-05-09 18:20:19 -03:00
MiladNazeri
bc03fb398f
Merge pull request #13102 from ctrlaltdavid/21856-h
Fix JSDoc for Users.requestUsernameFromID
2018-05-09 13:35:06 -07:00
Brad Davis
57691d5d66 Cache downloaded assets 2018-05-09 13:20:48 -07:00
Brad Davis
7fbad47351 Working on texture test 2018-05-09 13:20:48 -07:00
Brad Davis
1d403b4d67 Add texture transfer testing 2018-05-09 13:20:47 -07:00
Brad Davis
12ae44c14f Remove debugging pragma 2018-05-09 13:20:47 -07:00
Brad Davis
e9dc3c650b Breakup building and testing 2018-05-09 13:20:47 -07:00
Brad Davis
f206456cdd Restoring manual tests to solution, removing dead tests 2018-05-09 13:20:47 -07:00
Brad Davis
6e16109fa4 Fix unit test compile failures and crashes 2018-05-09 13:20:47 -07:00
Brad Davis
d5afb3a49b Move non-automated tests into new folder 2018-05-09 13:20:47 -07:00
John Conklin II
59b9e08f58
Merge pull request #13131 from zfox23/MS14937_CheckoutContentSetFix
MS14937: Fix Replace button for content sets during Checkout
2018-05-09 13:04:10 -07:00
Seth Alves
16e832ac08 use setFilterRules rather than specifying each logging category to suppress 2018-05-09 13:01:49 -07:00
Seth Alves
7466d08f1f more suppression of logging 2018-05-09 13:01:49 -07:00
John Conklin II
4d224af7c7
Merge pull request #13137 from sethalves/fix-serverless-sim-ownership-rc67
when in serverless mode, short-circuit simulation ownership bids
2018-05-09 12:34:42 -07:00
NissimHadar
9d52306ac5 Merge branch 'master' of github.com:highfidelity/hifi into missingImagesMDfiles 2018-05-09 12:17:17 -07:00
Andrew Meadows
b8d34f4b8f more correct variable name 2018-05-09 12:13:27 -07:00
Andrew Meadows
f454dac709 avoid div by zero when measuring acceleration 2018-05-09 12:04:44 -07:00
NissimHadar
32f2494416 Stores previous user-selected folders. 2018-05-09 11:58:16 -07:00
John Conklin II
b9656e5c72
Merge pull request #13130 from samcake/blue
Fix size calculation of compressed textures #13120
2018-05-09 11:45:10 -07:00
John Conklin II
e9ad50159c
Merge pull request #13136 from zfox23/RC67_MS14951
RC67: MS14951: Fix Snapshot hotkey sound playback
2018-05-09 11:11:33 -07:00
Howard Stearns
bf466344ee
Merge pull request #13135 from zfox23/MS14951_fixSnapshotHotkeySound
MS14951: Fix Snapshot hotkey sound playback
2018-05-09 11:07:46 -07:00
Seth Alves
db03265a6b when in serverless mode, short-circuit simulation ownership bids 2018-05-09 10:53:46 -07:00
Sam Gateau
17350a79dd
Merge pull request #13046 from NissimHadar/commandLineParametersForAutotester
Command line parameters for autotester
2018-05-09 10:51:31 -07:00
Thijs Wenker
a42491ded7
Merge pull request #13055 from misslivirose/remove-help-ftue
Do not open help on first run
2018-05-09 18:48:05 +02:00
Zach Fox
542e707de8 MS14951: Fix Snapshot hotkey sound playback 2018-05-09 09:40:51 -07:00
Zach Fox
06c6f55069 MS14951: Fix Snapshot hotkey sound playback 2018-05-09 09:35:42 -07:00
John Conklin II
d8e6ecba35
Merge pull request #13129 from druiz17/fix-hmd-js
Fix hmd js
2018-05-09 07:45:52 -07:00
John Conklin II
a811c6aba3
Merge pull request #13132 from zfox23/RC67_MS14937
MS14937: Fix Replace button for content sets during Checkout
2018-05-09 06:47:47 -07:00
Simon Walton
0349847857 Add comment re threading issues 2018-05-08 17:46:25 -07:00
NissimHadar
ee4b1af3aa Corrected missing images in test.md files 2018-05-08 16:51:58 -07:00
Zach Fox
22c26c348d MS14937: Fix Replace button for content sets during Checkout 2018-05-08 16:37:11 -07:00
Zach Fox
540f200b99 MS14937: Fix Replace button for content sets during Checkout 2018-05-08 16:34:28 -07:00
samcake
44e7541888 Fixing the size evaluation for compressed texture and gpu::Element Type enum 2018-05-08 15:57:27 -07:00
NissimHadar
781e914040 Merge branch 'master' of github.com:highfidelity/hifi into perfTest_1 2018-05-08 15:53:43 -07:00
NissimHadar
175fa9108e Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-08 15:52:15 -07:00
NissimHadar
7f9f9d769a Corrected bug causing Interface not to exit at end of test. 2018-05-08 15:51:52 -07:00
Dante Ruiz
1a0ded4526 adding windows 2018-05-08 15:10:57 -07:00
Stephen Birarda
a87b13c617
Merge pull request #13126 from birarda/67-to-master
merge RC67 back to master
2018-05-08 15:07:33 -07:00
Dante Ruiz
0513204781 fix hmd.js 2018-05-08 15:05:55 -07:00
Stephen Birarda
4165ab3667 Merge branch 'RC67' of github.com:highfidelity/hifi into 67-to-master 2018-05-08 14:08:21 -07:00
Stephen Birarda
10b9546104
Merge pull request #13124 from birarda/66-2-to-67
Merge 66.2 back to 67
2018-05-08 14:03:07 -07:00
NissimHadar
d5bb582811 Per Austin's comments. 2018-05-08 11:40:56 -07:00
NissimHadar
516b2fa68c Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-08 11:13:26 -07:00
NissimHadar
eb14658bc5 Per Austin's comments. 2018-05-08 11:13:06 -07:00
Zach Fox
cf917514b4
Merge pull request #13119 from zfox23/MS14878_preventPasswordLeak
MS14878: Prevent wallet passphrase leak in specific case
2018-05-08 10:44:52 -07:00