Clement
e400eb4ed2
Rename ViewFrustum packets to AvatarQuery
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
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
MiladNazeri
6efb710222
Merge pull request #13076 from ctrlaltdavid/21856-g
...
JSDoc fixes
2018-05-03 14:06:23 -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
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
Zach Fox
56ba59681a
Fix MS14741, allowing uninstall of apps whose scripts are no longer running
2018-05-02 16:12:55 -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
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
David Rowe
3febdcb141
Miscellaneous JSDoc tidying
2018-05-02 16:15:35 +12: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
538f24162f
Define ViewFrustums type alias
2018-05-01 18:03:21 -07:00
Clement
1b2b70b769
Send both frustums to Avatar Mixer
2018-05-01 18:03:21 -07: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
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
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
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
David Rowe
65f5915372
Add JSDoc for startFarTrigger etc. calls on entity scripts
2018-05-01 21:55:27 +12: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
Atlante45
250806252e
Don't use unique_ptr to store CrashpadClient
2018-04-30 12:37:18 -07:00
Atlante45
5ab16302ca
Keep CrashpadClient around
2018-04-30 12:36:17 -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
