Zach Fox
96858c9586
MS15529: Add secondary camera snapshot notification flag
2018-06-01 13:38:41 -07:00
NissimHadar
9ed8c04097
Merge branch 'master' of github.com:highfidelity/hifi into fixCameraMode
2018-05-24 17:40:21 -07:00
samcake
cf58f31f3e
Renaming the render::Engine to render::RenderEngine so the instancied Engine class coming from the task namesapce from which it derives, is just named 'Engine'
2018-05-23 15:08:48 -07:00
NissimHadar
06203d44d8
Correct Camera.mode command.
2018-05-22 17:08:28 -07:00
Sam Gondelman
74840d2130
Merge pull request #12935 from gcalero/android_new_login
...
Android new login
2018-05-17 15:53:25 -07:00
Gabriel Calero
5afc9c6df3
Merge remote-tracking branch 'upstream/master' into android_new_login
2018-05-16 12:45:17 -03:00
Zach Fox
bccaa2dbe5
Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements
2018-05-15 11:50:38 -07:00
NissimHadar
d4d2f3c957
Moved ownership of test location into the Test Scripting class.
2018-05-14 16:32:04 -07:00
Zach Fox
43254e2981
Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements
2018-05-14 15:12:44 -07:00
NissimHadar
5f219e27f7
Merge branch 'master' of github.com:highfidelity/hifi into perfTest_1
2018-05-14 10:35:48 -07:00
John Conklin II
5cd225e4de
Merge pull request #12947 from jherico/feature/splash2
...
Additional work on splash screen
2018-05-11 11:26:37 -07:00
NissimHadar
1364f4391d
Can store JSON object.
2018-05-10 18:02:44 -07:00
Zach Fox
44cfa95830
Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements
2018-05-09 15:01:24 -07:00
Gabriel Calero
66b975192d
Merge remote-tracking branch 'cristo86/android_places_goto' into android_new_login
2018-05-07 15:56:43 -03:00
NissimHadar
481eddb2a3
Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester
2018-05-07 08:24:03 -07:00
Brad Davis
72526781d9
Additional work on splash screen
2018-05-04 16:40:05 -07:00
Clement
b04c5bd0db
CR
2018-05-04 14:43:16 -07:00
Gabriel Calero
1330132a32
Merge remote-tracking branch 'upstream/master' into android_new_login
2018-05-04 18:35:51 -03:00
NissimHadar
2311fa33fb
Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester
2018-05-04 14:13:43 -07:00
Gabriel Calero
868b58e66d
Un-expose Application from javascript. Restore displayplugin deactivation when goes to background
2018-05-04 18:01:01 -03:00
Zach Fox
1da840984b
Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements
2018-05-04 10:24:28 -07:00
Clement
d87cd2af6e
Update avatar query names
2018-05-03 18:19:30 -07:00
Clement
27c471ee97
Move all wire frustums to conical frustums
2018-05-03 18:19:29 -07:00
Stephen Birarda
21396287a4
Merge pull request #12990 from Atlante45/fix/spec-cam-av
...
Add support for multifrustum avatar queries
2018-05-03 18:18:51 -07:00
Stephen Birarda
31d5633b4a
Merge pull request #12930 from Atlante45/fix/spec-cam
...
Add support for multifrustum entity queries
2018-05-03 18:13:51 -07:00
NissimHadar
fe9c6052f7
Added quitWhenFinished parameter to the command line.
2018-05-03 15:02:11 -07:00
Zach Fox
c3d3cdca3d
Add cubemap output format
2018-05-03 12:57:00 -07:00
NissimHadar
8b3c451f91
Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester
2018-05-03 08:25:19 -07:00
NissimHadar
5cbb8674ec
Use default parameter for saveSnapshot().
2018-05-02 14:45:28 -07:00
Gabriel Calero
88f0c2d700
Merge remote-tracking branch 'upstream/master' into android_new_login
2018-05-02 18:42:10 -03: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
Gabriel Calero
e4fdd81148
Merge remote-tracking branch 'origin/android_goto_splash' into android_new_login
2018-05-02 17:23:25 -03:00
Gabriel Calero
d0ab81d1f9
Merge remote-tracking branch 'upstream/master' into android_new_login
2018-05-02 17:00:32 -03: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
Gabriel Calero
a653c7df0b
Fix build
2018-05-02 14:59:46 -03: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
Gabriel Calero
3a1bfefc22
Merge remote-tracking branch 'upstream/master' into android_new_login
2018-05-02 10:09:56 -03:00
Clement
21213e81f4
Multiview support for priority queue
2018-05-01 18:03:21 -07:00
Atlante45
0820ef3c95
Account for secondary view when deciding to query
2018-05-01 18:02:29 -07:00
Clement
4c90763236
Correctly update secondary camera frustum
2018-05-01 18:02:29 -07:00
Clement
98cf48694e
Expose secondary camera to game logic
2018-05-01 18:02:29 -07:00
NissimHadar
6d8eee6b32
Merge branch 'commandLineParametersForAutotester' of github.com:NissimHadar/hifi into commandLineParametersForAutotester
2018-04-30 17:19:29 -07:00
Zach Fox
aafcf056c4
Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements
2018-04-30 12:36:00 -07:00
Zach Fox
a2b84c0fbb
It's working!!
2018-04-30 12:11:46 -07:00
luiscuenca
2de982a5a2
Added script types and better script reload
2018-04-30 12:04:35 -07:00
Zach Fox
1b29946a48
I feel so close; why isn't this variable capturing?
2018-04-27 17:26:05 -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
