howard-stearns
97fa22b69b
fix concurrency drillDown
2018-06-15 16:57:21 -07:00
Roxanne Skelly
5bc7694ed6
Merge branch 'master' of https://github.com/highfidelity/hifi into roxie-bugfixes
2018-06-15 16:46:09 -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
Roxanne Skelly
f6c624dcc3
Remove logging messages for behaviors that are expected.
...
Attached entities with scripts are now being sold on the marketplace
(rWatch) and are now being worn by various users. Because of this, it's
now common for the 'removing entity scripts' case to be hit in code for
every update, which causes debug log messages every 60 seconds for each
entity entity with a script.
Repro: Have an avatar wear rWatch. With a second instance of interface,
turn on verbose logging while the first avatar is local. See debug logging
60 times a second.
Fix: Given attached entities with scripts are happening, it's not an
exceptional case and should probably not be logged.
2018-06-15 16:31:09 -07:00
SamGondelman
9ea65950d5
particles: threadsafe, cleanup, rework initialized logic
2018-06-15 15:45:06 -07: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
SamGondelman
0b79e9f6c7
whoops
2018-06-15 15:13:29 -07:00
Sam Gondelman
225a98129a
Merge branch 'master' into modelTextures
2018-06-15 15:09:32 -07:00
Anthony J. Thibault
2feecf6db8
removed unnecessary setting of 'username' annotation.
2018-06-15 14:56:10 -07:00
David Back
cb9c255acd
Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleCollision
2018-06-15 14:51:53 -07:00
Andrew Meadows
4880492d05
protect against bad menu pointer
2018-06-15 14:49:46 -07:00
Andrew Meadows
cdce598c35
protect against misuse of Sysmem::setSubData()
2018-06-15 14:49:07 -07:00
Anthony J. Thibault
8ddcff6070
Set username annotation more reliably.
2018-06-15 14:47:02 -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
Andrew Meadows
670e07bbf5
fix crash for computing inertia for btBvhTriangleMeshShape
2018-06-15 14:31:51 -07:00
David Back
bc06b88afc
tabs
2018-06-15 14:31:18 -07:00
Andrew Meadows
551bfac85e
fix crash mode for Animation::_geometry access before ready
2018-06-15 14:30:59 -07:00
David Back
9b33e6757f
prevent edit press events when pointing at desktop window or tablet
2018-06-15 14:29:47 -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
NissimHadar
afba9c0c5b
Merge branch 'master' of github.com:highfidelity/hifi into autoTesterUpdate
2018-06-15 12:01:47 -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
Anthony J. Thibault
24689224ce
removed redundant machine_fingerprent crashpad annotation.
2018-06-15 11:40:45 -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
David Rowe
249f72758e
Fix entity detaching from head joint not becoming visible
2018-06-15 16:36:16 +12:00
David Back
4b1d2af5fe
Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleDebugWindowFix
2018-06-14 17:53:50 -07:00
Clement
a932a50922
Add audio dissector
2018-06-14 17:50:59 -07:00
David Back
fcccaaea48
tabs
2018-06-14 17:49:02 -07:00
David Back
ed5b05eef4
fix auto laser on locked web entity, only auto laser at tablet or web overlays
2018-06-14 17:43:45 -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
