Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-04 22:20:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
54117 commits 74 branches 59 tags 1.2 GiB
Commit graph

2818 commits

Author SHA1 Message Date
Seth Alves
371118a6c0 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-14 16:26:30 -07:00
Zach Fox
b410399a16 Resolve your paths, silly! 2017-04-14 16:26:29 -07:00
Zach Fox
85e5173abe Fix embedded location 2017-04-14 16:11:37 -07:00
Zach Fox
f81dce5e70 Fix the bug 2017-04-14 15:42:19 -07:00
Chris Collins
6a6800b8c3 Merge pull request #10222 from sethalves/fix-late-touch-cant-grab-tablet 
fix can't grab tablet
 2017-04-14 14:57:06 -07:00
David Rowe
2731c13a5c Merge remote-tracking branch 'upstream/master' into 21249 2017-04-15 09:51:16 +12:00
Andrew Meadows
45bb639ef5 Merge pull request #10128 from kunalgosar/fingerpainting 
Make it easier to exit FingerPaint
 2017-04-14 14:34:57 -07:00
Seth Alves
110cfb47d1 turn off handControllerGrab debug prints 2017-04-14 14:23:27 -07:00
Seth Alves
6420ddd038 grab script checks for touch devices continually, rather than just when the script starts 2017-04-14 14:20:04 -07:00
kunalgosar
891d52909e fixed typo in comments 2017-04-14 14:10:19 -07:00
Sam Gateau
3519a72f8a Merge pull request #10190 from samcake/ambient-bis 
Introducing a tool to debug the current Zone Stack
 2017-04-14 13:28:59 -07:00
Seth Alves
d17d12446b Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-14 12:49:03 -07:00
Thijs Wenker
6f58e91d76 Merge pull request #10121 from birarda/bug/recording-cache 
cleanup Agent RSI handling, make loadRecording async
 2017-04-14 21:35:51 +02:00
Stephen Birarda
7b48feca66 address code review comments 2017-04-14 11:53:53 -07:00
Seth Alves
1009182c06 grab and handControllerGrab use new far-grab action 2017-04-14 11:52:07 -07:00
Seth Alves
af5a352f02 turn on handControllerGrab debug prints 2017-04-14 08:10:31 -07:00
David Rowe
f715850766 Display animated GIF while recording 2017-04-14 16:13:45 +12:00
David Rowe
08f4fc2cf9 Remove hover highlight from "x"s 2017-04-14 15:51:59 +12:00
David Rowe
c2d8755b15 Merge branch 'master' into 21249 2017-04-14 15:32:45 +12:00
David Rowe
11a2559df9 Use HiFi glyph for delete "x"s 2017-04-14 15:30:28 +12:00
David Rowe
5f333ee02c Style "i" button and info text 2017-04-14 15:14:39 +12:00
David Rowe
1d43e5a992 Style overall dialog layout 2017-04-14 15:12:36 +12:00
David Rowe
fd919f0db7 Play sounds during countdown and beep when recording starts and finishes 2017-04-14 10:34:15 +12:00
David Rowe
072e06123f Fix recording just made not being played 2017-04-14 10:02:15 +12:00
volansystech
70855b1c53 Improve the accuracy of Far to near Equip State. 2017-04-13 19:24:47 +05:30
David Rowe
75e4fb3820 On tablet with option enabled recording ends when open tablet or dialog 2017-04-13 19:28:40 +12:00
David Rowe
8f3789421f Show "busy" spinner when counting down or recording 2017-04-13 19:23:22 +12:00
David Rowe
9638b093d8 Fix number of available player instances being wrong on tablet 2017-04-13 18:55:02 +12:00
David Rowe
ff42715a15 Retain "Record" button's pressed state when close and reopen dialog 2017-04-13 18:41:55 +12:00
David Rowe
45ca8438fa Persist finish-on-open checkbox value to settings 2017-04-13 18:29:39 +12:00
David Rowe
b508d6882f Add checkbox that stops countdown/finishes recording when reopen dialog 2017-04-13 17:59:28 +12:00
David Rowe
84cfe1cb75 Don't close dialog when start recording; press "Record" again to finish 2017-04-13 17:00:35 +12:00
David Rowe
c369b1314a Remove countdown overlays 2017-04-13 16:32:03 +12:00
David Rowe
afd82f09c0 Provide instructions on running the AC player script 2017-04-13 15:18:04 +12:00
David Rowe
e21e15c064 Update warning dialog to refer to player "instance" 2017-04-13 14:01:37 +12:00
David Rowe
5ad44b6caf Display empty rows for unused players 2017-04-13 13:50:26 +12:00
David Rowe
24a68ea685 Report the numnber of free players rather than total number 2017-04-13 13:40:52 +12:00
David Rowe
464bc17491 Column heading for "unload" buttons 2017-04-13 13:40:20 +12:00
David Rowe
8bbce53f74 Reset player details when domain restarts or user teleports 2017-04-13 12:23:10 +12:00
Rob Kayson
2257af42be removed extra actions, creating all entities in create script. 2017-04-12 17:07:59 -07:00
Seth Alves
0dab94fada Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0 2017-04-12 16:34:46 -07:00
Seth Alves
0eb9507a10 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0 2017-04-12 16:25:50 -07:00
Zach Fox
3f91fb8e55 Remove unnecessary comment 2017-04-12 14:45:57 -07:00
Zach Fox
c724c2e50b New loading icon 2017-04-12 14:45:57 -07:00
Zach Fox
87b2d5bf8a New loading icon 2017-04-12 14:45:57 -07:00
Zach Fox
75f1168b19 Clearer function names 2017-04-12 14:45:57 -07:00
Zach Fox
7b92989b1d Fix it 2017-04-12 14:45:57 -07:00
Zach Fox
2579ac1baa It's working! 2017-04-12 14:45:57 -07:00
Zach Fox
e296383b1b Checkpoint! 2017-04-12 14:45:56 -07:00
volansystech
7bc3435cfa Initial Commit.. 
If distanceToObject from avatar is more than 15, we are accelarting entity travel by 2x.
This will help user to grab the entity in lesser time.
 2017-04-13 02:51:30 +05:30
David Rowe
7dddd266ba Merge branch 'master' into 21249 2017-04-13 08:39:32 +12:00
Seth Alves
026dde2e68 allow kinematic near-grab to be turned on or off for a given entity 2017-04-12 10:14:16 -07:00
volansystech
5639a3f92a Far to near grab: If the object is capable of being equipped, transfer from far-grab to an equipped state. 2017-04-12 20:08:26 +05:30
David Rowe
50a06db1b9 Display "REC" indicator when recording 2017-04-12 15:56:59 +12:00
David Rowe
f30dc4b560 Add a "record" button to initiate recording 2017-04-12 15:04:29 +12:00
David Rowe
905560b96d Remove checkbox and record-on-close functionality 2017-04-12 14:48:15 +12:00
Thijs Wenker
695c55bc3d fix teleport cool-in, added missing TARGETTING state and some ESLINT style fixes 2017-04-12 03:44:24 +02:00
David Rowe
3ae388bded Rework auto-playback 2017-04-12 13:32:34 +12:00
David Rowe
0d9e0ebfec Merge branch 'master' into 21249 2017-04-12 08:45:01 +12:00
Chris Collins
b07ed13023 Merge pull request #10184 from druiz17/snapshot-fix 
snapshot bug fixes
 2017-04-11 13:00:46 -07:00
samcake
79bcf95792 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis 2017-04-11 10:00:34 -07:00
volansystech
99af493ac8 Resolved the issue from the Initial commit - "grabbedEntity" stays into that grabbed position for a few seconds (hanging into mid of air) before dropping down automatically. 
Successfully converted far grab into near grab when entity is closer to the Avatar.
When Trigger is released after converted far grab into near grab far, the obect is dropped successfully.
 2017-04-11 21:57:01 +05:30
David Rowe
86baf785aa Add "Load" button 2017-04-11 15:23:09 +12:00
samcake
4a47737d0b REfining the Config behavior, trying to pr next 2017-04-10 19:01:49 -07:00
Dante Ruiz
daf25c1fe8 fix crashes when clicking in the homebutton 2017-04-11 00:25:08 +01:00
David Rowe
559fba39ab Remove avatar after stopping recording 2017-04-11 10:17:52 +12:00
David Rowe
9a9bcaf2ae Stop button stops playing recording 2017-04-11 09:37:57 +12:00
Dante Ruiz
382204a9a9 open feed after logging in 2017-04-10 22:33:07 +01:00
Dante Ruiz
df6498c67c fix snapshot login for toolbar-mode 2017-04-10 21:59:37 +01:00
Dante Ruiz
6922ba5c77 removed unnessary prints 2017-04-10 21:08:40 +01:00
Dante Ruiz
e0f19944bc Merge branch 'master' of github.com:highfidelity/hifi into snapshot-fix 2017-04-10 20:58:46 +01:00
Dante Ruiz
4e94aaa9e8 finished allowing to go back to previous app 2017-04-10 20:58:10 +01:00
David Rowe
bd63960876 Add table of recordings currently being played 2017-04-11 07:23:52 +12:00
David Rowe
0a19b502fd Merge branch 'master' into 21249 2017-04-11 07:04:05 +12:00
samcake
16e6f0900d Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis 2017-04-10 10:12:23 -07:00
David Rowe
9495bf6a47 Fix auto-playback logic 2017-04-10 19:56:46 +12:00
David Rowe
8e3bc31c36 Fix persisting new recording 2017-04-10 19:28:21 +12:00
David Rowe
b5bf7dc12f Tidying 2017-04-10 16:47:35 +12:00
Philip Rosedale
20307af4fe remove debug prints 2017-04-09 21:31:45 -07:00
Philip Rosedale
6bec948457 springhold, touch, nBody tutorial scripts 2017-04-09 21:29:33 -07:00
David Rowe
6a88398e8e Handle AC script not being able to create an entity 2017-04-10 15:55:05 +12:00
David Rowe
1cc215e14b Fix test that recording just made started playing 2017-04-10 15:31:38 +12:00
David Rowe
3b32a4f74f Address AC scripts claiming same entity to play 2017-04-10 15:04:54 +12:00
Anthony Thibault
746b7aadbd Merge pull request #10133 from sethalves/fix-teleport-which-something-equipped 
Fix teleport when something equipped
 2017-04-09 19:00:21 -07:00
David Rowe
6896fe3ac6 Merge branch 'master' into 21249 2017-04-10 09:05:57 +12:00
Sam Cake
b65448bcbe Trying to improve the Job/Task classes and testing it with the ZoneRenderer 2017-04-09 11:08:35 -07:00
David Rowe
d60d4d0755 Auto-play recording at start-up 2017-04-09 15:52:56 +12:00
David Rowe
adabcab888 Add invisible entity to persist playback of recording 2017-04-08 16:24:58 +12:00
David Rowe
d1e49cd926 Add and stub out stop, autoplay, and persistence to AC script 2017-04-08 14:57:37 +12:00
Rob Kayson
5ce70decfc Merge branch 'master' of github.com:highfidelity/hifi into W-21204-tetherball-toy 2017-04-07 19:26:02 -07:00
Rob Kayson
49858d3ec5 Equip stick instead of grab. String is less rigid. Fixed bug where the ball was not recognized when other clients equipped the stick. 2017-04-07 19:16:29 -07:00
Dante Ruiz
86c67a3017 tablet pages 2017-04-08 02:01:21 +01:00
Chris Collins
8e12f62cbb Merge pull request #10153 from druiz17/goto-fix 
Ability to toggle goto with the crt-l and enter keys
 2017-04-07 16:36:41 -07:00
David Rowe
ef4f3368f9 Play recording just made from original start position and orientation 2017-04-08 11:06:34 +12:00
David Rowe
ebe3561582 Merge branch 'master' into 21249 2017-04-08 10:46:16 +12:00
Brad Davis
91f8bf45b8 Merge pull request #10159 from highfidelity/revert-10158-revert-10157-brown 
Fixing the rendering bug triggered with Nvidia driver 381.65
 2017-04-07 09:53:41 -07:00
volansystech
e0b08a5e4e Initial Commit of far to near grab conversion. Works only if object drawn at chest level And Object is near by to hand. 2017-04-07 21:55:26 +05:30
Howard Stearns
5d341778c5 fix notification word wrapping 2017-04-07 07:08:19 -07:00
samcake
f82310545c Revert "Revert "Fixing the rendering bug triggered with Nvidia driver 381.65"" 2017-04-07 02:03:58 -07:00
samcake
ab3d39951e Revert "Fixing the rendering bug triggered with Nvidia driver 381.65" 2017-04-07 02:03:31 -07:00
Sam Cake
b1a4bc329b Introducing a fix to the graphics bug 2017-04-07 01:10:18 -07:00
Sam Cake
da1355dc32 Introducing a fix to the graphics bug 2017-04-07 01:03:07 -07:00
David Rowe
1ef5f048a3 Inform user if recording failed to start 2017-04-07 18:53:20 +12:00
David Rowe
ce898ae42a Play recording 2017-04-07 18:38:55 +12:00
David Rowe
75d970f5d5 Remove unresponsive players from list 2017-04-07 17:30:03 +12:00
David Rowe
81d8d238de Refactor log and error messages 2017-04-07 17:13:23 +12:00
David Rowe
5e55233934 Assignment client player script receives "play" command from recorder 2017-04-07 17:04:24 +12:00
David Rowe
506a414762 Lint fix 2017-04-07 14:06:16 +12:00
David Rowe
858e9650a3 Encapsulate recording methods in Recorder object 2017-04-07 14:03:08 +12:00
howard-stearns
b089fd03b8 make connection messaging when not logged in 2017-04-06 16:48:11 -07:00
David Rowe
68901c8af5 Merge branch 'master' into 21249 2017-04-07 11:04:43 +12:00
David Rowe
49907970fb Fix countdown showing if restart with dialog open and recording enabled 2017-04-07 11:01:11 +12:00
David Rowe
f164fe7532 Improve error handling 2017-04-07 10:46:40 +12:00
Dante Ruiz
a89081601c fix merge issues 2017-04-06 22:31:47 +01:00
Dante Ruiz
52fd446d4d toggle goto in tablet 2017-04-06 22:27:37 +01:00
Seth Alves
3c6429cdf3 Merge pull request #10103 from vladest/master-qml-bugfixes 
Master qml bugfixes
 2017-04-06 14:22:06 -07:00
Howard Stearns
f7ef587c61 Merge pull request #10138 from davidkelly/dk/3935 
Now you can forget connections
 2017-04-06 14:05:25 -07:00
David Kelly
34a2cefb98 Merge pull request #10132 from davidkelly/dk/analyticsForConnections 
initial analytics for connections
 2017-04-06 10:45:39 -07:00
David Kelly
a92162dea9 no mo useless debug statements 2017-04-06 08:50:22 -07:00
David Rowe
23c937e55d Make avatar recording and upload to asset server 2017-04-06 18:50:47 +12:00
David Rowe
a9f5b60319 Fix recording starting on tablet when close dialog rather than tablet 2017-04-06 15:32:42 +12:00
David Rowe
982c0ec559 Display countdown in overlay 2017-04-06 15:01:53 +12:00
David Kelly
61ece265f4 now you can forget connections 2017-04-05 18:16:16 -07:00
David Rowe
4580b89aa6 Add countdown delay before starting recording 2017-04-06 12:08:27 +12:00
Anthony Thibault
be2fdd9388 Merge pull request #10063 from hyperlogic/feature/vive-tracked-objects 
Vive: Expose all 16 tracked poses to the controller system
 2017-04-05 16:53:47 -07:00
David Rowe
096909d423 Close dialog if open when stop script 2017-04-06 10:10:07 +12:00
David Rowe
b8de31db12 Make toolbar icon close dialog if it's open 2017-04-06 10:09:41 +12:00
David Rowe
813a5684e3 Display instruction text only if recording is enabled 2017-04-06 09:22:01 +12:00
Seth Alves
2e4e10759f teleport raypick now ignores equipped or grabbed entities 2017-04-05 13:17:03 -07:00
Stephen Birarda
1b24538756 modify scripts to use new recording API 2017-04-05 11:18:52 -07:00
David Kelly
1b6bf90843 initial analytics for connections 2017-04-05 11:10:06 -07:00
David Rowe
b29bfd4bb4 Dialog instructions refer to tablet or window as appropriate 2017-04-05 17:49:13 +12:00
David Rowe
54a0bea8c0 Toolbar icon state and start/stop recording with window closing/opening 2017-04-05 17:48:35 +12:00
David Rowe
a625fd4523 Add dialog with "Enable recording" checkbox 2017-04-05 16:20:04 +12:00
David Rowe
d748068373 Stub new avatar recording script that records when tablet is hidden 2017-04-05 13:19:46 +12:00
Anthony J. Thibault
c33f10ca1b Recenter body on teleport, also it works more consistently. 
If your avatar happens to be squatting, your body will stand up straight after you teleport.
Also, setting MyAvatar.position can sometimes fail due to the multi-threaded nature of scripting.
Instead, teleport.js uses goToPosition to move the avatar, as a result teleport feels much more responsive now.
 2017-04-04 18:05:46 -07:00
kunalgosar
a5b10cc51e alert window to give directions 2017-04-04 15:35:38 -07:00
kunalgosar
b8500e45ad added tutorial 2017-04-04 15:35:38 -07:00
kunalgosar
d66038fff2 press B to exit finger painting 2017-04-04 15:35:38 -07:00
Seth Alves
b0b214012c Merge pull request #10118 from hyperlogic/bug-fix/tablet-restart-scripts 
Fix broken eventBridge on tablet after Reload All Scripts.
 2017-04-04 10:45:08 -07:00
Vladyslav Stelmakhovskyi
aa487faad1 Fixed No such signal QmlWindow_QMLTYPE_490::resized(QSizeF) and No such signal QmlWindow_QMLTYPE_490::moved(QVector2D) warnings 2017-04-04 16:59:09 +02:00
Seth Alves
d1827cf12c Merge pull request #10002 from fayeli/tablet-photobooth 
Photobooth Improvements: Using Tablet & Ability to Rotate Model
 2017-04-03 16:05:13 -07:00
Anthony J. Thibault
8ff457a1b6 Fix broken eventBridge on tablet after Reload All Scripts. 
The main issue here was the "webEventReceived" connection between the OffscreenQMLSurface and the TabletProxy object.
For whatever reason, if this is not a direct Signal to Slot connection, the webEventReceived event does not propagate.
 2017-04-03 16:03:55 -07:00
Faye Li
2ca4203d85 fix for submerge in floor issue 2017-04-03 12:57:51 -07:00
Faye Li
d726bd352d fix for locked camera state issue 2017-04-03 12:14:29 -07:00
Rob Kayson
6763ca9b27 added tetherball create and entity scripts 2017-04-03 11:55:47 -07:00
Anthony Thibault
999bd0d339 Merge pull request #10075 from sethalves/tablet-ui 
Tablet ui -- misc changes + landscape mode
 2017-04-03 10:43:34 -07:00
Seth Alves
b9e84691ad Merge pull request #10092 from ctrlaltdavid/dead-code 
Remove some dead code in edit.js
 2017-04-03 09:40:30 -07:00
Seth Alves
43e1cec8a3 merge from upstream 2017-04-03 06:28:59 -07:00
Chris Collins
3c62826ef9 Merge pull request #10091 from ctrlaltdavid/21248 
Fix HTML controls not working properly in the tablet
 2017-04-01 08:41:44 -07:00