Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-08 02:29:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
49797 commits 69 branches 58 tags 1.2 GiB
Commit graph

314 commits

Author SHA1 Message Date
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
Zach Fox
e940daf5b4 Comments and clarity 2016-12-19 10:20:08 -08:00
Zach Fox
aa837d8858 It's working! Untested on human avatars. 2016-12-19 10:20:08 -08:00
Zach Fox
2c5db54b08 Super close 2016-12-19 10:20:08 -08:00
Zach Fox
c9dc91900f Checkpoint 2016-12-19 10:20:08 -08:00
Faye Li Si Fi
edd1a02aa1 added debug mode 2016-12-19 09:19:36 -08:00
Faye Li Si Fi
434e7dfbbd reduce testing buttons number to 6 2016-12-19 09:13:12 -08:00
Faye Li Si Fi
01c5c2745d remove commented out code, added uuid property 2016-12-16 16:29:02 -08:00
Faye Li Si Fi
4d98f6979c hover state glow 2016-12-16 13:43:47 -08:00
Faye Li Si Fi
5200dd9581 New color scheme and button state styling 2016-12-16 11:50:04 -08:00
Anthony J. Thibault
3610beb2cd bug-fix found in code review 2016-12-16 09:57:12 -08:00
David Rowe
9459b967be Merge branch 'master' into 21089 2016-12-16 20:02:43 +13: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
5d1ccfbccc Tablet#removeButton now works properly 2016-12-15 15:49:37 -08:00
Anthony J. Thibault
8b99fa90e8 Merge branch 'master' into tablet-ui 2016-12-15 13:28:23 -08:00
Anthony J. Thibault
d2c4417b24 Hook up Help button to the new Tablet interface 2016-12-14 17:05:47 -08:00
Anthony J. Thibault
d4f9d21ce8 Pass tablet QQuickItem to TabletScriptingInterface 
Also, moved TabletScriptingInterface to script-engine library for easy access, baby.
 2016-12-14 14:04:48 -08:00
Faye Li Si Fi
a651e19bdd audio gradient bar length as a function of 0 to 1 2016-12-14 11:38:36 -08:00
howard-stearns
4503855ae8 don't keep selection while things are disappearing 2016-12-13 17:00:24 -08:00
howard-stearns
a50b731faa fix broken search for myself 2016-12-13 16:52:18 -08:00
howard-stearns
773bbc4ef1 update canKick whenever we get new data, instead of just at first use. 2016-12-13 16:30:16 -08:00
howard-stearns
00653b6b19 missing the ban button 2016-12-13 16:23:43 -08:00
Faye Li
53263789a0 fix relative path 2016-12-13 16:04:25 -08:00
howard-stearns
03d3e0b550 Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto 2016-12-13 16:03:00 -08:00
Faye Li
5b8e80654d button glow on hover 2016-12-13 16:01:50 -08:00
Faye Li
ad905ac6dc drop shadow on tablet buttons + set text at instantiation 2016-12-13 15:32:21 -08:00
Brad Hefta-Gaub
a2ba03284e Merge pull request #9186 from ZappoMan/kinectPlugin 
Kinect Plugin
 2016-12-13 15:29:41 -08:00
howard-stearns
b0a69468d2 Don't show admin columns if you can't kick. 2016-12-13 15:16:18 -08:00
howard-stearns
adbfa0752a no debug printing 2016-12-13 15:09:46 -08:00
howard-stearns
c9827d1521 checkpoint 2016-12-13 15:05:08 -08:00
howard-stearns
86010af828 checkpoint 2016-12-13 13:01:45 -08:00
Faye Li
8fcc42e537 overriding colors at tablet buttons instantiation 2016-12-13 12:34:38 -08:00
Howard Stearns
7c92ad5ced checkpoint 2016-12-13 09:15:28 -08:00
David Rowe
1f3045ad30 Merge branch 'master' into 21089 
Conflicts:
	interface/src/Application.cpp
 2016-12-13 14:05:24 +13:00
howard-stearns
712543a39a Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto 2016-12-12 16:37:41 -08:00
howard-stearns
4b5aae3c55 pal prototype 2016-12-12 16:37:16 -08:00
Seth Alves
d97be52542 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2016-12-12 16:24:17 -08:00
Zach Fox
7030c7b0a6 Space bubble improvements (#9142) 
* The space bubble around a player's avatar is now visualized. When another avatar enters a player's bubble, The bubble visualization will appear, a soft tone will play, and the "Bubble" HUD button will flash.
* The space bubble radius setting has been removed. Space bubble size now scales based on avatar scale.
* Space bubble collision detection is now more accurate and reliable.
* CTRL + N toggles the bubble.
* The "Bubble" HUD button has been moved to the proper location.
 2016-12-12 14:22:54 -08:00
Brad Hefta-Gaub
4959a88581 first cut at kinect input plugin 2016-12-08 22:13:56 -08:00
Anthony J. Thibault
319bb9ce78 Prototype of Tablet.qml hacked to appear on ALL web entities. 2016-12-08 15:31:00 -08:00
David Rowe
a75d0b3fe8 Merge branch 'master' into 21089 2016-11-30 14:50:51 +13:00
Anthony J. Thibault
9b0ce556e7 Added preferences for the Perception Neuron plugin. 
By default this plugin is disabled.
The server address and port number are also configurable.
 2016-11-23 10:10:00 -08:00
howard-stearns
81786bf819 animate suggestions when available 2016-11-21 16:46:10 -08:00
howard-stearns
5b57354624 crazy workaround for qt bug 2016-11-16 17:03:24 -08:00
howard-stearns
050d343849 styling changes 2016-11-16 15:54:11 -08:00
howard-stearns
b0518feee4 split ToolbarButton.qml into a stateful image part 2016-11-15 14:59:27 -08:00
howard-stearns
9809515853 styling 2016-11-15 14:12:27 -08:00
howard-stearns
6078b833a1 Merge remote-tracking branch 'origin/group-snapshots-by-place' into no-snapshots-welcome 2016-11-14 13:47:32 -08:00
Howard Stearns
fac5d1e12e group snapshots by place 2016-11-12 17:00:54 -08:00
Howard Stearns
17428d7ecb tab-like filtering of suggestions by type 2016-11-12 15:23:11 -08:00
David Rowe
84795439ea Display Clara.io download information 2016-11-10 16:29:48 +13:00
David Rowe
d33ac21aaa Merge branch 'master' into 21089 2016-11-08 08:23:10 +13:00
David Rowe
d1e54a9217 Fix Clara download failing if move mouse after initiating download 2016-11-04 10:49:16 +13:00
howard-stearns
3a072b5bf9 tell desktop about preference changes 2016-11-03 12:17:28 -07:00
howard-stearns
6aad78c8e8 Merge branch 'fogbugz_2028_part2' of https://github.com/zfox23/hifi into centered-toolbar 2016-11-03 11:23:47 -07:00
Zach Fox
9a22c29788 Get ready for merge 2016-11-03 11:20:08 -07:00
Zach Fox
b74c1d3476 tabs to spaces 2016-11-03 10:42:15 -07:00
Zach Fox
a12e0325bf Making progress... 2016-11-03 10:39:55 -07:00
howard-stearns
f3d4821579 constrain toolbar based on setting. (ui for settings to come.) 2016-11-03 10:39:53 -07:00