Commit graph

67408 commits

Author SHA1 Message Date
Clement
7fe16f82fb Move variables to Agent.cpp 2018-05-03 17:08:17 -07:00
NissimHadar
1f691edf0d Removed platform code (was used for MD files). 2018-05-03 17:04:17 -07:00
NissimHadar
da621d99d3 Removed unneeded pragma. 2018-05-03 16:52:03 -07:00
Stephen Birarda
48aeebdd50
Merge pull request #13007 from Atlante45/fix/crashes-hotfix
Keep CrashpadClient around for application lifetime
2018-05-03 16:48:29 -07:00
Stephen Birarda
e9c3fb914f
Merge pull request #13084 from Atlante45/fix/wizard-wording
Fix wizard wording
2018-05-03 16:47:16 -07:00
NissimHadar
e07039266d Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-03 16:44:57 -07:00
NissimHadar
887b8285cd Removed unneeded pragma. 2018-05-03 16:44:04 -07:00
John Conklin II
7d424edd9b
Merge pull request #13092 from Atlante45/fix/asan-warning
Fix uninitialized boolean (asan warning)
2018-05-03 15:46:37 -07:00
NissimHadar
2c6c0a25fc Add testSnapshotLocation parameter to takeSnapshot. 2018-05-03 15:15:30 -07:00
NissimHadar
fe9c6052f7 Added quitWhenFinished parameter to the command line. 2018-05-03 15:02:11 -07:00
NissimHadar
beb19c53fa Added date and time to auto-generated scripts. 2018-05-03 15:00:14 -07:00
NissimHadar
3b566332c6 Shutdown interface when test script finishes. 2018-05-03 14:34:12 -07:00
NissimHadar
3a5425122b Shutdown interface when test script finishes. 2018-05-03 14:31:01 -07:00
MiladNazeri
6efb710222
Merge pull request #13076 from ctrlaltdavid/21856-g
JSDoc fixes
2018-05-03 14:06:23 -07:00
Anthony J. Thibault
fc9bd7f905 Fix for crash deep in QML after useFullAvatarURL
Here we avoid calling FSTReader::downloadMapping() from within MyAvatar::useFullAvatarURL().
This prevents the error case where a QEventLoop is entered during QML execution.
2018-05-03 14:06:06 -07:00
samcake
767e6b15f3 Fixing the local lighting on translucents bug 2018-05-03 11:42:06 -07:00
NissimHadar
46f461dcdb Don't display crash message if running from command line with a test script. 2018-05-03 11:20:37 -07:00
Clement
cefb8457ea Fix uninitialized boolean 2018-05-03 11:17:31 -07:00
Ken Cooke
028ea11405
Merge pull request #13080 from kencooke/audio-asan-warnings
Fix asan warnings
2018-05-03 10:32:59 -07:00
Howard Stearns
d4a562ee47
Merge pull request #13081 from zfox23/MS14741_fixAppUninstallation
Fix MS14741, allowing uninstall of apps whose scripts are no longer running
2018-05-03 10:02:20 -07:00
Ken Cooke
9e7fceccc3
Merge pull request #13087 from kencooke/audio-meter-default
Fix MS14640: Default audio meter overlay to "on"
2018-05-03 09:29:30 -07:00
NissimHadar
8b3c451f91 Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-03 08:25:19 -07:00
Ken Cooke
2a7e8c6f89 Default audio meter overlay to "on" 2018-05-03 07:15:18 -07:00
David Rowe
e95c38d939 Merge branch 'master' into 21856-g
# Conflicts:
#	libraries/model-networking/src/model-networking/TextureCache.h
2018-05-03 21:03:14 +12:00
MiladNazeri
8e214d8ee8
Merge pull request #13049 from ctrlaltdavid/21856-d
List which contexts each namespace and class is available in
2018-05-03 01:29:14 -07:00
Seth Alves
b68d9ecd68
Merge pull request #12985 from druiz17/attachments-disappearing
fixing avatr attachments not being visible when coming out of first person
2018-05-02 18:50:41 -07:00
Ken Cooke
3e77d946ea Silence warnings of unused functions 2018-05-02 17:48:04 -07:00
Sam Gateau
361fe75dc3
Merge pull request #13078 from jherico/fix/14638
Make resource swapchains immutable
2018-05-02 17:21:45 -07:00
Clement
e1c5eb9bda Fix wizard wording 2018-05-02 17:17:19 -07:00
Zach Fox
56ba59681a Fix MS14741, allowing uninstall of apps whose scripts are no longer running 2018-05-02 16:12:55 -07:00
Ken Cooke
3071b410bf Remove obsolete 32-bit optimizations 2018-05-02 15:42:53 -07:00
Ken Cooke
5f394fb254 Remove workaround for VS2013 bug 2018-05-02 15:31:40 -07:00
NissimHadar
b9cdaf31a0 Corrected name of create all recursive tests call. 2018-05-02 15:26:03 -07:00
NissimHadar
56e5b0e7b4 Added autoTester.enableAuto(); to the recursive tests. 2018-05-02 15:25:31 -07:00
Ken Cooke
e549f7b085 Fix VS2017 performance loss 2018-05-02 14:48:08 -07:00
NissimHadar
5cbb8674ec Use default parameter for saveSnapshot(). 2018-05-02 14:45:28 -07:00
John Conklin II
f43b9ee7e8
Merge pull request #12960 from hyperlogic/feature/bullet-debug-draw
Added items to the developer menu for debugging physics
2018-05-02 14:25:09 -07:00
NissimHadar
83846aec04 Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-02 14:17:22 -07:00
NissimHadar
e0b16dfe03 Allow use of --url command line argument in test mode. 2018-05-02 14:17:01 -07:00
David Rowe
5312c81a6f Match style of surrounding code 2018-05-03 08:49:18 +12:00
David Rowe
4a96dc2fdc Refactor 2018-05-03 08:48:17 +12:00
Ryan Huffman
529869e80c Make NetworkTexture extension comparisons case-insensitive 2018-05-02 13:41:52 -07:00
Ryan Huffman
697fde4a1a Cleanup meta texture related changes 2018-05-02 13:31:32 -07:00
Sam Gondelman
7d19586b53
Merge pull request #12693 from gcalero/android_goto_splash
Android goto splash
2018-05-02 16:12:02 -04:00
Gabriel Calero
4dce62cc2e Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-05-02 16:27:41 -03:00
John Conklin II
7a5fce4315
Merge pull request #12991 from luiscuenca/avatarScript
Avatar Scripts
2018-05-02 12:23:13 -07:00
luiscuenca
689fbd2da0 added requested changes 2018-05-02 11:09:17 -07:00
Anthony J. Thibault
4fa9af5534 Added items to the developer menu for debugging physics
Hooked up Bullet's internal debug draw functionality to our client.
Under the Developer > Physics Menu there are five new items:

  * Show Bullet Collision - will draw all collision shapes in wireframe. WARNING: can be slow on large scenes.
  * Show Bullet Bounding Boxes - will draw axis aligned bounding boxes around all physics shapes.
  * Show Bullet Contact Points - will draw all contact points where two or more objects are colliding.
  * Show Bullet Constraints - will render wire frame axes for each constraint connecting bodies together.
  * Show Bullet Constraint Limits - will render the joint limits for each constraint.
2018-05-02 10:51:00 -07:00
Gabriel Calero
c15ef56d90 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-05-02 14:38:10 -03:00
Bradley Austin Davis
64d442b281 Change type used for swap chain count 2018-05-02 10:32:44 -07:00