Commit graph

12122 commits

Author SHA1 Message Date
Brad Davis
de268c47b3 Working on 0.6 2015-06-07 18:25:16 -07:00
Bradley Austin Davis
6a60da2a6c Working on SDK 0.6 2015-06-07 17:58:33 -07:00
Brad Davis
119f37a178 Working on SDK 0.6 2015-06-07 14:34:40 -07:00
David Rowe
77f2943877 Rename previous Dialog to VrDialog 2015-06-07 13:57:03 -07:00
David Rowe
6f7c52d2cc Rename new Dialog to DialogContainer 2015-06-07 13:57:02 -07:00
David Rowe
8c1ece8865 Fix #include for Unix 2015-06-07 13:57:02 -07:00
David Rowe
36312e7bb4 Remove circular login dialog variation 2015-06-07 13:57:01 -07:00
David Rowe
b1f2ffd008 Code review and tidying 2015-06-07 13:57:00 -07:00
David Rowe
dbe57696d8 Replace login background SVGs with QML rectangles 2015-06-07 13:56:59 -07:00
David Rowe
84ab8277df Add spinner in place of "Logging in..." 2015-06-07 13:56:59 -07:00
David Rowe
8682cfc14a Change login password recovery link text 2015-06-07 13:56:58 -07:00
David Rowe
34209fa671 Remove unnecessary semicolons 2015-06-07 13:56:58 -07:00
David Rowe
263f305349 White error text instead of black 2015-06-07 13:56:57 -07:00
David Rowe
7819b5b5c3 Fix setting focus at start-up when not logged in 2015-06-07 13:56:56 -07:00
David Rowe
162395e7fe Make login password and register links work 2015-06-07 13:56:56 -07:00
David Rowe
ed60e409ab Make login dialog able to be dragged 2015-06-07 13:56:55 -07:00
David Rowe
2a40bbb02b Add remainder of dialog content and polish look 2015-06-07 13:56:54 -07:00
David Rowe
a2f262f659 Add basic username, password, login, and error functionality and styling 2015-06-07 13:56:54 -07:00
David Rowe
511832c273 New login dialog background with circular and rectangular variations
Developer menu item toggles between the two.
2015-06-07 13:56:53 -07:00
David Rowe
811c250763 Refactor common new dialog functionality into new Dialog.qml 2015-06-07 13:56:52 -07:00
David Rowe
4d8bc27ece Rename Dialog.qml to DialogOld.qml 2015-06-07 13:56:52 -07:00
Bradley Austin Davis
b56fbd4744 Working on SDK 0.6 2015-06-07 13:56:06 -07:00
Brad Davis
f614268667 Moving windows to SDK 0.6
Working on SDK 0.6 for windows

Working on SDK 0.6 for windows
2015-06-07 01:40:44 -07:00
Niraj Venkat
827d8bd854 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-05 13:33:41 -07:00
Niraj Venkat
a3f19e9d4c Fixing title bar update on teleport 2015-06-05 13:33:14 -07:00
Seth Alves
4e10c28b41 merge from upstream 2015-06-05 10:31:13 -07:00
Seth Alves
edb3622c85 Merge pull request #5037 from AndrewMeadows/inertia
collision groups for physical objects
2015-06-05 10:26:28 -07:00
Brad Davis
16f55c7557 Fix the skybox jiggle in the HMD 2015-06-05 09:52:56 -07:00
Seth Alves
9a67f35b59 Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-04 19:02:46 -07:00
Eric Levin
5e15c14539 added sanitization for invalid line points data. Fixed bug where occasionally wrong view frustum would be sent to script" 2015-06-04 16:45:32 -07:00
Seth Alves
4414b67837 Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-03 20:43:22 -07:00
Stephen Birarda
cf67d22ec7 Merge pull request #5036 from venkatn93/master
Fixed snapshot bug. Snapshots now save and load ok
2015-06-03 18:57:29 -04:00
Niraj Venkat
29a15453ac Visual studio tab issues fixed 2015-06-03 15:35:04 -07:00
Niraj Venkat
4db110a6e1 Final fixes. Snapshot should be good now 2015-06-03 15:09:45 -07:00
Niraj Venkat
92248d23e7 more indentation changes 2015-06-03 14:59:07 -07:00
Niraj Venkat
694272ffaa "fixed" formatting issues and code cleanup 2015-06-03 14:48:25 -07:00
Niraj Venkat
57004c61c7 Fixed snapshot bug. Snapshots now save and load ok 2015-06-03 14:29:39 -07:00
Andrew Meadows
ec0b4a956a move collision group consts to shared lib 2015-06-03 14:13:51 -07:00
Andrew Meadows
7b6cc59d30 basic support for collision groups 2015-06-03 11:40:48 -07:00
Seth Alves
a31a5a1554 main actions interface is in EntityItem. changes in actions are queued up and applied before simulation step 2015-06-02 19:40:20 -07: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
Andrew Meadows
2702e07863 Merge pull request #5015 from sethalves/polyvox
PolyVox improvements -- depends on #5008
2015-06-02 14:34:49 -07:00
David Rowe
fb379f6c00 Fix crash when setting avatar body with Preferences dialog closed 2015-06-02 08:37:45 -07:00
Philip Rosedale
90dd730a25 Merge pull request #4940 from ctrlaltdavid/20544
CR for 20544 - Make eyelids follow iris as head tilts
2015-06-01 23:36:07 -07:00
Stephen Birarda
12bcbbf338 Merge pull request #5012 from ctrlaltdavid/20555
DO NOT MERGE - QA for #20555 - Re-style QML Address Bar
2015-06-01 17:08:00 -04: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