Cristian Luis Duarte
8c96d2be3c
Patch for secondary camera assert error on Android
2018-05-04 18:44:07 -03:00
Cristian Luis Duarte
9f5365a277
Merge remote-tracking branch 'hifi/master' into android_places_goto
2018-05-04 18:38:08 -03: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
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
Cristian Luis Duarte
843aa9e261
Merge remote-tracking branch 'hifi/master' into android_places_goto
2018-05-02 18:06:56 -03:00
Cristian Luis Duarte
c460f8bf1e
Merge remote-tracking branch 'hifi/master' into android_places_goto
2018-05-02 16:35:13 -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
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
Clement
a283d28686
Send number of frustums in packet
2018-05-01 18:03:21 -07:00
Clement
ddde0228ba
Fix AC not sending Avatar Mixer a frustum
2018-05-01 18:03:21 -07:00
Clement
1b2b70b769
Send both frustums to Avatar Mixer
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
fea49744ed
Add comment for future work
2018-05-01 18:02:29 -07:00
Clement
98cf48694e
Expose secondary camera to game logic
2018-05-01 18:02:29 -07:00
Clement
49fad3d868
EntityServer traversal aware of all ViewFrustums
2018-05-01 18:02:29 -07: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
Cristian Luis Duarte
401bf2f2a4
Merge remote-tracking branch 'hifi/master' into android_places_goto
2018-04-30 14:38:32 -03:00
John Conklin II
acf5ffc5ba
Merge pull request #12970 from sethalves/backtrace-annotations-1
...
Backtrace Attributes
2018-04-30 10:07:11 -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
bc4ce12e64
Merge pull request #13008 from huffman/fix/download-correct-installer
...
Fix update installer URLs and add installer info to user activity data
2018-04-26 11:32:22 -07:00
Seth Alves
5e790d4898
include machine_fingerprint
2018-04-26 09:49:20 -07:00
Seth Alves
64be0a547c
hook up several annotations for crash reporter
2018-04-26 08:49:45 -07:00
Ryan Huffman
4c8b8d8442
Improve installer campaign+type for updates and user activity data
2018-04-26 08:32:18 -07:00
luiscuenca
12f578c93c
More fixes
2018-04-25 19:46:31 -07:00
luiscuenca
e0770f06b1
Add scripts to Model Packager
2018-04-25 19:35:26 -07:00
luiscuenca
165c3214a7
Avatar Scripts
2018-04-24 18:43:53 -07:00
Brad Davis
861200db27
Attempt to shutdown web surfaces more consistently
2018-04-23 14:32:38 -07:00
Gabriel Calero
ccb5e1e06c
Commenting out display plugin activation/desactivation
2018-04-23 15:29:51 -03:00
Cristian Luis Duarte
c33f1fbbb1
Merge remote-tracking branch 'hifi/master' into android_places_goto
2018-04-23 15:12:56 -03:00
Seth Alves
1dbcbbcced
cleanups
2018-04-23 11:05:06 -07:00
Gabriel Calero
001cd5e937
Merge remote-tracking branch 'upstream/master' into android_goto_splash
2018-04-23 14:25:26 -03:00
Sam Gateau
7842ee8eac
Merge pull request #12962 from SamGondelman/menu
...
Android: Hide menu and fix shader compilation
2018-04-23 09:51:20 -07:00
Cristian Luis Duarte
20d91b13dd
Merge remote-tracking branch 'hifi/master' into android_places_goto
2018-04-23 13:17:53 -03:00
David Rowe
34d0a892a0
Point to example using Hardware.Application item
2018-04-21 15:01:46 +12:00
David Rowe
748052614f
Doc review
2018-04-21 12:45:00 +12:00
SamGondelman
d59f368ad6
hide menu, fix shaders
2018-04-20 17:38:38 -07:00
Seth Alves
6fc02638d7
control verbose logging with a menu-item in developer menu
2018-04-20 16:08:57 -07:00
Seth Alves
bec39369f7
remove some uncatagorized logging, suppress some categories by default
2018-04-20 16:08:57 -07:00
David Rowe
7087abd201
Merge branch 'master' into 21815
2018-04-21 10:49:56 +12:00
Cristian Luis Duarte
8235f999d8
Merge remote-tracking branch 'origin/master' into android_places_goto
2018-04-20 17:53:50 -03:00
Seth Alves
c20346ca53
Merge pull request #12937 from SamGondelman/startup
...
Make Audio.cpp threadsafe
2018-04-20 11:36:08 -07:00
SamGondelman
3b4b43cf66
try to fix audio crash on startup
2018-04-20 10:23:47 -07:00
Cristian Luis Duarte
55e64ceb55
Merge branch 'mm_1e08633' into android_places_goto
2018-04-20 13:32:23 -03:00
Cristian Luis Duarte
77caa4d402
Merge branch 'mm_c8bef86' into android_places_goto
2018-04-20 12:26:38 -03:00
