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

1406 commits

Author SHA1 Message Date
Seth Alves
89d7b8bfc6 call releaseEquip when an equipped entity is dropped with a secondary press 2017-01-17 13:27:01 -08:00
Seth Alves
5c205f5800 avoid an unhook loop if two different hands have passed something back and forth more than once 2017-01-17 10:24:30 -08:00
David Kelly
2460e89a57 CR feedback 2017-01-17 09:53:04 -08:00
Seth Alves
1eb7b668bf merge from upstream 2017-01-17 09:33:49 -08:00
Seth Alves
6bace4f451 merge from upstream 2017-01-17 09:29:30 -08:00
David Kelly
6c07a9aece remove debuggng logspam 2017-01-16 19:06:36 -08:00
David Kelly
6c701bb0f0 remove ignored avatars from PAL when they disconnect 2017-01-16 18:22:53 -08:00
David Rowe
a1fe908380 Remove a lingering line of old code 2017-01-17 12:56:56 +13:00
howard-stearns
0a3236dcc9 handControllerGrab update loop change 2017-01-16 14:54:32 -08:00
David Kelly
95aad3140d Merge pull request #9386 from davidkelly/dk/manageAudioIntervalInPal 
Manage audio interval timer in PAL
 2017-01-16 11:29:05 -08:00
Zach Fox
32e330320e Cleanup after rebase 2017-01-16 11:26:57 -08:00
Zach Fox
6e4a4da92a Checkpoint 2017-01-16 10:42:29 -08:00
Seth Alves
23ea65e2b5 more changes to handle camera-relative-controller joints. 2017-01-16 10:26:16 -08:00
Seth Alves
b617b3a114 put code to delete prim-stylus tip back in 2017-01-16 07:50:36 -08:00
Seth Alves
756d96c368 fix search ray getting left on. started adding stylus models 2017-01-16 07:46:12 -08:00
Seth Alves
c2d6bf10d2 hard-code dimensions on home-button so that it doesn't sometimes show-up with the wrong size 2017-01-16 06:47:50 -08:00
Seth Alves
4a451e95dc don't call release when off state is entered. don't attempt to unhook stylus as a stray child 2017-01-15 11:29:29 -08:00
Seth Alves
b8234ad75c try a different way of keeping track of original parentIDs of grabbed entities 2017-01-15 10:16:28 -08:00
David Kelly
baed3bc3b3 Manage audio interval timer in PAL 
Now, it is only running when PAL is up.  Was running (but doing nothing
before.  Somewhat more efficient this way.
 2017-01-14 12:57:00 -07:00
Seth Alves
e46b40e729 adjust overlay position so that it shows up on new tablet fbx 2017-01-13 16:14:12 -08:00
Seth Alves
e00814dd53 auto-end a near-grab if the parentID is changed to something else 2017-01-13 14:21:44 -08:00
Zach Fox
b9cddc31a9 Checkpoint before implementing Ken's suggestions 2017-01-13 13:00:03 -08:00
Zach Fox
8bb200902f First pass 2017-01-13 12:57:35 -08:00
Seth Alves
9430d2a58d get marketplace-in-tablet working again 2017-01-13 11:03:02 -08:00
Seth Alves
9de8144f0d merge from upstream 2017-01-13 10:17:03 -08:00
Seth Alves
f9a36d68ad Merge pull request #9363 from ctrlaltdavid/21127 
Make Clara.io downloads convert textures to PNG
 2017-01-13 10:14:43 -08:00
Seth Alves
208c4686c4 merge from upstream 2017-01-12 15:44:27 -08:00
David Rowe
d7ab7316a8 Tidying 2017-01-13 12:28:53 +13:00
David Rowe
ad5822d96d Fix first progress message box not closing 2017-01-13 12:26:42 +13:00
David Rowe
632989e031 Fix progress messages not displaying in HMD 2017-01-13 12:09:22 +13:00
Seth Alves
b4870a14fa Merge pull request #9372 from druiz17/removeHud 
Completely removed HUD
 2017-01-12 14:24:40 -08:00
David Rowe
6f2386eabd Fix processing of Clara.io status messages 2017-01-13 11:20:00 +13:00
Seth Alves
9c148d2be0 Merge pull request #9370 from sethalves/tablet-ui-no-accidental-static-on-release 
make sure dynamic things are moving at least a little upon release
 2017-01-12 13:46:50 -08:00
Seth Alves
611a926894 if something dynamic is release and it's not moving, give it a little velocity so that it doesn't end up non-active in bullet 2017-01-12 13:45:03 -08:00
Dante Ruiz
71083645e9 branch update 2017-01-12 20:51:25 +00:00
David Rowe
4dee0efdd3 Use more reliable Clara.io API parameters 2017-01-13 09:12:49 +13:00
Dante Ruiz
a16b229c65 begining to remove hud items 2017-01-12 10:49:45 -08:00
Dante Ruiz
7d84aae670 closing tablet when taking snapshot 2017-01-12 17:29:38 +00:00
David Kelly
e36f6b6521 Merge branch 'master' of github.com:highfidelity/hifi into dk/letsHover 2017-01-12 08:40:04 -07:00
David Rowe
d45e6f00cb Prepare only one download at a time 2017-01-12 22:35:42 +13:00
David Rowe
288c069687 Make cancelling downloads more robust 2017-01-12 22:31:09 +13:00
David Rowe
6e622b3719 Don't request model be centered as work-around for downloads failing 2017-01-12 21:35:24 +13:00
David Rowe
cbe8ce0c19 Improve handling of zip file generation failing 2017-01-12 21:33:32 +13:00
David Rowe
9587b6a80e Fix initial marketplace URL 2017-01-12 20:53:57 +13:00
David Rowe
37da800a14 Display Clara model preparation progress 2017-01-12 15:47:41 +13:00
howard-stearns
88c2c534ad don't set bogus values 2017-01-11 17:01:46 -08:00
howard-stearns
9298bcf628 remove log spam 2017-01-11 16:32:15 -08:00
howard-stearns
5c06841732 use update signal instead of timer 2017-01-11 16:24:05 -08:00
howard-stearns
357b4db1db fix mouse vs lasers, again 2017-01-11 14:24:24 -08:00
howard-stearns
a808a8c749 revert "fix competition between seek mouse and lasers" 2017-01-11 14:23:18 -08:00
David Kelly
1e3a00d1fb Enable the LT and RT signals, use them 
A bit cleaner.  Still have to keep track of which hand is the mouse, but
this removes some of the hacky code.
 2017-01-11 14:43:37 -07:00
David Rowe
9bdcdf73c1 User must be logged into Clara.io site to download 2017-01-12 09:15:01 +13:00
Seth Alves
c76987c179 Merge pull request #9351 from sethalves/tablet-ui-show-lasers-when-scrolling 
update lasers when distance-scrolling a web entity/overlay
 2017-01-11 10:45:25 -08:00
Seth Alves
bacc796730 Merge branch 'master' of github.com:highfidelity/hifi into update-tablet-ui-again 2017-01-11 09:54:26 -08:00
Dante Ruiz
2d8d5401dc updated tablet position 2017-01-11 08:41:07 -08:00
David Rowe
71d6a5cb1d Implement model request and download 2017-01-11 21:33:03 +13:00
David Rowe
530b176d09 Replace Clara download button with own 2017-01-11 16:36:18 +13:00
David Kelly
0a018e133d Blue laser should be enough to hover 2017-01-10 18:23:39 -07:00
Seth Alves
c93d83dadd update lasers when distance-scrolling a web entity/overlay 2017-01-10 16:41:07 -08:00
Dante Ruiz
0b3a7d90f1 removed committed code 2017-01-10 23:26:37 +00:00
David Kelly
4fade3a53e CR feedback 2017-01-10 16:12:02 -07:00
David Kelly
5fd11ade9c minor tweak to hover color for glow effect 2017-01-10 16:00:19 -07:00
Dante Ruiz
d0baa0e303 home button works with the stylus 2017-01-10 14:51:46 -08:00
David Kelly
2d55ed2658 Fix hover - probably my merge didn't get this line 2017-01-10 15:51:24 -07:00
druiz17
ad48e79053 Merge pull request #9346 from hyperlogic/tablet-ui 
In desktop mode, tablet is in front of camera.
 2017-01-10 14:48:15 -08:00
David Kelly
17333ee307 Merge branch 'master' of github.com:highfidelity/hifi into dk/letsHover 2017-01-10 15:24:31 -07:00
druiz17
85c143e64d Merge pull request #9347 from sethalves/tablet-ui-grab-no-patch 
remember previous parentID in the script and try to put it back when releasing
 2017-01-10 14:08:08 -08:00
David Kelly
5c6ae6fe95 HMD hover working now 
Had to hack a bit -- the trigger mappings were not firing so instead I
just get the hand that is triggering (when HMD is active) and handle the
hover almost as before, with mouse move events.  Some thought about how
to map a 'mouse move' event into something where 2 triggers can both be
pressed at same time was in order.
 2017-01-10 14:47:34 -07:00
Anthony J. Thibault
3f0860f9c3 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-01-10 13:35:29 -08:00
Anthony Thibault
e7a88b5a3c Merge pull request #9343 from druiz17/menuApp 
Moved the context menu to the tablet
 2017-01-10 13:34:44 -08:00
howard-stearns
e67675ac36 color nodes by audio level 2017-01-10 13:24:38 -08:00
howard-stearns
42b2b2154e store audio level in overlay data object (so that they gc properly and we 
have the data to color with).
 2017-01-10 13:08:07 -08:00
Seth Alves
0fc1abc068 remember previous parentID in the script and try to put it back when releasing 2017-01-10 13:00:49 -08:00
Anthony J. Thibault
9db6806026 In desktop mode, tablet is in front of camera. 
* added a new fauxJointIndex for the camera. CAMERA_MATRIX_INDEX = -7
  this can be used to attach objects to the camera.
* WebTablet.js has been changed to detect when entering and exiting HMD mode
  to move the tablet appropriately.

There's a known bug with the tablet entity position lagging the camera by one frame.
 2017-01-10 11:31:45 -08:00
Seth Alves
bff9e9be38 put back code that replaces previous parentID on release 2017-01-10 09:22:36 -08:00
Dante Ruiz
2fc76d64fd clean up unused code and files 2017-01-10 09:13:46 -08:00
Dante Ruiz
6c51edec77 added context menu to tablet 2017-01-10 09:13:45 -08:00
Dante Ruiz
c99f897db1 first commit 2017-01-10 09:13:45 -08:00
Seth Alves
eb4a2b0af5 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-grab-no-patch 2017-01-10 09:13:34 -08:00
druiz17
28c8d527df Merge pull request #9340 from fayeli/tablet-hide-yellow 
Ability to disable yellow highlight around Web Overlays
 2017-01-10 09:11:51 -08:00
Seth Alves
61f0c56a36 remove code that remembers previous state in userData 2017-01-09 14:20:03 -08:00
Faye Li Si Fi
32eda3a49c redo 2017-01-09 14:02:14 -08:00
Faye Li Si Fi
c39eb6294e undo 2017-01-09 14:01:59 -08:00
Faye Li Si Fi
5323e7f34d set showKeyboardHighlight to false when initialising tablet 2017-01-09 13:36:58 -08:00
Seth Alves
fa803aebe9 use /~/ style to reference includes 2017-01-09 10:21:07 -08:00
David Kelly
fef8c8900f Merge branch 'master' of github.com:highfidelity/hifi into dk/letsHover 2017-01-09 08:51:42 -07:00
David Kelly
409e785aa3 fix un-hover, add some comments 2017-01-09 08:42:43 -07:00
David Kelly
5eff12af34 add hover effect to PAL 2017-01-06 18:09:23 -07:00
Dante Ruiz
7205215baa coding standard fix 2017-01-07 00:38:39 +00:00
Dante Ruiz
07079ad78d fixed bug 2017-01-07 00:22:55 +00:00
Dante Ruiz
4ef5c76a65 fixed issues 3.0 2017-01-07 00:08:53 +00:00
Dante Ruiz
55e7b46790 fixed issues 2.0 2017-01-07 00:07:38 +00:00
Dante Ruiz
cec2692c77 fixed issues 2017-01-07 00:06:42 +00:00
Dante Ruiz
32938861cd indentation fix 2017-01-07 00:03:04 +00:00
Dante Ruiz
31e57a0dcd update branch 2017-01-06 15:35:32 -08:00
Dante Ruiz
19c6a672d9 re-did tablet position 2017-01-06 15:35:32 -08:00
Seth Alves
20a84e7288 Merge pull request #9322 from sethalves/tablet-ui-reenable-web-lasers 
Tablet ui reenable web lasers
 2017-01-06 15:23:16 -08:00
Seth Alves
ad6175857d Merge pull request #9328 from hyperlogic/tablet-ui 
Allow Hifi.SoundEffect to be used in all qml
 2017-01-06 15:21:08 -08:00
Anthony J. Thibault
0860c50a49 Allow Hifi.SoundEffect to be used in all qml 
Including webEntities, webOverlays and the system tablet.
We might want to add this to enable spatial sound effects for the web keyboard.
 2017-01-06 14:01:13 -08:00
Seth Alves
d32866c8cd Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-reenable-web-lasers 2017-01-06 13:32:47 -08:00