Commit graph

45894 commits

Author SHA1 Message Date
Anthony J. Thibault
e7dd9c4478 handheld marketplace should work for hydras 2016-08-23 10:10:30 -07:00
Anthony J. Thibault
df17913801 Mipmap generation, trilinear,anisotropic filtering for OffscreenQmlSurface 2016-08-23 10:10:29 -07:00
Anthony J. Thibault
af2c31f29b Renamed WebBuddy to WebTablet 2016-08-23 10:10:29 -07:00
Anthony J. Thibault
eafae1fcf3 Added tablet shell around web-buddy 2016-08-23 10:10:28 -07:00
Anthony J. Thibault
d607abc8f7 Add dpi to edit.js
Also, cap the maximum webEntity texture size to 4096
2016-08-23 10:10:27 -07:00
Anthony J. Thibault
31ed378dbf Added dpi entity property for web-entities 2016-08-23 10:10:26 -07:00
Anthony J. Thibault
6704ae9ad4 Added dpi parameter to userData (this is temporary) 2016-08-23 10:09:17 -07:00
Anthony J. Thibault
9bafd82b2c marketplace now pops up a marketplace web entity 2016-08-23 10:09:16 -07:00
Brad Hefta-Gaub
21bc06f154 Merge pull request #8335 from hyperlogic/feature/hand-controller-web-entity-integration
handControllerGrab and web entity input integration
2016-08-23 09:59:25 -07:00
Brad Hefta-Gaub
52cd222714 Merge pull request #8504 from zzmp/fix/argee
fix typo argee->agree
2016-08-23 09:52:43 -07:00
Seth Alves
6c80a35c4b Merge pull request #8477 from sethalves/fix-grab-ignore-ik-1
ignoreIK flag on action-grabbable objects works again
2016-08-22 18:48:39 -07:00
Seth Alves
219d9cefeb Merge pull request #8498 from birarda/temp-with-oauth
allow temp domains to use access token when present
2016-08-22 18:25:18 -07:00
Zach Pomerantz
cbb115bbcc fix typo argee->agree 2016-08-22 16:34:23 -07:00
Brad Hefta-Gaub
0397c6b6ca Merge pull request #8471 from AndrewMeadows/dont-assert-on-bad-data
workaround bad FBXMesh data rather than assert
2016-08-22 14:21:48 -07:00
Anthony J. Thibault
d015c5cfb5 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-22 14:13:17 -07:00
Anthony J. Thibault
b6a4904068 remove explicit check for WebEntity from setKeyboardFocus
Also, don't get entityTree from entityScriptInterface instead go thru EntityTreeRenderer
2016-08-22 10:56:35 -07:00
Stephen Birarda
d098a1ae28 allow temporary domains to use an access token when present 2016-08-22 10:50:39 -07:00
Brad Hefta-Gaub
60210c323f Merge pull request #8470 from sethalves/suggest-override
add -Wsuggest-override to compile flags and deal with fallout
2016-08-22 09:46:18 -07:00
Seth Alves
9bcda1bb45 merge from upstream 2016-08-20 15:25:04 -07:00
Brad Hefta-Gaub
857e97e979 Merge pull request #8480 from sethalves/dont-say-insufficient-data-during-login
don't send a login-denied packet when we're still waiting for user's public key
2016-08-20 13:48:10 -07:00
Chris Collins
74cb2d4bcf Merge pull request #8461 from imgntn/demo_movement
Movement changes for Hand Controllers
2016-08-19 18:36:40 -07:00
Chris Collins
9cd870bd34 Merge pull request #8485 from Atlante45/master
Move steam.js to unpublishedScripts
2016-08-19 17:18:08 -07:00
Atlante45
dd60683e29 Move steam.js to unpublishedScripts 2016-08-19 17:14:14 -07:00
James B. Pollack
0d42920f1b Merge remote-tracking branch 'upstream/master' into demo_movement 2016-08-19 16:45:44 -07:00
Anthony J. Thibault
ff4c194756 eslint fix 2016-08-19 15:31:57 -07:00
James B. Pollack
2b1e629cca some extra checks on settings values 2016-08-19 14:51:15 -07:00
James B. Pollack
3922192cfc update 2016-08-19 14:31:47 -07:00
James B. Pollack
653b1acc4a cleanup 2016-08-19 14:29:14 -07:00
Seth Alves
ac4ecc9907 don't send a login-denied packet when we're still waiting for user's public key. 2016-08-19 14:10:27 -07:00
Anthony J. Thibault
8bb6bb7c6f generalized keyboard focus interface
Removed dynamic casts to RenderableWebEntityItem, instead
virtual methods were added to EntityItem to facilitate this.

* bool wantsKeyboardFocus()
* void setProxyWindow()
* QObject* getEventHandler()
2016-08-19 10:56:52 -07:00
James B. Pollack
98f0290565 Merge pull request #8436 from huffman/feat/more-user-activity-data
Add more user activity data
2016-08-19 10:48:28 -07:00
Andrew Meadows
5b5ed220bc add BufferView::Iterator operator<() and friend 2016-08-19 10:26:47 -07:00
Andrew Meadows
c3f165d9da BufferView::Iterator doesn't support operator< 2016-08-19 10:15:37 -07:00
Andrew Meadows
304c313db7 minor cleanup 2016-08-19 10:15:30 -07:00
Seth Alves
ff95ef2492 ignoreIK flag on action-grabbable objects works again 2016-08-19 08:59:42 -07:00
Anthony J. Thibault
4db1687746 bug fix for when web-entity is deleted while being scrolled 2016-08-18 18:37:52 -07:00
James B. Pollack
b694b8e541 update turn rate for left stick 2016-08-18 17:24:18 -07:00
James B. Pollack
855561c014 moar 2016-08-18 16:52:32 -07:00
James B. Pollack
a0d4fd4c0e fix bug 2016-08-18 16:51:04 -07:00
James B. Pollack
214a705199 slow 180 rate 2016-08-18 16:50:50 -07:00
Chris Collins
a9fbc4ec2c Merge pull request #8448 from huffman/feat/domain-specify-backup-location
Add backup directory setting to domain server
2016-08-18 16:45:50 -07:00
James B. Pollack
3a8de5ab0d fix rotation function 2016-08-18 15:58:12 -07:00
James B. Pollack
bae51bcfd4 remove prints 2016-08-18 15:29:49 -07:00
James B. Pollack
c89103481b change load order 2016-08-18 14:40:08 -07:00
James B. Pollack
859d3ccadc tweaks 2016-08-18 14:36:52 -07:00
James B. Pollack
2e22bc5e46 new coolin 2016-08-18 14:08:31 -07:00
James B. Pollack
402bad3417 Merge remote-tracking branch 'upstream/master' into demo_movement 2016-08-18 13:43:54 -07:00
James B. Pollack
992504e179 adjust coolin 2016-08-18 13:35:51 -07:00
Brad Hefta-Gaub
1cec7b2db0 Merge pull request #8429 from SamGondelman/loadingFade2
Don't do fade effect once physics kick in
2016-08-18 12:46:24 -07:00
Brad Davis
37192e8251 Merge pull request #8472 from zzmp/fix/buffer-debug-flood
fix log flood in debug mode from Buffer::Iterator (c)end access
2016-08-18 12:06:45 -07:00