Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 11:42:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
54940 commits 71 branches 56 tags 1.2 GiB
Commit graph

2443 commits

Author SHA1 Message Date
Vladyslav Stelmakhovskyi
28447cde0b Get rid of QML errors in HMD mode. Sync Audio menu in Tablet/HMD without recreating menu items 2017-05-01 18:41:38 +02:00
CFresquet
72a6403eb0 Merge remote-tracking branch 'upstream/master' 2017-05-01 08:11:26 -07:00
CFresquet
28aaa545d8 Created RequestModule 2017-05-01 08:07:16 -07:00
Howard Stearns
f980d6f435 Merge branch 'master' of https://github.com/highfidelity/hifi into handshake-cleanup-2 2017-04-30 15:51:12 -07:00
Howard Stearns
e740fb67f4 convert foreign handString to jointIndex once, not often 2017-04-30 15:50:30 -07:00
Howard Stearns
bc9049cb42 remove extra joint search 2017-04-30 14:19:33 -07:00
Howard Stearns
292065a918 It may be possible to switch hands without endHandshake, and thus not reset currentHandJointIndex on updateTrigger. That was filled in later by startHanshake ONLY if there was already waiting avatars so that we didn't have wait. As a result, our distance measure would be from hips instead of hand. This changes it to always compute currentHandJointIndex on updateTriggers (and not elsewhere). 2017-04-30 13:32:21 -07:00
Howard Stearns
eca7292651 check your own location data on failure, and notify if it is wrong 2017-04-30 09:44:34 -07:00
Howard Stearns
92481bf475 standardize data init/clear 2017-04-30 08:04:46 -07:00
Vladyslav Stelmakhovskyi
3fe8675b0c Sync Tablet Audio and Desktop Audio menus 2017-04-30 12:39:36 +02:00
Howard Stearns
d41a911fd2 setupCandidate 2017-04-29 19:39:50 -07:00
Howard Stearns
18dbe3568c clarify names, particularly hand vs handString 2017-04-29 18:25:33 -07:00
Howard Stearns
9c83e21e17 fix that 2017-04-29 15:50:04 -07:00
Howard Stearns
d7a2e571a7 simplify animation load and code 2017-04-29 14:39:35 -07:00
Howard Stearns
274cc5b555 unique message for exceeding poll limit 2017-04-29 14:29:43 -07:00
Howard Stearns
84ac863a32 lint 2017-04-29 13:58:20 -07:00
Howard Stearns
b6ae0a5bde add nextTick, and cleanup 2017-04-28 20:06:13 -07:00
howard-stearns
f9debf1388 checkpoint 2017-04-28 16:53:08 -07:00
David Kelly
168cfa9b5d upping polling time plus min grip 2017-04-28 16:39:58 -07:00
David Kelly
a99c242646 increase minimum grip pressure to initiate handshake 2017-04-28 15:52:32 -07:00
Vladyslav Stelmakhovskyi
368334e07e Merge branch 'master' into audio-source-sync 2017-04-28 23:04:17 +02:00
Vladyslav Stelmakhovskyi
d18ac6dd49 Reimplemented Tablet Audio screen using C++ model 2017-04-28 23:02:28 +02:00
Seth Alves
4b0e7ceef5 show hand lasers when edit is enabled, but not if there are not hand-controllers 2017-04-28 10:24:04 -07:00
Howard Stearns
a2721d21ef Merge pull request #10278 from zfox23/newSnapshotReview 
New Snapshot Review Dialog
 2017-04-28 07:25:47 -07:00
Zach Fox
3f146fca9d Fix announcement audience; Fix disabled buttons 2017-04-27 15:36:59 -07:00
Seth Alves
2c2f51689a Merge pull request #10300 from vladest/tablet-edit-tocreate 
Renamed EDIT to CREATE
 2017-04-27 15:31:14 -07:00
Zach Fox
4152e44d2c Click anywhere on the image except the bottom to toggle share buttons 2017-04-27 14:01:08 -07:00
Zach Fox
3ce81844da Snapshot JS interface for better Settings handling 2017-04-27 14:01:08 -07:00
Zach Fox
794751abfa Nested objects aren't REAL! 2017-04-27 14:01:08 -07:00
Zach Fox
832e16ef86 Visual tweaks; fix active share buttons; comment out tests 2017-04-27 14:01:07 -07:00
Zach Fox
7297355183 Open ShareBar on P0 by default 2017-04-27 14:01:07 -07:00
Zach Fox
0ac660d4ab Cleanup 2017-04-27 14:01:07 -07:00
Zach Fox
b6601feb1d It's 5 already? 2017-04-27 14:01:07 -07:00
Zach Fox
a24a48843f Checkpoint 2017-04-27 14:01:07 -07:00
Zach Fox
b26f31704b Fix button state; use request() 2017-04-27 14:01:07 -07:00
Zach Fox
6711e8cbc2 Remove duplicate setting; Make settings page open; button state 2017-04-27 14:01:07 -07:00
Zach Fox
3221214283 New Snap FTUE flow 2017-04-27 14:01:07 -07:00
Zach Fox
92187e2424 Making progress towards file chooser dialog 2017-04-27 14:01:07 -07:00
Zach Fox
8c9cd0fad0 Custom social buttons; better testing functionality 2017-04-27 14:01:07 -07:00
Zach Fox
d461723012 Thanks to Jess, slightly different Tweet language 2017-04-27 14:01:07 -07:00
Zach Fox
d7348aabc8 Quick comment updates 2017-04-27 14:01:07 -07:00
Zach Fox
ef2e5f78ff Startings of needsLogin support 2017-04-27 14:01:07 -07:00
Zach Fox
e1789996fb Add announcements support 2017-04-27 14:01:06 -07:00
Zach Fox
f838e87f48 Pretty stable... 2017-04-27 14:01:06 -07:00
Zach Fox
7c5de1e60b Getting closer 2017-04-27 14:01:06 -07:00
Zach Fox
fad470eeea Checkpoint (this is complicated) 2017-04-27 14:01:06 -07:00
Zach Fox
eaa699bbfd Wow, it's really coming together! 2017-04-27 14:01:06 -07:00
Zach Fox
880bcf3b1e Checkpoint 2017-04-27 14:01:06 -07:00
Zach Fox
c08b40b950 Initial sharing code hooked up 2017-04-27 14:01:06 -07:00
Zach Fox
01e78612c7 Soooo much progress today 2017-04-27 14:01:06 -07:00
Zach Fox
16b4af8a9d Rearchitecture 2017-04-27 14:01:06 -07:00
Zach Fox
2880b22f9f External share buttons! 2017-04-27 14:01:06 -07:00
Zach Fox
4270086a22 Support 1 and 2 images 2017-04-27 14:01:06 -07:00
Zach Fox
0b4cd41d75 More and more progress! 2017-04-27 14:01:06 -07:00
Zach Fox
a4f428a6e6 Lots of progress 2017-04-27 14:01:06 -07:00
Zach Fox
7acdc86644 Progress 2017-04-27 14:01:05 -07:00
Zach Fox
0860352caa Checkpoint before switching to crash duty 2017-04-27 14:01:05 -07:00
Howard Stearns
88c3b4d9d3 Merge pull request #10258 from howard-stearns/watch-for-announcements 
watch for announcements
 2017-04-27 14:00:39 -07:00
Seth Alves
467505e421 Merge branch 'master' of github.com:highfidelity/hifi into grab-try-timer-instead-of-update 2017-04-27 10:33:04 -07:00
Delanir
27029eb8db Fix Code Standard 
Fix indent lines 2799-2800
Fix one line that had more than 128 columns wide
 2017-04-27 18:24:49 +01:00
Seth Alves
93f9716557 merge from upstream 2017-04-27 10:17:00 -07:00
Seth Alves
15661987be load tablet overlay models with higher priority 2017-04-27 10:16:08 -07:00
Vladyslav Stelmakhovskyi
1916eafc41 Trigger rebuild 2017-04-27 16:02:47 +02:00
Vladyslav Stelmakhovskyi
0d53b82326 Renamed EDIT to CREATE 2017-04-27 09:30:00 +02:00
volansystech
87ceebca82 Merge branch 'master' of https://github.com/highfidelity/hifi into 21200 
# Conflicts:
#	scripts/system/controllers/handControllerGrab.js
 2017-04-27 12:58:18 +05:30
Seth Alves
60453f8748 Merge pull request #10294 from ctrlaltdavid/record-for-marketplace 
Make record script able to be put on the marketplace
 2017-04-26 19:34:39 -07:00
David Rowe
9c7353deb2 Make record script able to be put on the marketplace 2017-04-27 11:22:25 +12:00
anshuman64
c088bd6891 Merge pull request #10271 from humbletim/21281 
CR Job #21281 -- Doppleganger Mirror
 2017-04-26 16:18:14 -07:00
Howard Stearns
7654823775 Merge pull request #10292 from thoys/make-connection-fix 
makeUserConnection.js Fix for alternative skeletons
 2017-04-26 16:02:16 -07:00
Zach Fox
9ace7a7488 Merge pull request #10279 from andrewd440/21174 
21174 Make the Particle Emitter Easier to Use
 2017-04-26 15:35:29 -07:00
humbletim
6e07933356 uncomment UserActivityLogger.logAction 2017-04-26 18:28:54 -04:00
humbletim
f8bbd9174c Merge remote-tracking branch 'upstream/master' into 21281 2017-04-26 18:26:15 -04:00
anshuman64
5bd9b2e631 Merge pull request #10130 from ctrlaltdavid/21249 
New avatar record and playback script
 2017-04-26 15:18:30 -07:00
humbletim
cabeced66e * changes per feedback and testing 
* add support for UserActivityLogger.logAction (commented-out, pending #10130)
* autodisable doppleganger when avatar changes model
* autodisable doppleganger when user moves to a different domain
* use ModelCache.prefetch for detecting model load status
* expose new signals to help keep activity logging and debugging decoupled
 2017-04-26 17:51:21 -04:00
Thijs Wenker
26173700b8 Merge pull request #10267 from Triplelexx/21287 
21287 - Newly created entities in Edit.js should be grabbable
 2017-04-26 23:16:04 +02:00
Thijs Wenker
bf81ae78b9 Merge branch 'master' of https://github.com/highfidelity/hifi into make-connection-fix 
# Conflicts:
#	scripts/system/makeUserConnection.js
 2017-04-26 22:52:57 +02:00
David Rowe
a68ee02e8d Log script start-up 2017-04-27 08:41:29 +12:00
Triplelexx
e295ab2778 change location of menu item Create Entities As Grabbable 2017-04-26 21:13:39 +01:00
Thijs Wenker
d05229d3b4 fix conversion 2017-04-26 22:11:56 +02:00
Thijs Wenker
20a9b60e7b this might make it work 2017-04-26 21:42:36 +02:00
Triplelexx
06b3b84145 changes from CR 2017-04-26 18:50:15 +01:00
Seth Alves
aeaa95b7a0 Merge branch 'master' of github.com:highfidelity/hifi into grab-try-timer-instead-of-update 2017-04-26 10:23:27 -07:00
Seth Alves
186b86e3d4 load stylus model before it's needed so that it will appear quickly 2017-04-26 10:23:20 -07:00
Seth Alves
37233b9fdb avoid a rare script-crash 2017-04-26 10:19:50 -07:00
Thijs Wenker
0363e96f34 Allow skeletons with different bone structures to become friends (still requires hands) 2017-04-26 18:55:50 +02:00
Thijs Wenker
a25584c90f ESLINT, style and spelling fixes 2017-04-26 18:51:55 +02:00
Zach Fox
3e24296996 Swap the two lines 2017-04-26 09:10:05 -07:00
Howard Stearns
0f8ee7051c lint 2017-04-26 08:20:12 -07:00
David Rowe
4581b9a0df Refresh countdown number upon reopening dialog 2017-04-26 20:13:21 +12:00
Triplelexx
01b11022e3 add menu item to control grabbable setting on newly created entites 2017-04-26 07:26:00 +01:00
humbletim
84c8b2945a detect and update doppleganger when user changes skeletonModelURLs; cleanup 2017-04-26 01:58:51 -04:00
David Rowe
06f56f024b Increase delay of checking a recording loaded to reduce false positives 2017-04-26 15:55:59 +12:00
David Rowe
c5f384d8fb Don't fade playback avatar when approaches observer 2017-04-26 14:02:45 +12:00
David Rowe
4a5f84f4b9 Merge branch 'master' into 21249 
# Conflicts:
#	libraries/audio-client/src/AudioClient.cpp
 2017-04-26 13:24:18 +12:00
David Rowe
c83f82f5da Delay start of recording until after beep finishes 2017-04-26 08:59:50 +12:00
Brad Hefta-Gaub
1962a49f3b Merge pull request #10225 from sethalves/bullet-constraints-1 
Bullet constraints + far-grab bootstrap fix
 2017-04-25 13:36:47 -07:00
humbletim
a833912399 cleanup and documentation 2017-04-25 16:30:05 -04:00
howard-stearns
ee9b953b1c typo 2017-04-25 12:12:26 -07:00
David Rowe
79346673ed Log user activity events in record and playback scripts 2017-04-25 13:43:28 +12:00
Andrew Lowry
5ffb8eba86 Initialize background color for color picker correctly. 2017-04-24 20:37:43 -04:00
humbletim
6f178ee1ec initial checkin of doppleganger module and tablet app scripts 2017-04-24 19:28:03 -04:00
Triplelexx
d689a43678 changes from CR 2017-04-24 22:07:51 +01:00
David Rowe
c0a258f9b3 Disable "load" button while making a recording 2017-04-25 09:04:26 +12:00
Triplelexx
d63c4d11c7 enable grabbable property for all newly created entities 2017-04-24 21:33:08 +01:00
David Rowe
d73fd6e08d Update AC script URL in info 2017-04-25 07:42:21 +12:00
Andrew Lowry
6a218eaca9 Embeds colpick color picker in dat.GUI for particle explorer. 
Cleans up eslint for particleExplorer.js.
 2017-04-24 13:35:37 -04:00
Andrew Lowry
aea89824c5 Switches tablet edit tab to particle explorer when particle entities are 
selected or created.
 2017-04-24 13:35:37 -04:00
Andrew Lowry
ecf3826050 Always show hand lasers when in edit mode. 2017-04-24 13:35:37 -04:00
Andrew Lowry
8479d835b2 Adds laser selection of particle systems while in edit mode in HMD. 2017-04-24 13:35:37 -04:00
volansystech
1abbca6737 Merge branch 'master' into 21200 2017-04-24 19:09:02 +05:30
howard-stearns
fac40f51d9 message waiting art 2017-04-21 16:00:23 -07:00
David Rowe
7fe0ba19b5 Don't display the "Record" button as pressed while recording 2017-04-22 10:05:02 +12:00
howard-stearns
ce7f3197f6 watch for announcements 2017-04-21 14:27:38 -07:00
Seth Alves
ec687bdb4b cleanups 2017-04-21 11:03:43 -07:00
Seth Alves
1e6b2682c9 use timers rather than relying on update calls 2017-04-21 10:17:57 -07:00
David Rowe
ce86ce4530 Red buttons to unload recordings 2017-04-21 19:45:14 +12:00
David Rowe
8060e98bd5 Right-align "i" icon and update info text 2017-04-21 17:46:30 +12:00
David Rowe
d064511121 Rearrange dialog controls 2017-04-21 17:01:29 +12:00
David Rowe
1aa6e20791 Change "Record" button to "Stop" while recording 2017-04-21 16:15:49 +12:00
David Rowe
477237cca2 Red "recording" ring animation with countdown numbers inside 2017-04-21 16:07:50 +12:00
David Rowe
aaf9b40bb3 New app icon 2017-04-21 15:20:08 +12:00
David Rowe
daedb94b04 Merge branch 'master' into 21249 2017-04-21 14:50:28 +12:00
David Rowe
076bf0943e Attach HMD "recording" indicator to camera 2017-04-21 10:33:24 +12:00
Stephen Birarda
3452dd0251 increment colspan count in table footer 2017-04-20 15:20:48 -07:00
Stephen Birarda
924624b127 add new glyphs with check, reference in entityList 2017-04-20 14:21:13 -07:00
Stephen Birarda
f64efe18c0 add an isBaked column to edit.js 2017-04-20 14:21:13 -07:00
volansystech
9e2899678a Resolving conflicts of #21206 2017-04-20 23:54:41 +05:30
volansystech
abc87c0338 Increased accuracy for converting far-grab to near-grab for every object 
Near-grab radius reduced to its default = 0.3
 2017-04-20 23:37:16 +05:30
Seth Alves
f7378abb08 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-20 02:40:10 -07:00
David Rowe
43619d1db1 Finish with TODOs 2017-04-20 14:22:54 +12:00
David Rowe
0da4e3e3c4 Display scrollbar in recordings table when needed 2017-04-20 14:19:25 +12:00
Brad Hefta-Gaub
a555846d5d Merge pull request #10235 from volansystech/21206 
21206 Far grab improvement to draw held entity toward yourself
 2017-04-19 14:33:09 -07:00
David Rowe
2108300272 Merge branch 'master' into 21249 2017-04-20 08:43:00 +12:00
Delanir
956d1e9d95 Fix Code Standard 2017-04-19 16:30:49 +01:00
volansystech
b194ddeb66 Resolve Comments of @sethalves 2017-04-19 16:39:23 +05:30
David Rowe
f7d87c4c28 Tweak start-up delay 2017-04-19 16:32:46 +12:00
David Rowe
00b6b2a2c0 Implement desktop recordings browser dialog 2017-04-19 12:34:59 +12:00
howard-stearns
3113dced7b Be sure to callback even on profile failure. 2017-04-18 12:06:44 -07:00
volansystech
e5c7587ad8 Improve far grabbing based on timescale. 2017-04-18 20:01:02 +05:30
David Rowe
dae6d6fb69 Stub desktop dialog to select recording to play from ATP assets 2017-04-18 11:43:42 +12:00
David Rowe
f920192244 Fix up script tear-down 2017-04-18 08:22:29 +12:00
volansystech
7e0efed062 Improve speed of grabbing. 2017-04-18 00:54:01 +05:30
David Rowe
7dcda47f95 Fix recording GIF still displaying when reopen tablet to stop recording 2017-04-16 12:57:37 +12:00
Seth Alves
db98020974 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-15 07:22:16 -07:00
David Rowe
15128faa49 Fix (work around) tablet access at Interface start-up crashing Interface 2017-04-15 17:11:03 +12:00
David Rowe
ef8f36026c Improve speed of starting playing animations at server start-up 2017-04-15 13:20:42 +12:00
David Rowe
e91cf4a4e8 Use "i" circle for info button 2017-04-15 12:50:00 +12:00
David Rowe
e7fb268843 Update to use modified Recording API 2017-04-15 12:18:50 +12:00
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