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 |
|
Andrew Meadows
|
6de175e794
|
avatars collide again
|
2018-05-11 17:01:48 -07:00 |
|
David Rowe
|
6d000f3362
|
JSDoc parameter for AudioEffectOptions constructor
|
2018-05-12 11:41:42 +12:00 |
|
Cristian Luis Duarte
|
f97155b6cd
|
Revert virtualpad code. It works on Pixel XL
|
2018-05-11 20:34:43 -03:00 |
|
Cristian Luis Duarte
|
3f49046f1c
|
Merge remote-tracking branch 'cristo86/android_places_goto' into android_places_goto
|
2018-05-11 20:33:23 -03: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 |
|
David Rowe
|
cf9053c873
|
Merge branch 'master' into 21872-b
|
2018-05-12 10:50:31 +12:00 |
|
Gabriel Calero
|
0f8c666647
|
Trying to fix virtualpad textures corruption
|
2018-05-11 19:50:00 -03: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 |
|
Cristian Luis Duarte
|
e3d7d65186
|
Merge remote-tracking branch 'origin/master' into android_avatar_name
|
2018-05-11 18:48:34 -03:00 |
|
Gabriel Calero
|
9b5da09dc7
|
Fix connection issue syncing two AccountManagers
|
2018-05-11 18:08:56 -03: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 |
|
Gabriel Calero
|
db460e9856
|
Put back the worker thread for account manager in android
|
2018-05-11 16:09:40 -03: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 |
|
John Conklin II
|
0991bf106d
|
Merge pull request #13155 from highfidelity/RC67.1
Beta Release 67.1 - branched at Developer Release 8260
|
2018-05-11 10:09:36 -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
|
5866442bf6
|
Merge pull request #13156 from Zvork/RC67.1
Bug fix for Manuscript issue 15019 : "Translucent Model over Procedural SHader is broken"
|
2018-05-11 07:53:16 -07:00 |
|
Gabriel Calero
|
e838a85a47
|
Merge remote-tracking branch 'upstream/master' into android_places_goto
|
2018-05-11 09:13:41 -03:00 |
|
Olivier Prat
|
ff88911f93
|
Protected procedural skyboxes from NaNs and negative values returned by procedural shader
|
2018-05-11 12:26:03 +02:00 |
|
David Rowe
|
e255fa3863
|
JSDoc typos
|
2018-05-11 21:08:57 +12:00 |
|
David Rowe
|
496154fdbe
|
File API JSDoc stubs
|
2018-05-11 21:07:12 +12:00 |
|
Olivier Prat
|
9e462e777c
|
Fixed compilation error with transparent procedurals
|
2018-05-11 11:01:24 +02:00 |
|
David Rowe
|
42d0620fd1
|
EntityViewer API JSDoc stubs
|
2018-05-11 20:56:00 +12:00 |
|
David Rowe
|
fb175d7110
|
AudioEffectOptions API JSDoc stubs
|
2018-05-11 20:36:10 +12:00 |
|
David Rowe
|
3891ebe703
|
Agent API JSDoc stubs
|
2018-05-11 20:20:07 +12:00 |
|
John Conklin II
|
b0d19bc08e
|
Merge pull request #13149 from SamGondelman/cherry-pick
RC67.1: Fixed procedural shaders
|
2018-05-10 23:47:16 -07:00 |
|
John Conklin II
|
e1e68c0dfa
|
Merge pull request #13153 from hyperlogic/bug-fix/vive-puck-calibration-fix-rc67
[RC67.1] Bug fix for Vive Tracker Calibration Settings
|
2018-05-10 23:46:51 -07:00 |
|
SamGondelman
|
de4a2ca3b2
|
update procedural skybox on user data change
|
2018-05-10 18:44:53 -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 |
|
Anthony J. Thibault
|
0ac12fa317
|
Bug fix for Vive Tracker Calibration Settings
This issue was inadvertently introduced by the name change of the Vive display plugin.
|
2018-05-10 17:56:54 -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 |
|
Thijs Wenker
|
e24523a29e
|
updated eslint config to be more sorted and complete
|
2018-05-11 01:48:13 +02:00 |
|
howard-stearns
|
bf26aec260
|
untabify
|
2018-05-10 16:39:56 -07:00 |
|
Cristian Luis Duarte
|
bd554f62d8
|
Merge remote-tracking branch 'hifi/master' into android_places_goto
|
2018-05-10 20:34:46 -03: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 |
|
Olivier Prat
|
ec439086a2
|
Extended to other shaders
(cherry picked from commit 328f1dec9b)
|
2018-05-10 15:41:34 -07:00 |
|
Olivier Prat
|
29355ba8fb
|
Fixed procedural shaders
(cherry picked from commit eab7dd6006)
|
2018-05-10 15:41:04 -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 |
|
Gabriel Calero
|
a1a48d9b9e
|
Merge remote-tracking branch 'upstream/master' into android_places_goto
|
2018-05-10 18:24:26 -03:00 |
|
Gabriel Calero
|
b2bedc4099
|
Merge branch 'android_places_goto' of https://github.com/Cristo86/hifi into android_places_goto
|
2018-05-10 18:22:41 -03:00 |
|
Cristian Luis Duarte
|
f30908fb26
|
Android - Remove delay starting Home + Change default joystick flag
|
2018-05-10 18:21:33 -03:00 |
|