Petr Mrázek acff155624 Merge branch 'feature_screenshots' into integration_json_and_tools ...

Conflicts:
	logic/net/URLConstants.h

Resolve issues with multiple definitions of URL constants by moving them to their own object file.

2014-02-25 01:52:58 +01:00

..

AboutDialog.cpp

…

AboutDialog.h

…

AboutDialog.ui

fixed the destination (href) of the link http://github.com/MultiMC/MultiMC5 in AboutDialog.ui (+German translation)

2014-02-14 13:39:00 +01:00

AccountListDialog.cpp

…

AccountListDialog.h

…

AccountListDialog.ui

…

AccountSelectDialog.cpp

…

AccountSelectDialog.h

…

AccountSelectDialog.ui

…

CopyInstanceDialog.cpp

…

CopyInstanceDialog.h

…

CopyInstanceDialog.ui

…

CustomMessageBox.cpp

Imgur album creation

2014-02-24 11:30:27 +01:00

CustomMessageBox.h

…

EditAccountDialog.cpp

…

EditAccountDialog.h

…

EditAccountDialog.ui

…

EditNotesDialog.cpp

…

EditNotesDialog.h

…

EditNotesDialog.ui

…

IconPickerDialog.cpp

Pave.

2014-02-04 01:40:51 +01:00

IconPickerDialog.h

…

IconPickerDialog.ui

…

InstanceSettings.cpp

…

InstanceSettings.h

…

InstanceSettings.ui

…

LegacyModEditDialog.cpp

…

LegacyModEditDialog.h

…

LegacyModEditDialog.ui

…

LwjglSelectDialog.cpp

…

LwjglSelectDialog.h

…

LwjglSelectDialog.ui

…

ModEditDialogCommon.cpp

…

ModEditDialogCommon.h

…

NewInstanceDialog.cpp

…

NewInstanceDialog.h

…

NewInstanceDialog.ui

…

OneSixModEditDialog.cpp

New, better, liteloader support

2014-02-19 22:34:17 +01:00

OneSixModEditDialog.h

Allow overriding the order in which patches are applied

2014-02-08 17:22:26 +01:00

OneSixModEditDialog.ui

Allow overriding the order in which patches are applied

2014-02-08 17:22:26 +01:00

ProgressDialog.cpp

…

ProgressDialog.h

…

ProgressDialog.ui

…

ScreenshotDialog.cpp

Reorganize all the screenshot files

2014-02-25 00:51:24 +01:00

ScreenshotDialog.h

Reorganize all the screenshot files

2014-02-25 00:51:24 +01:00

ScreenshotDialog.ui

Screenshots: Optimize image loading and memory use, fix list and button layout.

2014-02-25 01:23:33 +01:00

SettingsDialog.cpp

Fix MCEdit on OSX

2014-02-21 20:13:12 +01:00

SettingsDialog.h

Fix more stuff. Detached tools, only MCEdit for now.

2014-02-16 10:46:14 +01:00

SettingsDialog.ui

Nicer way of selecting tool folders and executables

2014-02-16 14:42:44 +01:00

UpdateDialog.cpp

…

UpdateDialog.h

…

UpdateDialog.ui

…

VersionSelectDialog.cpp

New, better, liteloader support

2014-02-19 22:34:17 +01:00

VersionSelectDialog.h

…

VersionSelectDialog.ui

…