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

262 commits

Author SHA1 Message Date
Brad Davis
4f975de6a6 Working on crash fixes, file open dialog 2016-01-12 12:40:43 -08:00
Brad Davis
21534cbde0 Layout for running scripts 2016-01-12 12:40:42 -08:00
Brad Davis
d28f80aa07 Moving running scripts functionality to scripting library 2016-01-11 12:44:03 -08:00
Brad Davis
d74686474a Ensure VR menus never render off the overlay 2016-01-10 11:39:47 -08:00
Brad Davis
35e17b7604 movable audio bar 2016-01-07 15:43:51 -08:00
Brad Davis
144af19ebd Stop looping on URL fixing 2016-01-07 10:52:28 -08:00
Brad Davis
44b9bc7115 Force active focus on the address bar line while address bar is visible 2016-01-06 11:10:05 -08:00
Brad Davis
1b82200ecb Address some z-ordering issues in overlay windows 2016-01-06 10:58:56 -08:00
Andrew Meadows
62688d5c07 Merge pull request #6768 from jherico/vr_keys 
Tweaks for supporting the new QML UI
 2016-01-05 10:31:57 -08:00
Andrew Meadows
43d8c14c16 Merge pull request #6767 from howard-stearns/pid-render-limits 
render limits fixes
 2016-01-05 10:17:04 -08:00
Brad Davis
8485c89a0e More work on exposing tools to QML overlay windows 2016-01-04 20:51:52 -08:00
Brad Davis
56ee48a084 Working on focus problems 2016-01-04 20:51:51 -08:00
Brad Davis
e6b59cb0a1 Make it easier for QML dialogs to access the global menu, manipulate the overlay desktop 2016-01-04 20:51:50 -08:00
Brad Davis
41dcc3d52b QML dialogs should not consume key events when disabled 2016-01-04 20:51:49 -08:00
Brad Davis
125d103e29 Merge pull request #6762 from ZappoMan/hideMirrorAndAudioInHMD 
hide the rear view mirror and the audio in the HMD
 2016-01-04 18:03:33 -05:00
Andrew Meadows
164c649a33 Merge pull request #6681 from howard-stearns/pid-render-limits 
Pid render limits
 2016-01-04 14:47:31 -08:00
howard-stearns
333eadd551 Don't show render count / distance when using acuity. 2016-01-04 14:46:57 -08:00
Brad Hefta-Gaub
f719f4a1cc hide the rear view mirror and the audio in the HMD 2016-01-04 13:31:01 -08:00
Howard Stearns
9c8a04ce1e Merge branch 'master' of https://github.com/highfidelity/hifi into pid-render-limits 2016-01-04 09:26:14 -08:00
Brad Davis
297e58fbc6 Cleanup 2016-01-03 20:29:31 -08:00
Brad Davis
435ab8c4e8 Fix possible log spam issue 2016-01-03 20:22:55 -08:00
Brad Davis
bfa9213a10 Allow keyboard navigation of 'vr menu' 2016-01-03 20:22:39 -08:00
Brad Davis
67e32cc1f0 Consolidating URL handling, exposing to all QML objects 2015-12-31 14:14:48 -08:00
Brad Davis
a834f28eca Add a tag to the top level QML dialog so loaded content can manipulate it easily 2015-12-30 17:14:03 -08:00
Brad Davis
f4bd2afc8e Make script launched windows invisible at creation time 2015-12-30 11:38:34 -08:00
Brad Davis
d6f5296c3b Working on event bridge and scripting interfaces 2015-12-30 09:14:50 -08:00
Brad Davis
0901e3aae1 Support QML and Web content in overlay windows 2015-12-30 09:14:49 -08:00
Brad Davis
95c524fba1 Fixing authentication token for followed links 2015-12-21 15:44:35 -08:00
Brad Davis
6ef77bc46a Support the marketplace in QML 2015-12-21 11:34:03 -08:00
Brad Davis
ae6cf131f5 Fixing crash bug 2015-12-18 17:19:06 -08:00
Brad Davis
6098c4a1d6 Revert "Revert "Migrate QML based web views to Qt WebEngine"" 
This reverts commit 1f3adeb666.
 2015-12-18 17:18:46 -08:00
Brad Davis
1f3adeb666 Revert "Migrate QML based web views to Qt WebEngine" 2015-12-18 17:09:38 -08:00
Brad Davis
16dd24f3d8 Removing unused LGPL JS file 2015-12-18 13:02:45 -08:00
Brad Davis
5088eec2a2 Move directory web UI into the overlay 2015-12-17 12:23:39 -08:00
Brad Davis
fa5bab08b1 Support web content inside QML 2015-12-16 16:25:38 -08:00
howard-stearns
09d4a06ad4 LODManager-centric stats and preferences. 2015-12-16 15:30:48 -08:00
Brad Hefta-Gaub
2815cb0fef first cut at adding advanced and developer menu groupings 2015-12-12 18:12:36 -08:00
Brad Davis
b9ace94ff1 Prototyping threaded present 2015-12-04 10:28:16 -08:00
Howard Stearns
f6286201f4 cleanup 2015-11-19 11:55:22 -08:00
Howard Stearns
fee13d4375 Rebuild on a new branch after original stopped building. 2015-11-17 20:06:25 -08:00
Brad Davis
cb26fc67fc Move recording interface back to float/seconds 2015-11-16 14:44:22 -08:00
Brad Davis
a9aea9b477 Working on TestController display 2015-10-22 15:53:19 -07:00
Brad Davis
8c163a52e9 Attempting to fix log graphs 2015-10-22 15:49:58 -07:00
Brad Davis
5d4cbfdacb Resolving ambiguity between functions and inputs differently 2015-10-22 09:50:24 -07:00
Brad Davis
4938e5ea84 Fixing function based routes, makeAxis 2015-10-22 09:50:23 -07:00
Brad Davis
afcec347ff Wiring yaw action to avatar 2015-10-21 21:35:19 -07:00
Brad Davis
044a28212d Wiring step yaw to the avatar 2015-10-21 20:44:38 -07:00
Brad Davis
637654adea Wiring up step yaw 2015-10-21 18:46:09 -07:00
Brad Davis
4a1df286fd Cleanup of enums and JS names 2015-10-21 15:57:37 -07:00
Brad Davis
b9b03bd842 Working on conditional and filter parsing 2015-10-21 14:40:33 -07:00
Brad Davis
bea6fdd890 Working on JSON parsing and cleanup 
Conflicts:
	libraries/controllers/src/controllers/Route.cpp
	libraries/controllers/src/controllers/ScriptingInterface.cpp
	libraries/controllers/src/controllers/StandardController.cpp
	libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
 2015-10-20 10:20:28 -07:00
Brad Davis
ef6c4f6f66 Working on JSON parsing and cleanup 
Conflicts:
	libraries/controllers/src/controllers/Route.cpp
	libraries/controllers/src/controllers/ScriptingInterface.cpp
	libraries/controllers/src/controllers/StandardController.cpp
	libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
 2015-10-20 10:15:36 -07:00
Brad Hefta-Gaub
56f625d376 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-19 16:53:25 -07:00
Brad Hefta-Gaub
110adc5c22 fix model LOD behavior 2015-10-19 15:21:25 -07:00
Brad Davis
22602fb6f6 Fixing line endings 2015-10-19 10:00:16 -07:00
Brad Davis
184303d3c9 Using JS mappings for joystick, updating test code 2015-10-18 20:44:32 -07:00
Brad Davis
734a39f962 Breaking up UserInputMapper, restoring some mappings 2015-10-18 18:58:03 -07:00
Brad Davis
57be59935d Move controller test to app 2015-10-17 19:13:38 -07:00
Anthony J. Thibault
0cebeb7fe9 Separated AvatarMixer inbound and outbound bandwidth on stats overlay 
Also, small bug fix to BandwidthRecorder. It would incorrectly
calculate outbound pps if the input pps was 0.
 2015-10-07 15:32:10 -07:00
Atlante45
b37bf2b1b6 Remove extra debug 2015-10-01 13:18:22 -07:00
Brad Hefta-Gaub
dc9c774eb5 merge model part quads and triangles together to reduce the number of draw calls 2015-09-21 13:09:43 -07:00
Howard Stearns
eb67254e54 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-08 16:54:14 -07:00
Stephen Birarda
80cf7b6c76 resolve conflicts on merge with upstream/master 2015-08-27 14:50:04 -07:00
Howard Stearns
0e18395fd0 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-08-26 12:04:28 -07:00
Brad Davis
0aaa07a2de Remove items from the QML version of the menu when they are removed from the main menu 2015-08-25 19:05:29 -07:00
Ryan Huffman
dc5d5cbb63 Add asset server ping to stats 2015-08-25 15:06:40 -07:00
Howard Stearns
dc75b238a8 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 
And update with current code.
 2015-08-18 15:35:37 -07:00
Seth Alves
551f0aaba3 show how many times per second Application::idle is called 2015-08-18 01:41:17 -07:00
Brad Davis
914b47069b Working on line height 2015-07-17 14:33:32 -07:00
Bradley Austin Davis
24643ca282 Working on line spacing 2015-07-17 14:19:39 -07:00
Bradley Austin Davis
c5e0298f8d Working on mac sizing 2015-07-17 12:22:38 -07:00
Brad Davis
89faf85ad9 Working on text rendering overlays 2015-07-16 15:56:01 -07:00
David Rowe
daf34053a8 Tweak button positions 2015-07-09 10:15:28 -07:00
David Rowe
db7f1d6d27 Change font to Trebuchet 2015-07-09 09:35:22 -07:00
David Rowe
abc54f2e3f Polished fonts, colors, etc. 2015-07-07 17:08:02 -07:00
David Rowe
cd258262d2 Use proper Interface logo 2015-07-07 16:21:24 -07:00
David Rowe
1774ad9c53 Rework buttons 2015-07-07 15:59:34 -07:00
David Rowe
98cd706528 Add border around update details 2015-07-07 15:48:39 -07:00
David Rowe
0994cd97dc Rework header and add logo 
Use HiFi logo as placeholder for now until Interface SVG is available.
 2015-07-07 15:14:15 -07:00
David Rowe
085d87e035 Make background squared, white, and dragable 2015-07-07 14:16:45 -07:00
David Rowe
46e58cd106 Rework dialog container and layout 2015-07-07 13:56:47 -07:00
David Rowe
5046f4c1ac Update upgrade dialog 
- Strip out "<br />"s
- Show information for all new versions since current, not just latest
- Display scrollbar if content too long to show all at once
- "version" / "versions" behind depending on if one or more
- Align buttons with heading and text
- Darken text so that is more readable
 2015-07-06 13:19:42 -07:00
Stephen Birarda
3dc3d8b4c1 make the tooltip background darker 2015-06-29 11:05:59 -07:00
Stephen Birarda
f93ad34282 add spacing above and below tooltipPic 2015-06-29 10:57:09 -07:00
Stephen Birarda
ff33922716 handle conflicts on merge with upstream master 2015-06-26 15:33:35 -07:00
Niraj Venkat
87fce44271 Changing formatting of tooltip 2015-06-26 14:41:38 -07:00
Stephen Birarda
18e2b62ecc initial image replacement for hyperlink preview 2015-06-26 14:12:26 -07:00
Stephen Birarda
c6df573933 fix some OS X warnings, add description to tooltip 2015-06-26 10:50:31 -07:00
Niraj Venkat
23f4f7d824 Place name is underlined 2015-06-25 15:56:40 -07:00
Niraj Venkat
8ea01b45ae Word wrap implementation 2015-06-25 15:46:43 -07:00
Niraj Venkat
6b14a64c8c Formatting changes and teleport on click 2015-06-25 15:15:44 -07:00
Niraj Venkat
de26dc9c49 Further changes to tooltip 2015-06-25 14:15:06 -07:00
Niraj Venkat
210a1205a7 More layout changes 2015-06-25 14:07:03 -07:00
Niraj Venkat
be053cfdc7 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-24 17:33:57 -07:00
Niraj Venkat
d89ff2f720 Merge pull request #5188 from AlexanderOtavka/master 
Improve address bar and edit.js entity properties list.
 2015-06-24 16:48:24 -07:00
Zander Otavka
05b668484c Change address bar back/forward button color. 2015-06-23 16:41:15 -07:00
Niraj Venkat
0c2e208044 Added basic layout to tooltip QML 2015-06-23 13:54:19 -07:00
Brad Davis
da031b039c Removing qml wanrings 2015-06-23 10:58:52 -07:00
Niraj Venkat
d1526c25b2 Starting new tooltip design in QML 2015-06-23 10:08:48 -07:00
Niraj Venkat
98fa996752 Cleaning out comments 2015-06-22 16:56:49 -07:00