Andrew Meadows
a18ba36dd2
merge 'master' into 'workload'
2018-06-18 13:40:08 -07:00
Andrew Meadows
085130e3c9
avatars collide again again
2018-06-18 13:17:32 -07:00
Zach Fox
84ed07cdb4
Merge pull request #13405 from zfox23/MS16007_supportPngSnapshots
...
Implement MS16007: Add support for PNG snapshots
2018-06-18 13:10:45 -07:00
Wayne Chen
07e689f086
removing compute/check for u
2018-06-18 13:02:53 -07:00
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
NissimHadar
4897e11a12
Save downloaded byte array (from GitHub) to file with PNG extension.
2018-06-18 12:43:42 -07:00
SamGondelman
0d34689320
spread variables jsdoc
2018-06-18 12:33:36 -07:00
Zach Fox
e83b76781b
Be a bit more specific in the docs
2018-06-18 11:47:26 -07:00
Zach Fox
614b512411
Add docs
2018-06-18 11:43:31 -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
SamGondelman
93fe0c60fa
correctly update bounding box based on radius and other properties
2018-06-18 11:26:09 -07:00
Zach Fox
dbf3ade04f
Implement MS16007: Add support for PNG snapshots
2018-06-18 11:22:05 -07:00
Wayne Chen
e381022910
checking for NaN in cross products from vec3 positions
2018-06-18 11:21:53 -07:00
David Back
0c644c0504
Merge branch 'master' of https://github.com/highfidelity/hifi into autoLaserFix2
2018-06-18 11:06:56 -07:00
David Back
175e4b7013
also check tabletID
2018-06-18 11:06:33 -07:00
Gabriel Calero
3eecb2f379
Apply code conventions
2018-06-18 14:42:08 -03:00
Andrew Meadows
222756371e
set max region radiuses in workload UI
2018-06-18 10:31:41 -07:00
Wayne Chen
ed7f008517
checking edge case of if input vectors are zero
2018-06-18 10:31:11 -07:00
Andrew Meadows
6d422e4678
Merge 'master' into 'workload'
2018-06-18 10:30:13 -07: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
Zach Fox
f307f1d97a
Fix MS15545: Fix PAL/GoTo WebView's Back Button
2018-06-18 10:19:00 -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
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
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
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
