Commit graph

68161 commits

Author SHA1 Message Date
NissimHadar
06c167cc68 Add error to failure name. 2018-05-30 16:49:36 -07:00
NissimHadar
78f04f84c5 Merge branch 'master' of github.com:highfidelity/hifi into DailyTests 2018-05-30 16:45:53 -07:00
NissimHadar
c8a04911f4 Interface respects Show Overlay menu checkbox on start up. 2018-05-30 16:45:29 -07:00
John Conklin II
6095a3b319
Merge pull request from jherico/feature/shader_cache
Shader load time performance optimiziations
2018-05-30 13:55:34 -07:00
Sam Gondelman
46a6334c72
Merge pull request from gcalero/android_remove_mic_bar
Android: Update Application.cpp
2018-05-30 14:31:31 -04:00
Sam Gondelman
0d6cd8de58
Merge pull request from gcalero/signing_apk
Sign release apk. Remove daydream intent from manifest
2018-05-30 13:45:54 -04:00
Wayne Chen
81eea5d8d1
Merge pull request from wayne-chen/filebrowser-case-14515
Adding showHidden properties to file dialogs to allow for showing hidden files/folders
2018-05-30 10:43:58 -07:00
NissimHadar
3b44b3a31f Merge branch 'master' of github.com:highfidelity/hifi into DailyTests 2018-05-30 10:23:10 -07:00
Gabriel Calero
a36c41fc13 Make APK release signature optional 2018-05-30 12:43:44 -03:00
Gabriel Calero
4b9295b9be Merge remote-tracking branch 'upstream/master' into signing_apk 2018-05-30 11:16:16 -03:00
Gabriel Calero
b99f901595 Merge branch 'android_remove_mic_bar' of https://github.com/gcalero/hifi into android_remove_mic_bar 2018-05-29 17:22:04 -03:00
Gabriel Calero
bb73af7230 Show stats button only in debug mode. Add isDebugMode to Script public interface 2018-05-29 17:21:44 -03:00
Anthony Thibault
aae38165b8
Merge pull request from birarda/tools/wireshark-dissectors
add split wireshark dissectors for avatar/entity protocols
2018-05-29 13:08:25 -07:00
Gabriel
cf499ca047
Update Application.cpp
Remove the mic bar for android
2018-05-29 16:42:09 -03:00
NissimHadar
5fb7ec7b72 Updated jsdoc 2018-05-29 11:50:23 -07:00
Stephen Birarda
f7710d126f split up wireshark dissectors for sub protocols 2018-05-29 11:35:03 -07:00
NissimHadar
855084b6d5 Updated jsdoc. 2018-05-29 11:29:59 -07:00
NissimHadar
c49bcbe4e9 Removed "Don't show toolbar in test mode.." as this functionality is available through JS commands. 2018-05-29 11:20:29 -07:00
NissimHadar
0af1599b53 Added jsdoc to TestScriptingInterface. 2018-05-29 09:45:03 -07:00
NissimHadar
658c0e329f Corrected comment. 2018-05-28 19:57:54 -07:00
NissimHadar
5fd8cd71c6 Reverted to main repo, for the PR. 2018-05-28 12:05:40 -07:00
NissimHadar
817be6d5b6 Removed debug code. 2018-05-28 12:03:22 -07:00
NissimHadar
ddea1c64bc Updated AutoTester. 2018-05-25 17:37:31 -07:00
NissimHadar
20d2128a10 Corrected timing bug. 2018-05-25 17:36:55 -07:00
NissimHadar
dcab7e4e81 Corrected misplaced semicolons. 2018-05-25 15:03:45 -07:00
NissimHadar
00300f4b2f Merge branch 'master' of github.com:highfidelity/hifi into DailyTests 2018-05-25 15:02:43 -07:00
NissimHadar
87220e501a Don't show tablet in test mode, so that it won't appear in snapshots. Its location is not fixed - this will cause image comparisons to fail) 2018-05-25 15:02:00 -07:00
John Conklin II
38916a3023
Merge pull request from AndrewMeadows/minor-physics-cleanup
minor cleanup in physics simulation
2018-05-25 14:56:04 -07:00
Gabriel Calero
8c6166d6e5 Change gradle configuration to sign release apk. Remove Daydream intent from AndroidManifest 2018-05-25 17:42:41 -03:00
John Conklin II
155d6f87c4
Merge pull request from wayne-chen/toggleAdvancedModeHMD-case-15324
Forward and backward on HMD controllers don't work after restarting interface
2018-05-25 12:25:03 -07:00
John Conklin II
eeed3ae82d
Merge pull request from druiz17/login-fix
Fixing Log in/Sign up dialog is missing "Forgot Username?" and "Forgot Password"
2018-05-25 11:33:29 -07:00
John Conklin II
1d9f33a637
Merge pull request from NissimHadar/fixCameraMode
Correct `Camera.mode` command.
2018-05-25 10:47:31 -07:00
John Conklin II
82bb664cb3
Merge pull request from druiz17/fix-qml-crash-v2
Remove offscreenUi desktop qml object from being a contextProperty for Web3DOverlay
2018-05-25 10:46:11 -07:00
Wayne Chen
8453c7baba reverting commit 802cedf1bc regarding toggleSpaceMode 2018-05-25 09:25:05 -07:00
Wayne Chen
89f7eb0b30 Adding fix for enabling saved front/back advanced controls. 2018-05-25 09:21:01 -07:00
NissimHadar
590b4f91c5 Added comments. 2018-05-25 09:16:51 -07:00
Andrew Meadows
1612d90cd3 minor DynamicsWorld optimizations and track global steps count therein 2018-05-25 08:31:09 -07:00
Andrew Meadows
ed62a2fc37 _lastKinematicStep now mutable, avoids explicit const_cast 2018-05-25 08:31:09 -07:00
NissimHadar
54b64c59d7 Merge branch 'master' of github.com:highfidelity/hifi into DailyTests 2018-05-25 08:29:09 -07:00
John Conklin II
286d09939d
Merge pull request from luiscuenca/GLTFfix1
Minor fix allows import glTF from Substance Painter
2018-05-25 08:28:29 -07:00
NissimHadar
24738ebbe2 Added missing semi-colons. 2018-05-25 08:28:21 -07:00
John Conklin II
0d8fb90fa8
Merge pull request from SamGondelman/mirror
Fix image and text overlay drifting
2018-05-25 08:26:33 -07:00
Wayne Chen
534341ef62 Merge branch 'master' of https://github.com/highfidelity/hifi 2018-05-24 20:45:06 -07:00
Dante Ruiz
e34d67fee4 fix crash 2018-05-24 17:54:53 -07:00
NissimHadar
d01482bf68 Now looks for an actual change in the boom length (vs a change has been requested). 2018-05-24 17:44:39 -07:00
NissimHadar
9ed8c04097 Merge branch 'master' of github.com:highfidelity/hifi into fixCameraMode 2018-05-24 17:40:21 -07:00
Andrew Meadows
cc2d8bebef
Merge pull request from highfidelity/robin-k-wilson-patch-1
Updated Build Guide language
2018-05-24 17:13:45 -07:00
Stephen Birarda
c03b9833fd
Merge pull request from highfidelity/RC68
Merge RC68 back to master
2018-05-24 16:55:44 -07:00
NissimHadar
77d6ea6bec Added hide/show for task bar (Windows only). 2018-05-24 16:48:03 -07:00
Anthony Thibault
eae5215d94
Merge pull request from ctrlaltdavid/21872-c
JSDoc fixes
2018-05-24 16:44:55 -07:00