John Conklin II
|
611159f65f
|
Merge pull request #13188 from SimonWalton-HiFi/placename-crash
Initialize Qt's use of openssl lib before calling RSA code
|
2018-05-31 14:34:24 -07:00 |
|
John Conklin II
|
ec3f9549f1
|
Merge pull request #13172 from wayne-chen/getChildrenIDs-issue-1934
Fix EntityScriptingInterface::getChildrenIDs function
|
2018-05-31 14:27:25 -07:00 |
|
Sam Gateau
|
46d055a488
|
Merge pull request #12649 from samcake/punk
Fix addressing the avatar mesh visibility switch bug
|
2018-05-31 14:16:04 -07:00 |
|
samcake
|
386c0f9ab2
|
Re review adjustments
|
2018-05-31 12:16:57 -07:00 |
|
John Conklin II
|
9d5d4c52c0
|
Merge pull request #13262 from danteruiz/add-back-notifactions
adding back notifcations to default scripts
|
2018-05-31 11:51:46 -07:00 |
|
John Conklin II
|
4175825093
|
Merge pull request #13215 from AndrewMeadows/activate-on-action-removal
activate RigidBody when removing physics Action
|
2018-05-31 11:20:03 -07:00 |
|
Sam Gateau
|
513acc529e
|
INtroduce RenderConstants header file to define the alias names for Tag and Layer for Hifi REnder Engine
|
2018-05-30 23:31:54 -07:00 |
|
samcake
|
37c1f4fc06
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-05-30 16:05:46 -07:00 |
|
John Conklin II
|
6095a3b319
|
Merge pull request #13082 from jherico/feature/shader_cache
Shader load time performance optimiziations
|
2018-05-30 13:55:34 -07:00 |
|
Simon Walton
|
a3324c5616
|
Remove empty destructor
|
2018-05-30 13:52:26 -07:00 |
|
Simon Walton
|
8fb5d1b92d
|
Make RSA key-pair class a Runnable that's owned by a threadpool
|
2018-05-30 13:41:08 -07:00 |
|
samcake
|
457b77ca09
|
fixing static definition maybe
|
2018-05-30 13:37:32 -07:00 |
|
Dante Ruiz
|
072d8b70b1
|
adding back notifcations
|
2018-05-30 13:36:02 -07:00 |
|
Sam Gondelman
|
46a6334c72
|
Merge pull request #13249 from gcalero/android_remove_mic_bar
Android: Update Application.cpp
|
2018-05-30 14:31:31 -04:00 |
|
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 |
|
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 |
|
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 |
|
samcake
|
873cabe284
|
Cleaning the code
|
2018-05-29 17:46:25 -07:00 |
|
Simon Walton
|
66d39667e1
|
AccountManager destructor waits for any RSA key thread
|
2018-05-29 17:04:37 -07: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 |
|
Stephen Birarda
|
f7710d126f
|
split up wireshark dissectors for sub protocols
|
2018-05-29 11:35: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 |
|
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 |
|
samcake
|
221b513b19
|
Oh boy
|
2018-05-25 16:33:34 -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 |
|
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 |
|
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 |
|
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 |
|
John Conklin II
|
286d09939d
|
Merge pull request #13205 from luiscuenca/GLTFfix1
Minor fix allows import glTF from Substance Painter
|
2018-05-25 08:28:29 -07:00 |
|
John Conklin II
|
0d8fb90fa8
|
Merge pull request #13222 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 |
|
Sam Gateau
|
aa49595a23
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-05-24 18:19:55 -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 |
|