SamGondelman
|
6b268191c8
|
local compression, patched etc2comp
|
2018-05-15 14:05:21 -07:00 |
|
SamGondelman
|
b7395771f9
|
Merge remote-tracking branch 'upstream/master' into etc2comp
|
2018-05-11 14:46:35 -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 |
|
SamGondelman
|
eede3ff1ba
|
Merge remote-tracking branch 'upstream/master' into etc2comp
|
2018-05-11 11:23:33 -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 |
|
John Conklin II
|
4129664368
|
Merge pull request #13145 from highfidelity/stable
Merge RC67 stable into master
|
2018-05-10 17:07:20 -07:00 |
|
Seth Alves
|
826c427e2a
|
trying to sort-out audio-stream logging
|
2018-05-10 15:42:59 -07: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 |
|
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 |
|
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 |
|
SamGondelman
|
437fa25f6e
|
Merge remote-tracking branch 'upstream/master' into etc2comp
|
2018-05-09 14:30:53 -07:00 |
|
SamGondelman
|
7418fe782c
|
local compression on android
|
2018-05-09 14:30:33 -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 |
|
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 |
|
SamGondelman
|
07600f2a81
|
add etc2comp dependency on desktop and android
|
2018-05-08 17:30:48 -07:00 |
|
Zach Fox
|
22c26c348d
|
MS14937: Fix Replace button for content sets during Checkout
|
2018-05-08 16:37:11 -07:00 |
|