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

170 commits

Author SHA1 Message Date
Anthony J. Thibault
b251dc9ed6 Tablet springboard can now be scrolled 2017-01-12 13:11:27 -08:00
Seth Alves
d072b1524a Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-05 15:27:11 -08:00
Anthony J. Thibault
94c6cc8e6a Added test script demonstrating event bridge on the tablet 2017-01-03 15:44:02 -08:00
Brad Hefta-Gaub
3c7fa41be9 update test script 2017-01-03 11:29:52 -08:00
Brad Hefta-Gaub
d440532cff make sure RPC is timely 2017-01-03 11:10:07 -08:00
Anthony J. Thibault
00980366d6 Merge branch 'master' into tablet-ui 2017-01-03 09:45:23 -08:00
Brad Hefta-Gaub
e6a20102d4 debug window enhancements 2016-12-21 11:31:34 -08:00
Brad Hefta-Gaub
c2320d317c Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam 2016-12-20 14:34:57 -08:00
Brad Hefta-Gaub
0448023a0f better handle null senders, trim lines after 2000 2016-12-20 14:14:28 -08:00
Anthony J. Thibault
ec38c4e319 Merge remote-tracking branch 'upstream/tablet-ui' into tablet-ui 2016-12-20 13:43:06 -08:00
Brad Hefta-Gaub
f8bae60361 make debug log autoscroll when you add new content to it 2016-12-20 11:27:18 -08:00
Brad Hefta-Gaub
2079b1ff7e cleanup comments 2016-12-20 10:45:36 -08:00
Brad Hefta-Gaub
6a7fa63327 classify ScriptEngine errors better, and send them as signal to JS 2016-12-20 09:00:01 -08:00
Seth Alves
dc996bee95 merge from upstream 2016-12-20 08:06:01 -08:00
Brad Hefta-Gaub
1e5e6a12db add support for an HMD script debug log window 2016-12-19 19:34:24 -08:00
Anthony J. Thibault
a791ddcc22 Tablet can switch to a web url. 
Help button has been updated to switch to the help.html.  It doesn't look good because
the content was authored expecting landscape window, not portrait.

The API is by no means final.  But it exposes two methods to JS.

* Tablet.gotoHomeScreen() - Used to forcefully go back to the home tablet "springboard", eventually this will
  hooked up to the tablet button.
* Tablet.gotoWebScreen(url) - Causes the tablet to switch from the home "springboard" and load a web url.

tabletTest.js and help.js have been updated to use this functionality.
 2016-12-19 17:52:19 -08:00
Brad Davis
9b0d0b3e7a Updates to tracing, removing log spam 2016-12-19 15:12:48 -08:00
Anthony J. Thibault
10f9233c90 Fixed js interface after recent Tablet.qml changes 
* TabletButton.inDebugMode defaults to false
* TabletButton now listens to onIsActiveChanged event to flip state of button.
* Fixed help.js and tabletTest.js to compensate for the removal of the TabletButton.color property
 2016-12-19 12:20:56 -08:00
Ryan Huffman
7bb2755913 Add chrome tracing support 2016-12-16 01:14:01 -08:00
Anthony J. Thibault
5441d33a25 Support for the ablity to change button properties from js. 2016-12-15 18:17:14 -08:00
Anthony J. Thibault
0add5274ac Add tabletTest.js to test adding and removing buttons from tablet UI 2016-12-15 16:50:20 -08:00
Brad Davis
2a43f5fbef Add test mode to interface 2016-12-12 14:51:11 -08:00
Faye Li Si Fi
78c96293a7 Staging cameras, lights, and backdrop 2016-12-09 17:25:18 -08:00
Seth Alves
dd3f3957a9 Merge pull request #9164 from fayeli/last-edited-property 
Exposing last edited property of Entity to Javascript
 2016-12-09 13:13:11 -08:00
Faye Li Si Fi
33142d6a7f mvp progress 2016-12-08 16:01:50 -08:00
Faye Li Si Fi
1644c2eeb4 added unit test 2016-12-08 11:17:38 -08:00
Ryan Jones
094857949d tabs -> spaces, remove raw ptr, remove unnecessary spec diff 2016-12-05 12:57:21 -08:00
Ryan Jones
39e1a3fb44 add client-side test runner 2016-12-04 20:53:06 -08:00
Ryan Jones
01ae2b9452 add errant semicolon 2016-11-29 11:56:11 -08:00
Ryan Jones
251b070db3 add unit test 2016-11-29 11:50:11 -08:00
Ryan Jones
3961dbcf55 revert changes to dev utils, apply changes to system utils 2016-11-28 17:18:31 -08:00
Ryan Jones
68e86da023 adjust indentation and implement editorconfig at root of repo 2016-11-28 17:10:59 -08:00
samcake
9031e65aa5 Merge and fix the bug!!! 2016-11-16 19:12:56 -08:00
samcake
f274ef1a59 Merging back with upstream and trying to fix counter for them to be more stable 2016-11-04 16:56:03 -07:00
samcake
6926cd274c Merge with upstream 2016-11-02 18:15:08 -07:00
howard-stearns
a64a1e2ee0 update agent script reference 2016-10-28 10:20:29 -07:00
howard-stearns
1efef36e03 spread out the start/stop of crowds, and allow control over how many are 
listening
 2016-10-27 12:31:36 -07:00
howard-stearns
237870d7c4 spread out the start and stop of crowds 2016-10-27 12:31:10 -07:00
howard-stearns
d69ea6b252 allow crowd-agent STOP command to take a delay time before it acts 2016-10-27 12:29:04 -07:00
Howard Stearns
58d14decbb linting 2016-10-25 19:07:52 -07:00
Howard Stearns
d8c5cdd910 fix reporting 2016-10-25 18:42:04 -07:00
howard-stearns
f7742b99a9 update crowd-agent reference 2016-10-25 15:35:11 -07:00
howard-stearns
65ac73bfc0 use s3 instead of gh-pages 2016-10-25 15:29:48 -07:00
howard-stearns
9561142c43 improvements 2016-10-25 14:58:27 -07:00
howard-stearns
2fbb2338c5 don't complain about other's finishedSound messages 2016-10-25 14:56:05 -07:00
Brad Davis
1bd398ae5e Report offscreen texture memory usage in stats 2016-10-21 11:31:37 -07:00
Brad Hefta-Gaub
6279b273fc Merge pull request #8867 from jherico/offscreen_textures 
Fix offscreen QML texture leak, improve texture sharing for same size surfaces
 2016-10-20 17:07:29 -07:00
Clément Brisset
b63eb6ba9f Merge pull request #8665 from zzmp/feat/audio-stats 
move audio stats to QML/JS, with graphs
 2016-10-20 16:43:49 -07:00
Seth Alves
96445f4dee Merge pull request #8861 from hyperlogic/feature/crowd-agent-attachment 
Added attachment support to crowd-agent
 2016-10-20 13:44:25 -07:00
Brad Davis
9523660027 Fix offscreen QML texture leak, improve texture sharing for same size surfaces 2016-10-20 11:55:25 -07:00