Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 14:09:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
51342 commits 76 branches 59 tags 1.2 GiB
Commit graph

51342 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
84b93826d0 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-22 09:30:16 -08:00
Seth Alves
a8de6c8c93 Merge pull request #9723 from hyperlogic/bug-fix/tablet-ui-reload-script-bug 
Fix for system toolbar hiding when scripts are reloaded
 2017-02-22 07:34:20 -08:00
Chris Collins
04d8c78089 Merge pull request #9707 from hyperlogic/bug-fix/mac-os-deadlock 
MacOS: Fix for audio, toolbar and tablet.
 2017-02-21 17:39:07 -08:00
Anthony J. Thibault
379b7bc56d Fix for system toolbar hiding when scripts are reloaded 2017-02-21 17:24:22 -08:00
Brad Hefta-Gaub
97fc88491f Merge pull request #9718 from AndrewMeadows/sort-avatars-correctly 
fix sorting algorithm for avatar render updates
 2017-02-21 16:14:12 -08:00
Chris Collins
c0f893fe82 Merge pull request #9699 from sethalves/overlays-uuid 
Overlays uuid
 2017-02-21 15:28:28 -08:00
Andrew Meadows
dd447689e0 expose avatar sort coefficients for fine tuning 2017-02-21 15:09:44 -08:00
Seth Alves
3b181eb803 code review 2017-02-21 13:56:28 -08:00
Seth Alves
8cf71ebc65 Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid 2017-02-21 13:54:21 -08:00
Andrew Meadows
27dd82b517 fix sorting algorithm for avatar render updates 2017-02-21 13:34:07 -08:00
Stephen Birarda
10828d7534 Merge pull request #9692 from birarda/feat/es-get-children-parents 
Give implicit access to family tree of server scripted entities in ESS
 2017-02-21 13:17:46 -08:00
Stephen Birarda
3b996f2b7f bump packet version for new JSON query options 2017-02-21 09:29:07 -08:00
Seth Alves
92580a977b Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-20 13:54:12 -08:00
Philip Rosedale
5c782deb4d Merge pull request #9701 from ctrlaltdavid/21175 
Fix laser beam jumping upon grabbing entity
 2017-02-20 13:37:11 -08:00
Seth Alves
43f47c1106 merge from upstream 2017-02-20 12:45:39 -08:00
Seth Alves
a7e002f046 Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into tablet-ui-edit-js 2017-02-20 12:43:13 -08:00
Seth Alves
2db8517303 remove ctrl-M from file 2017-02-20 12:42:57 -08:00
Seth Alves
70c9853189 Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid 2017-02-20 12:38:13 -08:00
Seth Alves
4a650ff2bb Overlays::getOverlayAtPoint was depending on the order in which the overlays were added 2017-02-19 18:37:35 -08:00
Brad Hefta-Gaub
fa0749b494 Merge pull request #9696 from ctrlaltdavid/21168 
Add finger painting script
 2017-02-19 11:37:25 -08:00
Seth Alves
ea03f41b57 Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid 2017-02-18 10:32:11 -08:00
David Rowe
71ba38afb0 Process controller and script updates only when finger painting is on 2017-02-18 21:28:30 +13:00
David Rowe
05c63e16ca Send messages local only 2017-02-18 20:40:27 +13:00
David Rowe
6827a28807 Fix grab position 2017-02-18 16:36:14 +13:00
David Rowe
692fa52aca Disable drawing pointer lasers while painting 2017-02-18 15:21:48 +13:00
David Rowe
2c02b42c96 Finger paint button icon files 2017-02-18 14:21:54 +13:00
Anthony J. Thibault
856a38af0c Fix for audio, toolbar and tablet on macos. 2017-02-17 17:08:23 -08:00
Chris Collins
ec07969c0b Merge pull request #9703 from kunalgosar/logDisplayMode 
Logging HMD/Desktop Transitions
 2017-02-17 17:07:02 -08:00
David Rowe
0689557ba5 Draw smoother lines 2017-02-18 13:39:59 +13:00
David Rowe
777a0b51c1 Ignore spurious finger tip position values 2017-02-18 13:35:16 +13:00
David Rowe
784009a9fa Merge branch 'master' into 21168 2017-02-18 13:20:39 +13:00
Seth Alves
def669364b Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid 2017-02-17 15:45:19 -08:00
Seth Alves
d7bb6f105b make tablet part IDs available through qApp 2017-02-17 15:43:20 -08:00
Seth Alves
f6bd21c483 Merge pull request #9694 from hyperlogic/feature/toolbar-tablet-switcheroo 
By default, tablet icons will display on the toolbar in desktop mode.
 2017-02-17 15:07:17 -08:00
kunalgosar
b8b5927351 Logging display mode changes 2017-02-17 13:21:01 -08:00
Seth Alves
39e1edafd2 merge from upstream 2017-02-17 13:16:12 -08:00
David Rowe
2c5782e4bb Fix laser beam jumping upon grabbing entity 2017-02-18 09:11:04 +13:00
Seth Alves
5ddcbae934 save tablet web-overlay ID in HMD interface. don't trigger edit affordances if the click was intented for the tablet 2017-02-17 11:51:23 -08:00
Seth Alves
47cdade1e9 fix home-button on tablet 2017-02-17 11:47:37 -08:00
Anthony J. Thibault
5963c6ddc3 Fix for toolbar visibility after snapshots. 2017-02-17 11:04:04 -08:00
Seth Alves
4c1f5c1dc8 Merge branch 'overlays-uuid' of github.com:sethalves/hifi into tablet-ui-edit-js 2017-02-17 09:58:58 -08:00
Seth Alves
0d10667bb4 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-17 09:58:33 -08:00
Seth Alves
2b02998fae hook up overlaysToDiscard and overlaysToInclude in Overlays::findRayIntersection 2017-02-17 09:47:40 -08:00
Anthony J. Thibault
e4076e6244 warning fixes 2017-02-17 09:45:13 -08:00
Seth Alves
81f6344023 allow overlays to be parents 2017-02-17 09:36:00 -08:00
Seth Alves
9db817b415 Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid 2017-02-17 07:04:45 -08:00
David Rowe
3712aea861 Handle trigger values of 1.0 not repeating 2017-02-17 19:31:53 +13:00
David Rowe
bdfc9fd418 Tidying 2017-02-17 19:31:40 +13:00
David Rowe
25761adf6c Erase closest line 2017-02-17 19:31:25 +13:00
David Rowe
9c1bb37a34 Paint lines 2017-02-17 19:31:11 +13:00