Sam Gondelman
|
8817af9b9c
|
Merge pull request #13330 from Cristo86/android_enterbackground_startup
Android - Make sure we call Interface enterBackground when opening
|
2018-06-18 12:47:43 -07:00 |
|
Howard Stearns
|
69d1b85d32
|
Merge pull request #13393 from howard-stearns/fix-concurrency-drill-down
fix concurrency drillDown
|
2018-06-18 11:39:30 -07:00 |
|
Elisa Lupin-Jimenez
|
9c488ff05e
|
Merge pull request #13331 from gcalero/breakpad_android
Breakpad integration for android Interface
|
2018-06-18 11:32:05 -07:00 |
|
Elisa Lupin-Jimenez
|
c08df9e39f
|
Merge pull request #13400 from kitely/parse-snapshot-fix
Don't call parseSnapshotData() in a static manner
|
2018-06-18 11:26:29 -07:00 |
|
Gabriel Calero
|
3eecb2f379
|
Apply code conventions
|
2018-06-18 14:42:08 -03:00 |
|
John Conklin II
|
87d26a9d86
|
Merge pull request #13304 from sabrina-shanman/btghostraytest
Use optimized Bullet raytest function in CharacterGhostObject::rayTest()
|
2018-06-18 10:22:17 -07:00 |
|
Elisa Lupin-Jimenez
|
b255cf0ba9
|
Merge pull request #13389 from AndrewMeadows/misc-001
crash fixes, removing unnecessary writes, and misc cleanup
|
2018-06-18 09:19:22 -07:00 |
|
Seth Alves
|
ac7e817f4b
|
Merge pull request #13388 from jherico/fix/oculus_touch_and_remote
Fix touch controller button handling when Oculus remote is paired (MASTER)
|
2018-06-18 08:54:16 -07:00 |
|
Oren Hurvitz
|
d8ea47b78f
|
Don't call parseSnapshotData() in a static manner.
Shouldn't call non-static methods in a static manner. (Some compilers don't even allow this, although apparently Visual Studio 2017 does.)
|
2018-06-17 14:18:25 +03:00 |
|
Gabriel Calero
|
583c46b3a0
|
Merge remote-tracking branch 'upstream/master' into breakpad_android
|
2018-06-15 21:21:03 -03:00 |
|
Seth Alves
|
3c081c4bf8
|
Merge pull request #13377 from danteruiz/fix-double-scripts-on-reload
prevent having more than one instance of a script running after reloading the script
|
2018-06-15 17:17:35 -07:00 |
|
Seth Alves
|
b4b6c85aaf
|
Merge pull request #13366 from danteruiz/fixing-invisible-cursor
fixing invisible cursor when coming from HMD mode
|
2018-06-15 17:16:46 -07:00 |
|
Seth Alves
|
7ca6dfc8c5
|
Merge pull request #13371 from danteruiz/fix-focus-issues
fix focus issues when mouse is offscreen
|
2018-06-15 17:15:42 -07:00 |
|
Gabriel Calero
|
20c147ef11
|
Fix compilation error
|
2018-06-15 21:12:38 -03:00 |
|
howard-stearns
|
97fa22b69b
|
fix concurrency drillDown
|
2018-06-15 16:57:21 -07:00 |
|
Gabriel Calero
|
1cdd8c2f3c
|
Fix compilation error
|
2018-06-15 20:39:24 -03:00 |
|
Gabriel Calero
|
20727378e2
|
Rename crash handler files
|
2018-06-15 20:32:10 -03:00 |
|
John Conklin II
|
2655dd77b6
|
Merge pull request #13368 from zfox23/MS15501_CreateModelKeyboard
MS15501: Fix keyboard in Create -> Model in HMD
|
2018-06-15 15:34:02 -07:00 |
|
Clément Brisset
|
0f83230a0b
|
Merge pull request #13379 from Atlante45/feat/audio-dissector
Add audio dissector
|
2018-06-15 15:25:58 -07:00 |
|
John Conklin II
|
2483c45f40
|
Merge pull request #13350 from sabrina-shanman/bulletcollisionrenderonly
Remove functionality for rendering collision models directly in the Model class
|
2018-06-15 14:46:40 -07:00 |
|
Gabriel Calero
|
4cd94a32b8
|
Crash on audio button press with testing purpose
|
2018-06-15 17:44:28 -03:00 |
|
Gabriel Calero
|
2a20ffcca4
|
Add delay before uploading minidump
|
2018-06-15 17:42:42 -03:00 |
|
Seth Alves
|
0936313699
|
Merge pull request #13376 from zfox23/MS13202_reloadScriptsCrashSave
Fix MS13202: Don't save incomplete list of scripts to Settings while reloading scripts
|
2018-06-15 12:47:36 -07:00 |
|
Andrew Meadows
|
be0899c41d
|
remove unnecessary writes to appease Xcode's static analyzer
|
2018-06-15 11:44:22 -07:00 |
|
Andrew Meadows
|
5a3350950b
|
check pointer validity before dereference
|
2018-06-15 11:43:52 -07:00 |
|
John Conklin II
|
a7952c7ff3
|
Merge pull request #13380 from thoys/21883_remove_limitless
Remove Limitless API
|
2018-06-15 11:08:47 -07:00 |
|
Andrew Meadows
|
93ac70ead4
|
avoid crash in inertia calculation of btBvhTriangleMeshShape
|
2018-06-15 10:28:12 -07:00 |
|
Andrew Meadows
|
d0baa2d2a1
|
fix typos in simulation ownership documentation
|
2018-06-15 10:28:00 -07:00 |
|
Andrew Meadows
|
6331395a89
|
remove crash mode in invokable methods
|
2018-06-15 10:27:35 -07:00 |
|
Brad Davis
|
197fb469eb
|
Fix touch controller button handling when Oculus remote is paired
|
2018-06-15 10:16:32 -07:00 |
|
Clement
|
a932a50922
|
Add audio dissector
|
2018-06-14 17:50:59 -07:00 |
|
Thijs Wenker
|
05bc32b3ad
|
Merge branch 'master' of github.com:highfidelity/hifi into merge/triplelexx-21883
# Conflicts:
# interface/src/Application.cpp
# interface/src/scripting/LimitlessVoiceRecognitionScriptingInterface.cpp
|
2018-06-15 02:34:29 +02:00 |
|
Zach Fox
|
227bd1487e
|
Merge pull request #13375 from zfox23/spectatorCamera2.2
MS15916: Fix multiple issues with Spectator Camera
|
2018-06-14 16:01:35 -07:00 |
|
sabrina-shanman
|
79fd3cb181
|
Rename createVisibleRenderItemSet() to createRenderItemSet() in Model class
|
2018-06-14 15:49:40 -07:00 |
|
sabrina-shanman
|
b2ec7f78c1
|
Remove signaling and render code for collision models in RenderableModelEntityItem and EntityTreeRenderer
|
2018-06-14 15:49:40 -07:00 |
|
Gabriel Calero
|
61fb6004eb
|
Merge branch 'breakpad_android' of https://github.com/gcalero/hifi into breakpad_android
|
2018-06-14 19:44:39 -03:00 |
|
Gabriel Calero
|
c02750edd1
|
Upload breakpad minidumps from an android service
|
2018-06-14 19:43:03 -03:00 |
|
Zach Fox
|
ad456ee282
|
Whitespace
|
2018-06-14 15:16:03 -07:00 |
|
sabrina-shanman
|
3c4050884e
|
Remove straggler ifdef in Model class
|
2018-06-14 14:40:22 -07:00 |
|
Dante Ruiz
|
8b4b95f890
|
prevent have more than one instance of a script after reloading script
|
2018-06-14 14:00:40 -07:00 |
|
Zach Fox
|
3c681554de
|
Fix MS13202: Don't save incomplete list of scripts to Settings while reloading scripts
|
2018-06-14 13:50:30 -07:00 |
|
John Conklin II
|
74e5c4bf60
|
Merge pull request #13230 from SimonWalton-HiFi/snoretoast
Windows install - use an app ID with toaster popups
|
2018-06-14 13:37:45 -07:00 |
|
John Conklin II
|
1b91ee555a
|
Merge pull request #13323 from kencooke/audio-mp3-decode
Support MP3 files as sound assets
|
2018-06-14 13:37:05 -07:00 |
|
sabrina-shanman
|
baf0df05cd
|
Remove unnecessary 'this->' in rayTest parent function call
|
2018-06-14 13:16:46 -07:00 |
|
John Conklin II
|
fa1dc78469
|
Merge pull request #13374 from thoys/fix/dynamic-cloneDynamic
[RC69] fix cloneDynamic
|
2018-06-14 12:58:17 -07:00 |
|
John Conklin II
|
d023d6adef
|
Merge pull request #13321 from danteruiz/tablet-imporvments
Tablet improvements
|
2018-06-14 12:38:20 -07:00 |
|
Zach Fox
|
e806348eeb
|
MS15916: Fix multiple issues with Spectator Camera
|
2018-06-14 12:20:57 -07:00 |
|
John Conklin II
|
4f561b00da
|
Merge pull request #13003 from alexiamandeville/sittingUpdates
Adding sitting and love to emote app
|
2018-06-14 11:52:47 -07:00 |
|
Anthony Thibault
|
f2d6d0ee56
|
Merge pull request #13351 from ctrlaltdavid/21891
Fix Avatar > Attachments joint and spinboxes
|
2018-06-14 11:31:04 -07:00 |
|
Anthony Thibault
|
5d06ea1c45
|
Merge pull request #13250 from MiladNazeri/gravprep-docs
Jsdoc to Grav Automation Tool
|
2018-06-14 11:26:56 -07:00 |
|