Commit graph

69573 commits

Author SHA1 Message Date
Thijs Wenker
b1884b0841 CR fixes 2018-07-09 16:38:53 +02:00
Thijs Wenker
4b2e0765db - cleanup (parent) signals InteractiveWindow after window is closed 2018-07-06 20:24:43 +02:00
Thijs Wenker
eea95161ab Merge branch 'master' of github.com:highfidelity/hifi into feat/create/native-windows 2018-07-06 20:06:50 +02:00
Thijs Wenker
eed1f66e71 Merge branch 'feat/create/interactive-window' into feat/create/native-windows 2018-07-06 20:01:48 +02:00
John Conklin II
f2d0f1ffbc
Merge pull request #13458 from SimonWalton-HiFi/aggressive-domain-checkins
Send repeated check-in requests for greater resilience
2018-07-06 10:58:46 -07:00
John Conklin II
7aaf17a3c8
Merge pull request #13496 from thoys/feat/interactive-window
InteractiveWindow scripting API
2018-07-06 10:58:12 -07:00
Thijs Wenker
42afd31325 default window width fixes 2018-07-06 19:48:35 +02:00
Seth Alves
c0e1e9c23a
Merge pull request #13353 from vladest/address_dialog_focus_fix
Remove extra textfield fro address bar input
2018-07-06 09:00:00 -07:00
Thijs Wenker
1b63dfa20a - OSX fixes (right camera after coming from native window, disappearing content)
- Fix show() to show the window after it was minimized
2018-07-06 17:50:48 +02:00
Ken Cooke
8e36d5d1c5
Merge pull request #13545 from Nex-Pro/patch-2
Update BUILD_WIN.md
2018-07-06 05:41:16 -07:00
Simon Walton
33ae04f9ea Change sense of DomainHandler::checkInPacketTimeout() return value 2018-07-05 16:39:13 -07:00
John Conklin II
a97d4f655a
Merge pull request #13548 from luiscuenca/slantedAvatarFix
Fix avatar become more and more slanted over time while in HMD mode
2018-07-05 15:53:45 -07:00
Stephen Birarda
9fc5ba0d8b
Merge pull request #13554 from birarda/bug/conflicted-pr-build
grab correct commit hash for conflicting PR
2018-07-05 15:43:32 -07:00
Clément Brisset
f2a3907e3d
Merge pull request #13357 from SimonWalton-HiFi/memcheck-fixes
Entity Script Server memory leak when taking down EntityTree
2018-07-05 15:30:45 -07:00
Stephen Birarda
b4b0131065 grab correct commit hash for conflicting PR 2018-07-05 14:33:21 -07:00
John Conklin II
dfa0b96a93
Merge pull request #13546 from sethalves/fix-display-controller-buttons
keep buttons from drifing away from in-world display of controllers
2018-07-05 13:09:07 -07:00
luiscuenca
b2e02e20cc Fix inaccurate delta rotation axis 2018-07-05 11:47:10 -07:00
Seth Alves
73071df857 when displaying the in-world controller model, make buttons and joysticks be children of the base controller model, rather than children of the avatar 2018-07-05 10:07:49 -07:00
Zach Fox
01c4b57d11
Merge pull request #13539 from zfox23/MS16413_snapPrintFall
Implement MS16413: Improve angularVelocity of printed Snaps
2018-07-05 09:50:06 -07:00
Nex-Pro
09b21d3c4d
Update BUILD_WIN.md
Added dot backslash to avoid error in windows powershell at line 42. (worked for me)
2018-07-05 17:04:36 +01:00
Thijs Wenker
2b8372c959 Merge branch 'feat/create/interactive-window' into feat/create/native-windows 2018-07-05 17:59:11 +02:00
Thijs Wenker
574bfd177d Create app (desktop mode):
- Fix insta-close on switching from other app to create app.
- Fix new model and particle dialogs.
2018-07-05 17:57:00 +02:00
Anthony Thibault
f56c0a3a3f
Merge pull request #13502 from luiscuenca/eyelidFix
Fix closed eyelids when head is tilted down
2018-07-05 08:50:22 -07:00
Sam Gateau
c7c1cdd8c3
Merge pull request #13529 from Zvork/transparent
Fix number of rendering issues with some transparent objects on Mac and AMD GPUs
2018-07-05 17:20:24 +02:00
Anthony Thibault
c840670a54
Merge pull request #13519 from hyperlogic/bug-fix/stable-pole-vector-smoothing
Bug fix for unexpected avatar knee shifts for users wearing Vive Trackers.
2018-07-03 21:50:57 -07:00
Thijs Wenker
3a32472b0b added test / more docs 2018-07-04 02:49:20 +02:00
Wayne Chen
70917198b2
Merge pull request #13540 from wayne-chen/fixFlyDownMapping-case-14555
Updating keyboard mapping .jpg to reflect keyboard/mouse mapping
2018-07-03 17:33:28 -07:00
Wayne Chen
cfa54c2905 adding updated keyboard mapping .jpg to repo 2018-07-03 16:28:19 -07:00
John Conklin II
d34d7388a1
Merge pull request #13537 from r3tk0n/move_hide_overlays_menu
Moved "Show Overlays" menu item to Developer Menu
2018-07-03 15:59:02 -07:00
Thijs Wenker
446b82abd6
Merge pull request #13410 from dback2/editHandleToggleFix
Fix toggling edit handles between local/world space
2018-07-04 00:23:21 +02:00
Zach Fox
6efb895708 Implement MS16413: Improve angularVelocity of printed Snaps 2018-07-03 13:43:04 -07:00
Clément Brisset
ee03670215
Merge pull request #13492 from SimonWalton-HiFi/script-engine-thread
ScriptsModel instances should be created & destroyed on the same thread (for ESS)
2018-07-03 13:30:29 -07:00
Stephen Birarda
e3c6402d0e
Merge pull request #13522 from birarda/bug/android-version-code-master
add version code for increasing android appVersionCode
2018-07-03 13:15:52 -07:00
John Conklin II
65daee2353
Merge pull request #13513 from vladest/double_asset_server_fix
Tablet Asset Server dialog was instantiated twice
2018-07-03 13:14:12 -07:00
John Conklin II
6737647a56
Merge pull request #13524 from danteruiz/fix-calibration
fix configuration page
2018-07-03 13:13:48 -07:00
John Conklin II
8f838397a4
Merge pull request #13525 from AndrewMeadows/slow-kinematics
fix for erroneous deactivation of slow-spinning kinematic objects
2018-07-03 12:05:42 -07:00
r3tk0n
4426173021 Moved "Show Overlays" menu item to Developer Menu 2018-07-03 11:56:34 -07:00
amantley
3424f412aa
Merge pull request #13437 from amantley/lurchfix
Fix for Avatar Lean in Direction of Movement: Bug 16075 (for RC70)
2018-07-03 19:38:01 +01:00
Seth Alves
62ec693280
Merge pull request #13526 from wayne-chen/fixStillOnlySnap-case-15860
fixing still only snap in snap app
2018-07-03 11:36:25 -07:00
Stephen Birarda
3a4ce9cf5d
Merge pull request #13516 from SimonWalton-HiFi/friends-case-sensitivity
Use case-insensitive matching on friends lists in DomainGatekeeper
2018-07-03 10:29:22 -07:00
Wayne Chen
03a80ce6e3
Merge pull request #13532 from wayne-chen/removeRayPickPrintStatement
Remove ray pick print statement
2018-07-03 09:57:47 -07:00
Thijs Wenker
d5fb094d8a enable Desktop.CLOSE_BUTTON_HIDES flag for create app native windows 2018-07-03 18:49:23 +02:00
Thijs Wenker
c583c07d9c Merge branch 'feat/create/interactive-window' into feat/create/native-windows
# Conflicts:
#	scripts/system/libraries/entityList.js
#	scripts/system/particle_explorer/particleExplorerTool.js
2018-07-03 18:47:38 +02:00
Thijs Wenker
3f6793b462 - center default native window
- close button destroys window by default unless Desktop.CLOSE_BUTTON_HIDES flag is set
2018-07-03 18:42:39 +02:00
Bradley Austin Davis
61005d456b
Merge pull request #13530 from samcake/punk
Really add safe check for targetDisplayPLugin
2018-07-03 09:41:25 -07:00
Thijs Wenker
d886bc2d9c Merge branch 'master' of github.com:highfidelity/hifi into feat/create/interactive-window 2018-07-03 18:19:48 +02:00
Sam Gondelman
5daf84d690
Merge pull request #13523 from SamGondelman/blur
Fix blurry tablet if overlay is drawing
2018-07-03 09:19:32 -07:00
Wayne Chen
2bbc5b6137 remove ray pick print statement - it bloats the debug window 2018-07-03 09:11:57 -07:00
Olivier Prat
aa115786e3 Invalidate uniform buffer cache when binding camera correction 2018-07-03 17:27:27 +02:00
Thijs Wenker
7ed03c2f77 - native window presentation mode update
- de-activate create on displayMode change.
2018-07-03 17:26:18 +02:00