Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-14 04:16:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
48955 commits 74 branches 59 tags 1.2 GiB
Commit graph

185 commits

Author SHA1 Message Date
David Rowe
1f3045ad30 Merge branch 'master' into 21089 
Conflicts:
	interface/src/Application.cpp
 2016-12-13 14:05:24 +13: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
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
howard-stearns
90ebbb79c1 centered toolbar 2016-11-02 15:37:53 -07:00
David Rowe
427c8008c6 Merge branch 'master' into 21089 2016-11-03 09:18:25 +13:00
Zach Fox
b98c6cb50f Change 'Snapshot' to 'snapshot' and use smaller font 2016-11-01 14:49:18 -07:00
Zach Fox
c4b59eafbb Add 'Snapshot' text. My very first commit! 2016-11-01 14:09:25 -07:00
David Rowe
667a777695 Use Clara.io API for FBX downloads 2016-11-01 23:43:15 +13:00
David Rowe
e0ef24a460 Set auto adding for Clara downloads 2016-10-30 15:35:20 +13:00
David Rowe
12747d26e0 Add parameter that enables automatically adding download model to world 2016-10-30 13:58:17 +13:00
Howard Stearns
0eee6f8abd Merge pull request #8844 from huffman/fix/hud-position 
Update default system toolbar position
 2016-10-20 16:07:20 -07:00
Ryan Huffman
3ad039cadc Update default system toolbar position 2016-10-18 13:57:03 -07:00
Stephen Birarda
5682d51667 use the HFWebEngineProfile in Desktop.qml 2016-10-18 11:42:55 -07:00
Stephen Birarda
c4cec8eb1e use desktop profile again, move classes to networking subdir 2016-10-18 10:22:31 -07:00
Stephen Birarda
3ce47631b7 move the intercepted web engine profile to BaseWebView 2016-10-17 14:25:59 -07:00
Stephen Birarda
b4b5c648c2 use a QWebEngineProfile request interceptor for auth in HTTP header 2016-10-17 11:34:37 -07:00
David Rowe
31b35f0a35 Only raise keyboard if in HMD display mode 2016-10-12 09:43:33 +13:00
David Rowe
f8572096b1 Merge branch 'master' into 21055 2016-09-28 20:00:04 +13:00
David Rowe
bc8c400448 Fix up keyboards in attachments dialogs 2016-09-26 16:39:34 +13:00
David Rowe
023efe05f0 Move keyboard QML files 2016-09-25 09:54:48 +13:00
David Rowe
52137cb3c1 Put keyboard at bottom of scrolling dialogs rather than under controls 2016-09-24 11:40:38 +12:00
howard-stearns
17549348b4 less busy hotspotting, and make use of restricted feed (by protocol) 2016-09-22 16:48:16 -07:00
Howard Stearns
8e9b743515 rollover images 2016-09-21 19:15:01 -07:00
howard-stearns
41b20dc69d single feed with snapshot and concurrency, no radio buttons, mini-card 
has two hotspots that bring up different kinds of cards, and anywhere
 else on the minicard takes you "there".
 2016-09-21 16:00:29 -07:00
Seth Alves
753e4c4c7b keyboard for avatar attachment model url dialog 2016-09-12 16:49:10 -07:00
Seth Alves
2c0676d9b1 make qml keyboard work better in running-scripts dialog 2016-09-12 16:28:24 -07:00
Seth Alves
38a1556716 qml keyboard for running-scripts window 2016-09-12 13:28:46 -07:00
Brad Hefta-Gaub
3d54600843 Merge pull request #8513 from Atlante45/feat/network-port 
Add settings to change local port
 2016-09-08 18:10:32 -07:00
howard-stearns
b918e1ec51 fix system toolbar following upgrade to QT 5.6 2016-09-08 11:32:12 -07:00
SamGondelman
038aba20e4 disable dropshadows if unsupported (OSX and AMD cards) 2016-09-06 17:36:57 -07:00
Atlante45
a8de6f0a57 Add settings to change local port 2016-09-06 10:18:42 -07:00
James B. Pollack
d9ebad7976 Merge pull request #8372 from elisa-lj11/zip_project 
Added Clara.io to the marketplace
 2016-08-24 15:53:58 -07:00