NissimHadar
7aa66e4ab9
Merge branch 'master' of github.com:highfidelity/hifi into autoTesterUpdate
2018-06-18 07:48:10 -07:00
NissimHadar
d59ddc4764
Added selection of branch from combo.
2018-06-18 07:44:04 -07:00
David Rowe
ffd66f4377
Make desktop left and right mouse button actions independent
2018-06-18 20:55:13 +12: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
Oren Hurvitz
0cb77362e8
Always roll hifi-log.txt when starting.
...
Otherwise the active log file ("hifi-log.txt") contains lines from both previous sessions and the current session, which is confusing.
2018-06-17 13:44:14 +03:00
David Rowe
e8154b5df1
Fix Create app selection updating when entities are deleted
2018-06-17 08:35:45 +12:00
David Rowe
be4b929301
Fix cauterization when reparent entity to a different joint
2018-06-16 16:31:06 +12:00
David Rowe
4dd6ba1d18
Fix Mac crash
2018-06-16 16:29:45 +12:00
SamGondelman
7771661948
fix particle spread properties
2018-06-15 17:35:49 -07:00
David Back
bb0b1cc4a4
no myAvatarIndex needed
2018-06-15 17:35:18 -07:00
David Back
d16b777977
tabs
2018-06-15 17:33:49 -07:00
David Back
b10cf364c4
Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleCollision
2018-06-15 17:32:32 -07:00
David Back
6ef8206f3a
temp disable myAvatar collisions when stretching
2018-06-15 17:32:03 -07: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
Seth Alves
b60e3c6c7b
fix etclib link when building RelWithDebInfo on OSX
2018-06-15 17:09:32 -07:00
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
