Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 09:12:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
68263 commits 75 branches 59 tags 1.2 GiB
Commit graph

68263 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
2e9076c71e Clean up and trying to get ready for merge 2018-05-30 11:14:49 -07:00
Sam Gondelman
0d6cd8de58
Merge pull request #13242 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 #13213 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
Dante Ruiz
c4358aad81 remove dead code in Application::keyPressEvent 2018-05-30 07:33:32 -07:00
Gabriel Calero
4b9295b9be Merge remote-tracking branch 'upstream/master' into signing_apk 2018-05-30 11:16:16 -03:00
Andrew Meadows
bc57003cfb activate body before disconnecting action from entity 2018-05-29 17:56:41 -07:00
Andrew Meadows
5d3502ed88 activate body when removing action 2018-05-29 17:56:41 -07:00
Dante Ruiz
543a721a11 fix headers 2018-05-29 17:55:42 -07:00
samcake
873cabe284 Cleaning the code 2018-05-29 17:46:25 -07:00
Dante Ruiz
ea10dc176a adding back reload scripts 2018-05-29 17:38:02 -07:00
Simon Walton
66d39667e1 AccountManager destructor waits for any RSA key thread 2018-05-29 17:04:37 -07:00
David Rowe
08cb5c7191 Fix JSDoc example typo 2018-05-30 10:25:16 +12:00
David Rowe
0db440931e Miscellaneous JSDoc fixes 2018-05-30 10:02:30 +12:00
David Rowe
ac0607b5ae Review Entites.cloneEntity() JSDoc and add JSDoc for new properties 2018-05-30 10:02:10 +12: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 #13248 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
samcake
82503a9e64 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-29 08:59:37 -07:00
Sam Gateau
2f94c43968 Removing the getLayer from the meshPArtPayload and check that it s working 2018-05-28 23:20:04 -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
Wayne Chen
35755369cd Merge branch 'master' of https://github.com/wayne-chen/hifi 2018-05-28 10:26:38 -07:00
David Rowe
a9c4eab099 Fix up JSDoc for Window.takeSnapshot() and related 2018-05-28 12:46:51 +12:00
David Rowe
e20e014a5c Add JSDoc stubs for new Render API functions 2018-05-28 12:02:08 +12:00
David Rowe
b31a4d0b64 Add JSDoc stubs for new HifiAbout API 2018-05-28 10:40:42 +12:00
Sam Gateau
678effdb48 Cleaning up the Model set ItemKey flags and bringing Item::Layer in the ItemKey 2018-05-26 23:28:59 -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
samcake
221b513b19 Oh boy 2018-05-25 16:33:34 -07:00
Dante Ruiz
9a25a74834 fix copy delete cut paste commands and menus 2018-05-25 15:34:17 -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 #12946 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
Wayne Chen
67d24408cf Merge branch 'master' of https://github.com/highfidelity/hifi 2018-05-25 13:26:06 -07:00
John Conklin II
155d6f87c4
Merge pull request #13238 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 #13211 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 #13220 from NissimHadar/fixCameraMode 
Correct `Camera.mode` command.
 2018-05-25 10:47:31 -07:00
John Conklin II
82bb664cb3
Merge pull request #13235 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
samcake
051776ab1d Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-25 10:30:45 -07:00