NissimHadar
fe9c6052f7
Added quitWhenFinished parameter to the command line.
2018-05-03 15:02:11 -07:00
NissimHadar
3a5425122b
Shutdown interface when test script finishes.
2018-05-03 14:31:01 -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
NissimHadar
8b3c451f91
Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester
2018-05-03 08:25:19 -07: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
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
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
NissimHadar
3edfdae6b2
Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester
2018-05-02 08:35:59 -07:00
Stephen Birarda
f5441c05b3
Merge branch 'master' of github.com:highfidelity/hifi into 67-to-master
2018-05-01 14:18:24 -07:00
Stephen Birarda
cad63ad107
Revert "Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently""
...
This reverts commit acb21cc96a
2018-05-01 14:15:12 -07:00
NissimHadar
e9d28cf275
Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester
2018-05-01 13:26:58 -07:00
David Rowe
1aa28b7f54
Merge remote-tracking branch 'upstream/master' into 21856-d
...
# Conflicts:
# interface/src/LODManager.h
2018-05-02 07:50:55 +12:00
John Conklin II
250aa3ab43
Merge pull request #13027 from jherico/fix/web_crash2
...
Some fixes for QML surfaces
2018-05-01 12:39:46 -07:00
MiladNazeri
3bb09024ec
Merge pull request #13058 from ctrlaltdavid/21856-e
...
Fix LODManager JSDoc
2018-05-01 12:25:37 -07:00
Zach Fox
c42b13134f
Merge pull request #13063 from zfox23/preventImageProviderCrash
...
Fix a crash in Image Provider when logging in or reloading all scripts
2018-05-01 11:55:15 -07:00
Stephen Birarda
24dc1c930e
Merge branch 'RC66.2' of github.com:highfidelity/hifi into 66-2-to-67
2018-05-01 10:54:35 -07:00
Zach Fox
cd76336e6a
Actually fix
2018-05-01 09:54:23 -07:00
luiscuenca
2ac7fcadd2
load scripts once on rigReady
2018-05-01 09:37:01 -07:00
NissimHadar
97152ef9c1
Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester
2018-05-01 09:33:07 -07:00
David Rowe
65f5915372
Add JSDoc for startFarTrigger etc. calls on entity scripts
2018-05-01 21:55:27 +12:00
NissimHadar
d5610a2f37
WTF...
2018-04-30 17:52:44 -07:00
NissimHadar
c01fd02de2
Corrected parameter type.
2018-04-30 17:23:49 -07:00
NissimHadar
6d8eee6b32
Merge branch 'commandLineParametersForAutotester' of github.com:NissimHadar/hifi into commandLineParametersForAutotester
2018-04-30 17:19:29 -07:00
Zach Fox
f69ee41074
Prevent crash in ImageProvider when tablet isn't yet initialized
2018-04-30 17:13:44 -07:00
David Rowe
f9bda6df15
Fix LODManager JSDoc
2018-05-01 11:36:37 +12:00
luiscuenca
50ca09b3b4
minor fixes
2018-04-30 16:26:04 -07:00
luiscuenca
2de982a5a2
Added script types and better script reload
2018-04-30 12:04:35 -07:00
Zach Fox
9b80c500e3
Merge pull request #13039 from zfox23/sideloadAppJson
...
Enable sideloading .app.json Apps from local disk
2018-04-30 11:14:24 -07:00
John Conklin II
bc7b0ca0a9
Merge pull request #13029 from birarda/bug/revert-12969-in-67
...
Fix missed revert of PR 12969 for RC67
2018-04-30 11:11:38 -07:00
John Conklin II
b6afaccdf3
Merge pull request #13041 from RebeccaStankus/newModelDialog-Fix
...
New model dialog fix
2018-04-30 10:08:54 -07:00
John Conklin II
acf5ffc5ba
Merge pull request #12970 from sethalves/backtrace-annotations-1
...
Backtrace Attributes
2018-04-30 10:07:11 -07:00
David Rowe
2cc3ed6287
List which contexts each namespace and object is available in
2018-04-28 20:00:28 +12:00
Brad Davis
8e42bb8c87
Restore the stop functionality for a browser view when it's being destroyed
2018-04-27 17:35:38 -07:00
NissimHadar
cf9b089a3c
Added option to set snapshot location (for this execution only) from the command line.
2018-04-27 17:18:16 -07:00
John Conklin II
dd32ca33a5
Merge pull request #12957 from sethalves/quiet-logging
...
Quiet logging
2018-04-27 14:59:38 -07:00
Stephen Birarda
5324ea6d5d
Merge pull request #13038 from highfidelity/stable
...
Merge stable to RC66.2
2018-04-27 14:42:28 -07:00
RebeccaStankus
269a7f0e15
Changed maximum line count for warning message
2018-04-27 14:34:08 -07:00
Zach Fox
dbd7d7e2b4
Small cleanup
2018-04-27 14:19:58 -07:00
Zach Fox
ea716f2a1e
Enable sideloading .app.json Apps from local disk
2018-04-27 14:08:53 -07:00
Zach Fox
c0fe504713
Merge pull request #13030 from zfox23/finalize_14295_14559
...
Finalize work on MS14295 and MS14559
2018-04-27 13:49:02 -07:00
Zach Fox
684d2b08ba
Finalize work on MS14295 and MS14559
2018-04-27 12:03:54 -07:00
Howard Stearns
f8ad36afd0
Merge pull request #13028 from zfox23/updateCommerceFor67
...
Allow gifting of Pending items; remove PoP verification rescheduling on Pending items
2018-04-27 11:55:40 -07:00
