David Back
|
d4f43a56f2
|
Merge pull request #13556 from dback2/deselectInput
Change deselecting entities to Ctrl + D and prevent W/A/S/D/E/Q movements with Ctrl
|
2018-07-09 10:40:33 -07:00 |
|
John Conklin II
|
e6801c303a
|
Merge pull request #13432 from SimonWalton-HiFi/avatar-identity-request
Implement AvatarRequestIdentity and use if interface gets unknown avatar data
|
2018-07-09 10:07:19 -07:00 |
|
David Back
|
17220b9360
|
Merge pull request #13549 from dback2/parentChildCopy
Re-parent entities after duplicating and duplicate children with parents
|
2018-07-09 10:06:18 -07:00 |
|
John Conklin II
|
55405cc61e
|
Merge pull request #13561 from dback2/pointingAtOverlaysFix
Fix pointing at non-web overlays
|
2018-07-09 10:04:15 -07:00 |
|
Thijs Wenker
|
8ac8b10f98
|
Merge pull request #13521 from MiladNazeri/Fix-JSDoc-Readme
Fixed Readme instructions on JSDoc
|
2018-07-09 18:55:34 +02:00 |
|
Brad Hefta-Gaub
|
f8f206c2f9
|
Merge pull request #13450 from misslivirose/master
MS14398: Make tutorial not grabbable
|
2018-07-07 21:18:15 -07:00 |
|
David Back
|
f815ad1ddd
|
tabs
|
2018-07-06 17:02:41 -07:00 |
|
David Back
|
c271e1aae4
|
fix triggering at non-web overlays
|
2018-07-06 17:02:29 -07:00 |
|
David Back
|
a546d8b279
|
tabs
|
2018-07-06 15:48:53 -07:00 |
|
David Back
|
33e170315c
|
recurse on children of children
|
2018-07-06 15:39:18 -07:00 |
|
Simon Walton
|
607a898c32
|
Transmit a maximum number of identity requests before giving up
|
2018-07-06 15:16:13 -07:00 |
|
David Back
|
a415d1eb37
|
Merge branch 'master' of https://github.com/highfidelity/hifi into parentChildCopy
|
2018-07-06 14:32:17 -07:00 |
|
John Conklin II
|
01610a1520
|
Merge pull request #13559 from wayne-chen/fixCopyAddress-case-16444
Fix AddressManager copyAddress/copyPath functionality
|
2018-07-06 14:11:08 -07:00 |
|
John Conklin II
|
1bd698a5dc
|
Merge pull request #13558 from danteruiz/fix-falling-through-floor
Fix falling through floor
|
2018-07-06 13:44:08 -07:00 |
|
John Conklin II
|
6e13b0e141
|
Merge pull request #13453 from gcalero/web_overlay_android
Support web3d overlays in android
|
2018-07-06 13:02:56 -07:00 |
|
John Conklin II
|
c4733d6c29
|
Merge pull request #13550 from AndrewMeadows/fix-workload-crash
fix crash in workload on timeout with entity-server
|
2018-07-06 12:12:10 -07:00 |
|
Dante Ruiz
|
fdf58ab2b5
|
fixing edge case
|
2018-07-06 11:09:59 -07:00 |
|
Wayne Chen
|
cb89b046b4
|
moving copyToClipboard from slots to functions
|
2018-07-06 11:07:35 -07:00 |
|
Wayne Chen
|
eb4704620c
|
reverting unintended line from previous debug
|
2018-07-06 11:06:16 -07:00 |
|
Wayne Chen
|
0facbedbbc
|
adding Q_INVOKABLE method for copying to Application clipboard
|
2018-07-06 11:03:58 -07: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 |
|
David Back
|
e29873ad66
|
prevent right-click strafe with ctrl
|
2018-07-06 10:52:53 -07:00 |
|
David Back
|
473166a6e7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into deselectInput
|
2018-07-06 10:26:57 -07:00 |
|
Dante Ruiz
|
3cc54c5118
|
another round of small adjustments
|
2018-07-06 09:11:42 -07: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 |
|
Dante Ruiz
|
6d8fe870e4
|
some clean up
|
2018-07-06 09:00:00 -07:00 |
|
Dante Ruiz
|
533164e1e4
|
some more fixes
|
2018-07-06 08:55:20 -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 |
|
Dante Ruiz
|
09627dd3d9
|
first pass on trying to fix falling through floor
|
2018-07-06 08:28:43 -07: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 |
|
Gabriel Calero
|
d82c353103
|
Fix webview dimensions
|
2018-07-05 23:28:56 -03:00 |
|
Wayne Chen
|
3994ec4176
|
adding potential fix - moving methods to Application
|
2018-07-05 17:54:27 -07:00 |
|
Simon Walton
|
f77b2903a1
|
Minor tweaks
|
2018-07-05 17:13:27 -07:00 |
|
Simon Walton
|
33ae04f9ea
|
Change sense of DomainHandler::checkInPacketTimeout() return value
|
2018-07-05 16:39:13 -07:00 |
|
Gabriel Calero
|
4e1ab621ed
|
Fix webview dimensions
|
2018-07-05 20:29:30 -03: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 |
|
Gabriel Calero
|
ff871a0ed5
|
Remove pictureInPicture support from manifest
|
2018-07-05 19:47:07 -03: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 |
|
David Back
|
4763ccf1ec
|
Merge branch 'master' of https://github.com/highfidelity/hifi into deselectInput
|
2018-07-05 14:53:21 -07:00 |
|
Stephen Birarda
|
b4b0131065
|
grab correct commit hash for conflicting PR
|
2018-07-05 14:33:21 -07:00 |
|
Gabriel Calero
|
ea58ea0c6f
|
Code review
|
2018-07-05 17:32:20 -03:00 |
|
Andrew Meadows
|
59fcee6bc0
|
improved clear() and avoid bad indices
|
2018-07-05 13:30:48 -07:00 |
|
David Back
|
2bcc96269e
|
comments, fix doubles in list, fix re-parenting to 0
|
2018-07-05 13:10:56 -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 |
|
David Back
|
fbe670d8c0
|
also copy unselected children
|
2018-07-05 12:43:37 -07:00 |
|
Gabriel Calero
|
6dae9f1c98
|
Make web view bigger
|
2018-07-05 16:28:09 -03:00 |
|
David Back
|
1cc79f0e7c
|
renaming
|
2018-07-05 12:07:13 -07:00 |
|
David Back
|
25d55b9cc5
|
tabs
|
2018-07-05 11:59:05 -07:00 |
|