Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-10 15:18:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
51528 commits 74 branches 59 tags 1.2 GiB
Commit graph

2091 commits

Author SHA1 Message Date
Thijs Wenker
13b2b6086f Fix recorder.js playback in interface 2017-02-21 19:47:26 +01: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
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
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
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
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
Seth Alves
0d10667bb4 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-17 09:58:33 -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
David Rowe
5236f123c1 Interpret trigger and grip values 2017-02-17 19:30:57 +13:00
David Rowe
7b36669d80 Point index finger while painting if tablet not displayed 2017-02-17 19:30:40 +13:00
David Rowe
867e24762b Disable lasers and grabbing while painting if tablet not displayed 2017-02-17 19:30:23 +13:00
David Rowe
bad57fa03f Controller and painting code framework 2017-02-17 19:30:04 +13:00
David Rowe
585691f71c Add finger painting button to tablet 2017-02-17 19:29:11 +13:00
Anthony J. Thibault
47e87e1ad4 Bug fix for clara.io marketplace 2017-02-16 17:41:36 -08:00
Anthony J. Thibault
2ea88012f9 Remove toolbar from tablet-goto.js 2017-02-16 17:36:16 -08:00
Anthony J. Thibault
345f0519ef Removed use of Toolbar API for most default scripts. 2017-02-16 17:29:35 -08:00
Seth Alves
b6b6ad780d allow isSpotlight to be 0 or 1 2017-02-16 17:15:52 -08:00
Anthony J. Thibault
cffdecbf68 Merge branch 'master' into feature/toolbar-tablet-switcheroo 2017-02-16 16:28:43 -08:00
Anthony J. Thibault
7f95753a1e Prevent tablet from being open while in toolbarMode 2017-02-16 16:18:51 -08:00
howard-stearns
6e3ae1fe4f cleanup some accumulated cruft in pal code 2017-02-16 10:53:02 -08:00
Seth Alves
12b8a77488 in edit.js, convert entity property ID to be a text-field so the data can be copied 2017-02-15 16:29:50 -08:00
Seth Alves
3d7733219c edit's open-asset-browser button works, again 2017-02-15 16:15:18 -08:00
Seth Alves
e030a4a518 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-15 15:20:14 -08:00
Seth Alves
33c1c3ac11 when a new particle-entity is created, hook the particle explorer to it 2017-02-15 15:19:49 -08:00
Seth Alves
076b0ed3ab get particle explorer working, again 2017-02-15 15:00:25 -08:00
Seth Alves
3ea0f6d2d2 allow lasers to scroll tablet while in edit-mode 2017-02-15 11:34:48 -08:00
David Kelly
5184cbe615 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2 2017-02-15 12:08:55 -07:00
Seth Alves
a19bc31a78 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-15 10:51:22 -08:00
Seth Alves
792c7ff51f PointerEvent will now relay keyboard modifiers 2017-02-15 10:41:56 -08:00
Faye Li
2388ec65fe Merge pull request #9659 from fayeli/users-fix 
Tablet Users Fixes
 2017-02-15 10:25:06 -08:00
Faye Li
8aae2aa5f0 simpler filter code 2017-02-15 10:23:36 -08:00
Faye Li
5ece3f1e1a use new users icon 2017-02-15 10:16:20 -08:00
Seth Alves
219e569014 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-15 07:25:39 -08:00
Philip Rosedale
01bdac49d0 Merge pull request #9672 from ctrlaltdavid/21121 
Fix far grabbing making entity jump upon grab
 2017-02-14 17:02:42 -08:00
Anthony J. Thibault
912e8aa04a Tablet buttons now work in toolbar. 
Switching between tablet and toolbar is not as dynamic as I'd like but it's a start.
 2017-02-14 15:37:24 -08:00
Anthony J. Thibault
f8055a027e Refactor of pal.js to dynamically switch between toolbar and tablet. 2017-02-14 15:34:24 -08:00
Seth Alves
838d7f6f10 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-14 13:58:18 -08:00
Seth Alves
3a23ec86d5 handles etc work better 2017-02-14 13:57:48 -08:00
David Rowe
625f5efdf8 Merge branch 'master' into 21164 
# Conflicts:
#	scripts/system/audio.js
 2017-02-15 10:00:52 +13:00
Chris Collins
442e8d68ef Merge pull request #9650 from kunalgosar/browserFix 
Added isAway (paused) property to myAvatar
 2017-02-14 11:16:07 -08:00
Dante Ruiz
46cfa7cf13 saving work 2017-02-14 07:46:31 -08:00
Dante Ruiz
61912b6ff0 saving work 2017-02-14 07:46:31 -08:00
Seth Alves
d40402faae Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-14 06:53:34 -08:00
Seth Alves
4393bc3c2e Merge pull request #9656 from humbletim/21114-part1 
CR-1 21114 -- ScriptCache/ScriptEngine cleanup, loader states, accessible load errors
 2017-02-14 06:49:05 -08:00
Seth Alves
30c46b89a0 Merge pull request #9668 from hyperlogic/feature/remove-tablet-color-effect 
Removed ColorOverlay from TabletButton, added more icon & text states
 2017-02-14 06:16:59 -08:00
David Rowe
2672b8d10a Fix tabs 2017-02-14 17:30:56 +13:00
David Rowe
61f8631a2b Fix far grabbing making entity jump upon grab 2017-02-14 17:30:20 +13:00
Faye Li
a57a0435c1 fix overlapping issue with the delete button 2017-02-13 15:13:10 -08:00
Anthony J. Thibault
1c783031b1 Removed ColorOverlay from TabletButton, added more icon & text states 
Now uses separate images for each state. Now tabletButtonProxy has 4 state properties, one for icon and images.

  * icon
  * hoverIcon
  * activeIcon
  * activeHoverIcon

  * text
  * hoverText
  * activeText
  * activeHoverText

Updated scripts to set new button states, if necessary.
 2017-02-13 15:09:46 -08:00
Faye Li
f981f21aa4 fix for ozan's domain 2017-02-13 11:47:58 -08:00
Atlante45
512bb4765f Add entity clicks capture capabilities 2017-02-13 11:34:30 -08:00
Faye Li
27057190ce display users even if they dont have a domain name 2017-02-13 11:01:37 -08:00
Faye Li
8cc8f2c7fd highlight current visibility option 2017-02-13 10:51:01 -08:00
Faye Li
6e0d7bb3cf make visibility settings into a modal for better readability 2017-02-13 10:42:07 -08:00
David Kelly
92ee823ef3 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2 2017-02-13 10:22:42 -07:00
humbletim
831bf93500 * refactor ScriptCache per FIXMEs 
* include error details in BatchLoader results
* update EntityServerScript properties in edtior to reflect more granular statuses
* ScriptEngine plumbing in prep for require/module integration
 2017-02-11 04:47:31 -05:00
David Rowe
77f0fb1491 Change the "Mute" tablet button to "Audio" 2017-02-11 22:40:19 +13:00
kunalgosar
a8f223518c modified away script to use MyAvatar.isAway property 2017-02-10 17:28:12 -08:00
Faye Li
65ca0c7e4a sticky header bar 2017-02-10 17:27:02 -08:00
Seth Alves
bd0b64c775 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-10 16:57:25 -08:00
Seth Alves
44aa3e044b make it so near grabbing while edit is active doesn't select a new entity 2017-02-10 16:56:53 -08:00
Faye Li
e28e16ea5e make drop down text a little bit bigger 2017-02-10 16:56:13 -08:00
Faye Li
0ba934f543 sort online users array alphabetically 2017-02-10 16:39:14 -08:00
Faye Li
8f43ceed9d filter out yourself from users online list 2017-02-10 16:22:30 -08:00
Seth Alves
fead52f626 put new-entity buttons in a tab of the edit app 2017-02-10 15:18:01 -08:00
Seth Alves
0b358a2ac7 finish hooking up new-model dialog 2017-02-10 13:29:06 -08:00
David Rowe
b5b92c1508 Make the tablet's mic icon reflect the current mute state 2017-02-11 09:53:02 +13:00
Seth Alves
3171ce1602 hook up more of new-model dialog 2017-02-10 12:03:26 -08:00
Brad Hefta-Gaub
765500ebce remove debug and fix bug in test script 2017-02-10 10:09:03 -08:00
Brad Hefta-Gaub
f6d4dbb7a4 some debugging 2017-02-10 09:18:04 -08:00
David Rowe
8a995cc1d2 Display list of audio input devices before list of audio output devices 2017-02-10 20:14:52 +13:00
David Rowe
9e3d8b0b6d Move the audio devices list into the root audio dialog 2017-02-10 20:11:20 +13:00
Brad Hefta-Gaub
7fba30f0dd add a test script to show binary message passing 2017-02-09 22:21:51 -08:00
David Kelly
5ca80803c0 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2 2017-02-09 20:01:43 -07:00
Seth Alves
7a63b07462 attempting to handle new-model dialog 2017-02-09 17:14:10 -08:00
Seth Alves
24fc9bbe67 honor HUDUIEnabled setting 2017-02-09 15:12:01 -08:00
Seth Alves
e12c77e576 move the edit tabs into tablet 2017-02-09 14:43:44 -08:00
Seth Alves
c4ac719d2c merge from upstream + cleanups 2017-02-09 14:26:29 -08:00
Seth Alves
4c3a6842a5 start on moving edit.js to tablet 2017-02-09 14:03:01 -08:00
Atlante45
72ed1add94 CR log spam cleanup 2017-02-09 13:04:43 -08:00
Atlante45
6fbe3c9187 Windows specific changes 2017-02-09 13:04:43 -08:00
Atlante45
43d2501993 Add HMD friendly window for the ESS log 2017-02-09 13:04:43 -08:00
Brad Hefta-Gaub
bc22326ec8 Merge pull request #9640 from ZappoMan/avatarSimulationStats 
New stats for avatar simulation
 2017-02-09 12:58:30 -08:00
Brad Hefta-Gaub
ae071aec0d add a bunch more stats for avatar processing 2017-02-09 09:52:09 -08:00