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
Bradley Austin Davis
80f87f7a62
Make resource swapchains immutable, fix for 14638
2018-05-02 10:32:34 -07:00
Bradley Austin Davis
233c60a506
Change type used for swap chain count
2018-05-02 10:29:55 -07:00
Bradley Austin Davis
7bad849e67
Make resource swapchains immutable, fix for 14638
2018-05-02 10:29:40 -07:00
John Conklin II
2dc6b86b20
Merge pull request #13072 from jherico/fix/14638_rc66
...
RC66.2: Make resource swapchains immutable
2018-05-02 10:23:00 -07:00
John Conklin II
83d370f1af
Merge pull request #12872 from huffman/fix/vertex-colors-fbx
...
Fix FBX vertex colors not being read correctly
2018-05-02 10:22:01 -07:00
John Conklin II
49dbc73cd5
Merge pull request #13073 from ctrlaltdavid/21861
...
Fix entity not highlighted in list after creating or undoing delete
2018-05-02 10:19:09 -07:00
Ryan Huffman
b29984ab2c
Remove max log age for rolling interface log
2018-05-02 10:01:15 -07:00
Ken Cooke
05c534991e
Fix ASAN warnings
2018-05-02 09:39:42 -07:00
Sam Gateau
22e5465767
Merge pull request #13013 from AndrewMeadows/avoid-update-flood
...
fix bug: interface sends too many updates on settle
2018-05-02 08:52:58 -07:00
NissimHadar
3edfdae6b2
Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester
2018-05-02 08:35:59 -07:00
Ken Cooke
a4105f1081
Merge pull request #13052 from kitely/fix-gcc-warnings
...
Eliminated warnings in gcc
2018-05-02 06:43:32 -07:00
Oren Hurvitz
26ffb3213c
Changed "[[gnu::fallthrough]]" to "// FALLTHRU"
2018-05-02 07:06:47 +01:00
David Rowe
3febdcb141
Miscellaneous JSDoc tidying
2018-05-02 16:15:35 +12:00
David Rowe
48632be3c2
Fix up cache APIs' JSDoc
2018-05-02 16:12:48 +12:00
David Rowe
f27e363b68
Remove entity from list when it deletes; handle multiple deletions
2018-05-02 15:23:13 +12:00
David Rowe
5a064d3499
Remove selection handles and list highlight when entity deletes
2018-05-02 14:13:15 +12:00
Clement
83a438eb22
Set avatar view packets on their own timer
2018-05-01 18:10:55 -07:00
Clement
2ad948c462
Bump ViewFrustum packet version
2018-05-01 18:03:21 -07: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
Clement
d47ddbd6e4
CR
2018-05-01 18:02:29 -07:00
Clement
30d14dcd45
Push packet version
2018-05-01 18:02:29 -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
69a7f2d4aa
Fix entity server crash
2018-05-01 18:02:29 -07:00
Atlante45
7a710093ac
Fix build error
2018-05-01 18:02:29 -07:00
Clement
3862a02cee
DRY traversal scan callbacks
2018-05-01 18:02:29 -07:00
Clement
7f67547fae
Update HeadlessViewer to not always send a 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
Clement
49fad3d868
EntityServer traversal aware of all ViewFrustums
2018-05-01 18:02:29 -07:00
NissimHadar
93afbcdc08
First success with running from command line.
2018-05-01 17:59:07 -07:00
John Conklin II
256154202e
Merge pull request #13071 from zfox23/RC67_preventImageProviderCrash
...
RC67: Fix a crash in Image Provider when logging in or reloading all scripts
2018-05-01 17:39:43 -07:00
David Rowe
1b99946c5f
Fix entity not highlighted in list after creating or undoing delete
2018-05-02 12:38:29 +12:00