Seth Alves
ef52ae13ee
rearrange domain-url-changed signals
2018-03-21 14:30:00 -07:00
Seth Alves
4033af9b11
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-21 11:11:43 -07:00
Ken Cooke
f5f4e2a780
Merge pull request #12635 from ctrlaltdavid/21776
...
Fix Window hasFocus(), setFocus(), and raiseMainWindow()
2018-03-21 09:27:51 -07:00
Sam Gateau
a7533e5287
Merge pull request #12675 from SamGondelman/hotfix
...
Model behaves correctly if missing material
2018-03-20 14:27:21 -07:00
Sam Gateau
e59eed64fb
Merge pull request #12680 from SamGondelman/relative
...
Support relative paths for material images
2018-03-20 14:24:50 -07:00
Stephen Birarda
0074c0470d
Merge pull request #12524 from birarda/feat/runtime-beside-exe
...
switch back to app-local VC runtimes and UCRT
2018-03-20 14:07:27 -07:00
John Conklin II
de5ff20968
Merge pull request #12664 from gcalero/android_websurface_check_nocrash
...
Android - Prevent crash when setting the url property to _webSurface.
2018-03-20 11:40:08 -07:00
Seth Alves
585a523823
unmangle merge
2018-03-20 11:17:56 -07:00
Stephen Birarda
cd887b5faf
Merge pull request #12654 from huffman/feat/content-zip-upload
...
Add support for .content.zip content uploads
2018-03-20 10:07:53 -07:00
Seth Alves
f61504b814
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-19 14:59:18 -07:00
Seth Alves
bc527d5ae8
try again on expandToLocalDataAbsolutePath
2018-03-19 14:59:10 -07:00
John Conklin II
91db0ab00f
Merge pull request #12650 from ctrlaltdavid/21798
...
Messages API JSDoc
2018-03-19 13:56:57 -07:00
Seth Alves
a623ba7499
expandToLocalDataAbsolutePath now expands to a file:// url rather than a qrc:// url
2018-03-19 13:48:31 -07:00
Cristian Luis Duarte
17fddd9e0e
RenderableWebEntityItem root item check moved to hasWebSurface and buildWebSurface
2018-03-19 15:33:14 -03:00
SamGondelman
8ddf360c79
support relative paths for material images
2018-03-19 09:59:11 -07:00
Seth Alves
af42b5e93f
trying to fix expandToLocalDataAbsolutePath
2018-03-19 09:42:03 -07:00
Seth Alves
a4599fe7ce
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-16 20:07:35 -07:00
Seth Alves
a144b738e5
fix ACs
2018-03-16 22:39:43 -04:00
Sam Gondelman
b96f398274
Merge pull request #12593 from gcalero/android_joystick_rotate_move
...
Android joystick rotate move
2018-03-16 17:24:15 -07:00
SamGondelman
444534f4ff
model behaves correctly if missing material
...
(cherry picked from commit 1e89debc4e
2018-03-16 15:51:37 -07:00
Seth Alves
7a7a9e9af0
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-16 16:55:47 -04:00
Stephen Birarda
472e7c003f
Merge pull request #11860 from huffman/feat/obj-baker-update
...
OBJ Baking
2018-03-16 13:54:07 -07:00
Cristian Luis Duarte
e29fc9b461
Android - Rotate View control increased sensitivity
2018-03-16 16:28:58 -03:00
Seth Alves
50b9716a17
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-16 14:45:49 -04:00
Seth Alves
98e9f1168a
allow href to be set to a serverless domain
2018-03-16 10:50:03 -07:00
Seth Alves
e3022da787
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-16 09:34:38 -07:00
Cristian Luis Duarte
ee6c65c1ac
Android - Prevent crash when setting the url property to _webSurface.
2018-03-16 12:03:26 -03:00
Cristian Luis Duarte
03cbadece5
Merge remote-tracking branch 'hifi/master' into android_joystick_rotate_move
2018-03-15 17:11:40 -03:00
Cristian Luis Duarte
f8f5655561
Android view control sensitivity increased. Constant replaced for a private value member.
2018-03-15 17:10:14 -03:00
Anthony J. Thibault
f6c4f6b9c4
Fix for arm IK jitter
...
When in HMD mode, holding your hand controller in front of your face, would often result in a 1-2 mm pop in wrist position.
This was due to a problem in the IK elbow constraint.
When the swing rotation out of the elbow's reference frame was close to but not exactly identity it would not be properly constrainted.
But when the magnitude of that swing became big enough the constraint would engage.
This small change in swing rotation was noticable as a 1-2 mm movement in the wrist.
2018-03-15 13:06:27 -07:00
Ryan Huffman
bee8899c46
Add support for uploading .content.zip files
2018-03-15 12:17:21 -07:00
John Conklin II
a7dc2cd12e
Merge pull request #12645 from sethalves/rename-getpos3
...
Rename getpos3
2018-03-15 10:02:00 -07:00
Bradley Austin Davis
b25beeb10b
Merge pull request #12640 from jherico/fix/web_process
...
Don't leave trash web processes when changing web entity urls
2018-03-14 19:40:13 -07:00
David Rowe
369970f120
Messages API JSDoc
2018-03-15 15:23:02 +13:00
Ken Cooke
b1dd63cfd3
Merge pull request #12619 from kencooke/audio-src-kernel-128
...
Improved audio quality for streaming music
2018-03-14 18:30:23 -07:00
Seth Alves
afcbb6751b
disable loading of serverless-domains over http(s), for now
2018-03-14 15:53:35 -07:00
Sam Gondelman
46bbfc2680
Merge pull request #12643 from gcalero/keyboard_crashing
...
Possible fix for keyboard crash
2018-03-14 15:53:17 -07:00
Gabriel Calero
d0f1aa9020
Refactor fix for keyboard crash
2018-03-14 19:18:42 -03:00
Cristian Luis Duarte
379fa9783f
No touch responsibility for KeyboardMouseDevice when TouchscreenVirtualPadDevice is initialized
2018-03-14 19:09:21 -03:00
Seth Alves
ee515a44e7
Merge branch 'master' of github.com:highfidelity/hifi into rename-getpos3
2018-03-14 14:56:50 -07:00
Seth Alves
e63558dc05
code review
2018-03-14 14:33:17 -07:00
Gabriel Calero
e744edc6a0
Possible fix for keyboard crash
2018-03-14 18:11:23 -03:00
Stephen Birarda
0c0ce1d6b8
Merge pull request #12508 from SimonWalton-HiFi/server-script
...
Stop server-script URLs when deleted from entity properties (case 11244)
2018-03-14 14:01:01 -07:00
Seth Alves
93978209d8
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-14 13:49:46 -07:00
Cristian Luis Duarte
80abe1865a
Remove unused variable thisPointConsumed
2018-03-14 16:22:24 -03:00
SamGondelman
e59af8892a
make same changes to gles backend from taa pr
2018-03-14 12:09:59 -07:00
Brad Davis
baa4dc3383
Don't leave trash web processes when changing web entity urls
2018-03-14 11:38:46 -07:00
Seth Alves
2fd6bc4130
rename Mesh api getPos3 to getPos, deprecate but still support getPos3
2018-03-14 10:24:44 -07:00
Sam Gateau
2487e34ee8
Merge pull request #12633 from SamGondelman/aa
...
Fix HUD sphere rendering after TAA changes
2018-03-14 09:26:25 -07:00
David Rowe
c1e256a4f3
Remove unused methods
2018-03-14 13:58:00 +13:00
