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

469 commits

Author SHA1 Message Date
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
Brad Davis
d94cc3d785 Merge pull request #5182 from venkatn93/master 
Fixed tooltip position relative to the cursor
 2015-06-22 13:57:47 -07:00
Philip Rosedale
111b0f286d Merge pull request #5160 from ctrlaltdavid/addressbar-tidy 
Tidy address bar code
 2015-06-22 12:08:33 -07:00
Niraj Venkat
e66206ec4f Fixed tooltip position relative to the cursor 2015-06-22 11:29:44 -07:00
Bradley Austin Davis
577962cb67 Merge branch 'master' into overlay 2015-06-20 10:37:55 -07:00
David Rowe
0b13accf94 Merge branch 'master' into addressbar-tidy 
Conflicts:
	interface/resources/qml/AddressBarDialog.qml
 2015-06-19 17:42:27 -07:00
Brad Davis
99c217184b Fixing the mic/camera buttons and the mirror UI buttons 2015-06-19 14:46:39 -07:00
Niraj Venkat
03c10d15e6 Adding lambdas and removing dead code 2015-06-19 14:37:21 -07:00
Niraj Venkat
b15e7cec21 Back and forward are red if not possible 2015-06-19 11:17:56 -07:00
Brad Davis
9bef5f011b Reverting mirror functionality 2015-06-19 00:03:46 -07:00
Niraj Venkat
afc2db6c6a address bar commit 2015-06-18 18:25:48 -07:00
Niraj Venkat
894a245318 Further changes to address bar 2015-06-18 17:35:50 -07:00
Niraj Venkat
5645491170 Further changes to address bar 2015-06-18 15:09:13 -07:00
Niraj Venkat
1be303e3ed Address bar polish 2015-06-18 15:07:27 -07:00
Bradley Austin Davis
e75b1a6794 Merge branch 'temp' into overlay 2015-06-18 14:03:25 -07:00
Bradley Austin Davis
1bae1d6065 Changing font size for timings 2015-06-18 13:59:48 -07:00
Bradley Austin Davis
100f7acddc Working on tooltip placement 2015-06-18 13:46:27 -07:00
Bradley Austin Davis
7bbaf026f3 use a monospace font on all platforms 2015-06-18 13:33:37 -07:00
David Rowe
1047703718 Tidy address bar code 
Re-enable and reposition mouse drag areas
Remove unused graphics assets
Remove unused includes
 2015-06-18 11:18:56 -07:00
Brad Davis
84c3dab3d8 Fixing error in stats qml parsing 2015-06-18 00:23:40 -07:00
Brad Davis
f2261b5ed5 Merge remote-tracking branch 'upstream/master' into overlay 2015-06-17 15:34:50 -07:00
Niraj Venkat
225e2ebfdc Fixing build issues and finishing up address bar 2015-06-17 14:27:16 -07:00
Niraj Venkat
1328ea6199 Calling AddressManager back and forward functions 2015-06-17 13:41:41 -07:00
Brad Davis
1e90aaf9c3 Working on overlays still, mirror rendering and overlay order 2015-06-17 11:35:30 -07:00
Brad Davis
2bf53b625e Working on overlays and stats 2015-06-17 02:00:13 -07:00
Brad Davis
4762e1a00c Merge remote-tracking branch 'upstream/master' into overlay 
Conflicts:
	interface/src/Application.cpp
 2015-06-16 21:01:00 -07:00
Brad Davis
659fa2387c Working on overlays / stats 2015-06-16 21:00:13 -07:00
Niraj Venkat
5fcf8e5922 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-16 16:34:38 -07:00
Niraj Venkat
a24e0f7b14 Finishing up new address bar layout 2015-06-16 09:50:03 -07:00
Niraj Venkat
7142be07b6 New address bar layout with back and forward buttons 2015-06-12 17:45:18 -07:00
Niraj Venkat
b9b8cfd60d Starting the new address bar layout 2015-06-12 14:08:06 -07:00
Leonardo Murillo
7aee293df4 Buttons are connected and execting old functions 2015-06-08 14:56:46 -06:00
Leonardo Murillo
edce36f5a1 Checkpoint - buttons in place 2015-06-08 14:29:10 -06:00
Leonardo Murillo
bd85ce1312 Auto Update checkpoint - dialog is QML and populated with real data 2015-06-08 13:55:28 -06:00
Leonardo Murillo
83b7054138 Merge branch 'master' of github.com:highfidelity/hifi into auto-updater 2015-06-08 11:55:47 -06:00
David Rowe
d7866d9981 Rename previous Dialog to VrDialog 2015-06-06 10:48:07 -07:00
David Rowe
bbde367386 Rename new Dialog to DialogContainer 2015-06-06 10:42:49 -07:00
Leonardo Murillo
68b419deec Syncing 2015-06-05 17:11:32 -06:00
David Rowe
c7c355c19f Remove circular login dialog variation 2015-06-05 15:37:25 -07:00
Leonardo Murillo
dea80d1757 Styling update dialog and working towards passing build details from c++ to qml 2015-06-05 16:17:54 -06:00
David Rowe
ee8449712c Code review and tidying 2015-06-05 13:23:06 -07:00
David Rowe
7e9122e3d1 Replace login background SVGs with QML rectangles 2015-06-05 13:15:18 -07:00
David Rowe
f168385798 Add spinner in place of "Logging in..." 2015-06-05 12:57:40 -07:00
David Rowe
562228e924 Change login password recovery link text 2015-06-05 09:47:34 -07:00
David Rowe
37aefe73f8 Remove unnecessary semicolons 2015-06-05 09:07:07 -07:00
David Rowe
426fbc662a White error text instead of black 2015-06-05 09:03:46 -07:00
David Rowe
6c7fb7e54c Fix setting focus at start-up when not logged in 2015-06-05 09:02:35 -07:00
David Rowe
ce78a95dee Make login dialog able to be dragged 2015-06-05 08:22:36 -07:00
David Rowe
0538eb5756 Add remainder of dialog content and polish look 2015-06-04 22:27:23 -07:00
David Rowe
3388406984 Add basic username, password, login, and error functionality and styling 2015-06-04 18:48:21 -07:00
David Rowe
afc2f374e5 New login dialog background with circular and rectangular variations 
Developer menu item toggles between the two.
 2015-06-04 14:39:28 -07:00
David Rowe
d33a249b3e Refactor common new dialog functionality into new Dialog.qml 2015-06-04 14:39:28 -07:00
David Rowe
2c17274f49 Rename Dialog.qml to DialogOld.qml 2015-06-04 14:39:27 -07:00
Leonardo Murillo
4f93328759 Merge branch 'master' of github.com:highfidelity/hifi into auto-updater 2015-06-03 19:39:00 -06:00
Leonardo Murillo
b60597aa90 AutoUpdate is now a singleton invoked via Dependency Manager, first steps towards QML update notification 2015-06-03 19:38:54 -06:00
David Rowe
878227ab8b Increase address bar dialog size 
Including font size, just for this dialog.
 2015-06-02 16:33:09 -07:00
David Rowe
ec1cb72dd5 Rework QML font sizing to be more consistent across platforms 2015-06-02 14:49:33 -07:00
David Rowe
a8a3c677ad Darken address bar hint text so that it's better visible on the DK2 2015-06-02 14:49:32 -07:00
David Rowe
7d12482a49 Untabify 2015-06-01 13:54:14 -07:00
David Rowe
9c52c79fe1 Combine icon and input areas into a single SVG 2015-06-01 13:29:36 -07:00
David Rowe
b166e24ff5 Fix initial fade-in 2015-06-01 11:06:33 -07:00
David Rowe
9a8bb67f37 Tidy address bar dialog code 2015-06-01 09:01:11 -07:00
David Rowe
e41b4c1b7b Add new address bar dialog error message 
Implemented as a new simple InformationDialog so that can try it out
without reworking MessageDialog immediately for all QML UI.
 2015-06-01 09:01:11 -07:00
David Rowe
05e251eba4 Add icon to address bar dialog 2015-06-01 09:01:10 -07:00
David Rowe
881941b64d Restyle address bar dialog 
Made the dialog a stand-alone QML file that doesn't inherit from other
dialog QML files so that don't need to rework all dialogs right now.
 2015-06-01 09:01:09 -07:00
David Rowe
a43593c3b2 Dialog opacity transition tidying 2015-06-01 09:01:08 -07:00
David Rowe
2a931119bd Replace expand/collapse dialog animation with fade in/out 2015-06-01 09:01:08 -07:00
Brad Davis
a8d343bbf1 Working on web entities 2015-05-13 00:27:57 -07:00
Brad Davis
e9b83e1c02 Working on web entities 2015-05-12 21:15:54 -07:00
Bradley Austin Davis
d2a8681139 Merge branch 'master' into infoview 2015-05-05 10:31:19 -07:00
Philip Rosedale
e9476029fb Merge pull request #4724 from jherico/menu_polish 
Menu polish
 2015-05-04 23:44:06 -07:00
Seth Alves
f75b599288 don't save default values in json file 2015-04-30 11:28:27 -07:00
Bradley Austin Davis
475c399d22 Menu polish on OSX 2015-04-29 02:54:47 -07:00
Brad Davis
87ef98005d menu polish 2015-04-29 02:42:57 -07:00
Bradley Austin Davis
75f6ad3b99 Working on menus look 2015-04-29 00:43:18 -07:00
Brad Davis
0fb8884f9c Merge branch 'browser' into infoview 
Conflicts:
	tests/ui/src/main.cpp
 2015-04-28 17:54:04 -07:00
Brad Davis
9836ffed97 Merge branch 'vr_menus' into infoview 
Conflicts:
	tests/ui/src/main.cpp
 2015-04-28 01:17:51 -07:00
Brad Davis
d1d1830b2f Importing peferred dialog look from browser branch 2015-04-28 00:26:24 -07:00
Brad Davis
1f9f4270d7 Working on browsers and look of dialogs 2015-04-28 00:24:18 -07:00
Brad Davis
4bb5e562ea Browser work 2015-04-27 22:39:48 -07:00
Brad Davis
19ca543c2c Cleaning up code and tweaking menu layout 2015-04-27 19:07:53 -07:00
Brad Davis
7bd8bbf565 Merge branch 'vr_menus' into infoview 2015-04-27 18:33:45 -07:00
Brad Davis
10b5935063 Let QML take care of more of the height/width stuff 2015-04-27 18:11:19 -07:00
Brad Davis
1beaf18d1b Prevent the login dialog from spawning the address bar on enter keys 2015-04-27 16:00:23 -07:00
Brad Davis
fd28baac8c Working on message box and addressbar tweaks 2015-04-27 15:42:20 -07:00
Bradley Austin Davis
ca16d37ce5 Mac testing 2015-04-27 12:46:34 -07:00
Brad Davis
14b660baf7 Merge branch 'vr_menus' into infoview 
Conflicts:
	tests/ui/src/main.cpp
 2015-04-27 11:43:49 -07:00
Brad Davis
d55d467d3f Tweaking VR menu for PR 2015-04-27 11:35:57 -07:00
Brad Davis
0b1df891af Backporting visual work from branch 2015-04-27 10:53:58 -07:00
Brad Davis
b216689b45 Removing old infoview, testing new dialogs 2015-04-27 00:02:11 -07:00
Brad Davis
fa31ba0754 Info-view 2015-04-26 10:37:14 -07:00
Brad Davis
a96f69a673 Switching to a wrapper mechanism for VR menus 2015-04-25 16:20:15 -07:00
Brad Davis
ee30588fd4 More menu work 2015-04-25 10:41:06 -07:00
Brad Davis
fbdb9b143e Merge branch 'ui-refactor' into m_and_m 
Conflicts:
	interface/resources/qml/HifiMenu.qml
	interface/resources/qml/MessageDialog.qml
	interface/resources/qml/Root.qml
	interface/resources/qml/TestRoot.qml
	interface/resources/qml/controls/Dialog.qml
	interface/src/Application.cpp
	interface/src/ui/LoginDialog.cpp
	libraries/ui/src/MessageDialog.cpp
	libraries/ui/src/MessageDialog.h
	libraries/ui/src/OffscreenQmlDialog.h
	libraries/ui/src/OffscreenUi.cpp
	libraries/ui/src/OffscreenUi.h
	tests/ui/src/main.cpp
 2015-04-24 18:02:12 -07:00
Brad Davis
e7b8efc2d9 Cleaning up unused stuff 2015-04-24 16:44:48 -07:00
Brad Davis
08d60c6a01 Fixing message dialog 2015-04-24 16:19:39 -07:00
Brad Davis
99a6e1f86c Breaking up offscreen UI work 2015-04-24 13:21:21 -07:00
Brad Davis
1ff8c67576 More work on menus and some code cleanup 2015-04-24 12:54:11 -07:00
Brad Davis
d68d13489d Working on appearance of menus 2015-04-23 21:55:31 -07:00
Brad Davis
f17387fab4 Working on menus 2015-04-23 21:23:21 -07:00
Brad Davis
bb1c73adc7 Working on menus 2015-04-23 14:24:01 -07:00
Brad Davis
8cb298a55b Working on menus 2015-04-23 14:23:15 -07:00
Brad Davis
d2ff89aaec Cleaning up qml 2015-04-23 14:23:13 -07:00
Brad Davis
8269b9925b Adding first pass at message box 2015-04-23 14:23:12 -07:00
Brad Davis
a9d65f168b Working on marketplace dialog 2015-04-23 14:23:11 -07:00
Brad Davis
8d23bf874f Enable resizable dialogs 2015-04-17 17:43:54 -07:00
Brad Davis
16efa2a46f Improving toggle visibility and loading behavior 2015-04-17 16:59:04 -07:00
Brad Davis
ad585f7559 Fixing NaN reference in test dialog 2015-04-17 10:05:54 -07:00
Brad Davis
781abdd047 Tweaking test dialog and adding browser test 2015-04-17 09:53:40 -07:00
Brad Davis
fd0c130dc2 Working on simplifying new dialog creation 2015-04-16 22:20:49 -07:00
Bradley Austin Davis
f700607a65 Working on OSX functionality 2015-04-15 23:08:55 -07:00
Brad Davis
aba2b395a6 Working on testing the QML ui 2015-04-15 12:35:30 -07:00
Brad Davis
d14d5f3d29 Working on new-UI implementations of address bar and login 2015-04-15 00:36:04 -07:00