Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-22 13:33:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
49590 commits 75 branches 59 tags 1.2 GiB
Commit graph

272 commits

Author SHA1 Message Date
Anthony J. Thibault
3c2f9acd39 Hooked up EventBridge to TabletScriptingInterface. 2017-01-03 15:43:21 -08:00
Anthony Thibault
c201b6a7f9 Merge pull request #9256 from druiz17/moreButtons 
all hub button now on tablet
 2017-01-03 10:44:19 -08:00
Anthony J. Thibault
00980366d6 Merge branch 'master' into tablet-ui 2017-01-03 09:45:23 -08:00
Brad Davis
5b30f5da1b Merge pull request #9259 from zfox23/FixRunningScripts 
Fix "Running Scripts" window being inaccessible
 2016-12-23 15:37:24 -08:00
Zach Fox
72da05bb30 Merge pull request #9268 from zfox23/PalRefresh 
Add PAL refresh button
 2016-12-23 15:16:51 -08:00
Zach Fox
5490dddbbf Cool style changes! 2016-12-23 12:22:33 -08:00
David Kelly
9eed430f49 CR feedback 2016-12-22 18:09:19 -08:00
David Kelly
2e897e0cc9 Working first pass 
Seems roughly same as mic meter.  Works for other avatars, though
using agent avatars (crowd-agent.js + summon.js), seems not to work.

I'll investigate that...
 2016-12-22 14:01:03 -08:00
Zach Fox
d01500a7bb Fix the bug? 2016-12-21 17:53:30 -08:00
Dante Ruiz
cad9f66572 removed qml generated buttons 2016-12-21 23:35:46 +00:00
Zach Fox
7c51d47ae4 Better separator 2016-12-21 14:11:14 -08:00
Zach Fox
1eea3ed27d No more semicolons; tons of improvements 2016-12-21 12:48:26 -08:00
Zach Fox
630fb8696f Lots of progress today 2016-12-21 12:48:26 -08:00
Zach Fox
0be4db1e68 Checkboxes! 2016-12-21 12:48:26 -08:00
Zach Fox
9b65a72bb5 Popup essentially done 2016-12-21 12:48:25 -08:00
Zach Fox
5b77202c52 Popups wow! 2016-12-21 12:48:25 -08:00
Zach Fox
db2da8f06b Great cleanup 2016-12-21 12:48:25 -08:00
Zach Fox
7999e14ecf Kinda screwed things up by changing styles 2016-12-21 12:48:25 -08:00
Zach Fox
feafc16833 Frequent checkpoints are good. 2016-12-21 12:47:38 -08:00
Zach Fox
e7c2229b2c More progress 2016-12-21 12:46:23 -08:00
Zach Fox
deb40f67df Steady progress 2016-12-21 12:46:23 -08:00
Zach Fox
46c787512e Working 2016-12-21 12:46:23 -08:00
Zach Fox
5996228622 Starting off strong. 2016-12-21 12:46:23 -08:00
Anthony J. Thibault
ec38c4e319 Merge remote-tracking branch 'upstream/tablet-ui' into tablet-ui 2016-12-20 13:43:06 -08:00
Anthony J. Thibault
84db58dbc6 Make tablet.qml work on Web3DOverlay 2016-12-20 12:16:11 -08:00
Zach Fox
a18f9dbe90 PR comments; need particular fix on Master for full QA 2016-12-20 07:45:35 -08:00
Zach Fox
ba240854a7 Comments and clarity 2016-12-20 07:45:35 -08:00
Zach Fox
95e2f0687d It's working! Untested on human avatars. 2016-12-20 07:45:35 -08:00
Zach Fox
54774950d2 Super close 2016-12-20 07:45:35 -08:00
Zach Fox
9c09ec6755 Checkpoint 2016-12-20 07:45:35 -08:00
howard-stearns
641f98589a don't keep selection while things are disappearing 2016-12-20 07:43:48 -08:00
howard-stearns
db68a6adcd fix broken search for myself 2016-12-20 07:43:48 -08:00
howard-stearns
07ab771c2b update canKick whenever we get new data, instead of just at first use. 2016-12-20 07:43:48 -08:00
howard-stearns
d0cdd4d5c1 missing the ban button 2016-12-20 07:43:48 -08:00
howard-stearns
0e9b1b45f4 Don't show admin columns if you can't kick. 2016-12-20 07:43:48 -08:00
howard-stearns
5a97156151 no debug printing 2016-12-20 07:43:48 -08:00
howard-stearns
946d9aa346 checkpoint 2016-12-20 07:43:48 -08:00
howard-stearns
7e7ce0c103 checkpoint 2016-12-20 07:43:48 -08:00
Howard Stearns
b6b80fb9c1 checkpoint 2016-12-20 07:43:48 -08:00
howard-stearns
8d300eac76 pal prototype 2016-12-20 07:43:48 -08:00
David Rowe
1987719cfd Display Clara.io download information 2016-12-20 07:33:55 -08:00
David Rowe
b672b7e177 Fix Clara download failing if move mouse after initiating download 2016-12-20 07:33:55 -08:00
David Rowe
7f809083dc Use Clara.io API for FBX downloads 2016-12-20 07:33:55 -08:00
David Rowe
a4b2077d5a Set auto adding for Clara downloads 2016-12-20 07:33:55 -08:00
David Rowe
467741f348 Add parameter that enables automatically adding download model to world 2016-12-20 07:33:55 -08:00
Chris Collins
61c60fca2d Merge pull request #8968 from ctrlaltdavid/21089 
Clara.io marketplace improvements
 2016-12-19 18:21:45 -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
Anthony J. Thibault
856791c11d Made TabletRoot.qml the main tablet qml file. 
This file uses a Loader node to load, Tablet.qml.
 2016-12-19 15:15:16 -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
Zach Fox
a912fec496 PR comments; need particular fix on Master for full QA 2016-12-19 10:20:08 -08:00