summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
Commit message (Collapse)AuthorAgeLines
* Add a timer for clicking away the notification dialogJan Dalheimer2014-03-15-0/+3
|
* Remove a lot of error code and error handling madness.Petr Mrázek2014-03-02-0/+5
|
* Reorganize the version-related code.Petr Mrázek2014-03-01-7/+14
|
* Fix to the way translations are handled. Also updated the german translation ↵Jan Dalheimer2014-02-25-18/+2
| | | | with the new strings.
* Merge branch 'feature_screenshots' into integration_json_and_toolsPetr Mrázek2014-02-25-145/+159
|\ | | | | | | | | | | | | Conflicts: logic/net/URLConstants.h Resolve issues with multiple definitions of URL constants by moving them to their own object file.
| * Screenshots: Optimize image loading and memory use, fix list and button layout.Petr Mrázek2014-02-25-0/+1
| |
| * Reorganize all the screenshot filesPetr Mrázek2014-02-25-6/+9
| |
| * Imgur album creationJan Dalheimer2014-02-24-2/+4
| |
| * Initial stuff. It doesnt work.robotbrain2014-02-23-145/+152
| |
* | Merge branch 'feature_profiling' into integration_json_and_toolsPetr Mrázek2014-02-24-0/+12
|\ \
| * | RestructureJan Dalheimer2014-02-16-11/+11
| | |
| * | Fix more stuff. Detached tools, only MCEdit for now.Jan Dalheimer2014-02-16-1/+5
| | |
| * | Profiler support. Currently JProfiler and JVisualVM are implemented.Jan Dalheimer2014-02-15-0/+8
| |/
* / New, better, liteloader supportJan Dalheimer2014-02-19-0/+2
|/
* Merge branch 'feature_groupview' into integration_derpstances_groupviewPetr Mrázek2014-02-08-8/+11
|\
| * Pave.Petr Mrázek2014-02-04-8/+11
| |
* | Merge branch 'feature_derpstances' of https://github.com/02JanDal/MultiMC5 ↵Petr Mrázek2014-02-01-4/+8
|\ \ | |/ |/| | | | | | | | | | | into feature_derpstances Conflicts: gui/dialogs/OneSixModEditDialog.cpp logic/OneSixUpdate.cpp
| * Merge branch 'develop' into feature_derpstancesJan Dalheimer2014-01-24-1/+1
| |\
| * | Change naming from Derp -> OneSix until the new instance type supports legacyJan Dalheimer2014-01-24-19/+19
| | |
| * | Forge works now too, and so does forge+liteloaderJan Dalheimer2014-01-23-0/+2
| | |
| * | Derpstances. Everything renamed. Launching does not yet work.Jan Dalheimer2014-01-22-17/+19
| | |
* | | Add 'empty text' to all the version selection dialogs.Petr Mrázek2014-01-29-0/+4
| | | | | | | | | | | | Customize it for the Forge one so people finally shut up about 1.7.4
* | | Offline mode can be used even when online.Petr Mrázek2014-01-27-0/+2
| |/ |/| | | | | | | | | Allow the user to pick a player name for offline mode. Big auth refactor. Now using session objects instead of the accounts themselves. Sessions only last for one instance start and hold all the auth and player data.
* | Hotfix 0.2.1 for twitch.0.2.1Petr Mrázek2014-01-22-1/+1
|/ | | | Add to the changelog and tweak the version number.
* Update the changelog, version, scale the instance iconPetr Mrázek2014-01-20-2/+2
|
* Move a bunch of resources into the resources folder.Petr Mrázek2014-01-19-2/+2
| | | | Also, cat is no longer mysterious. It's just FLUFFY!
* Use icon theme so we can have more than one icon size per iconPetr Mrázek2014-01-19-2/+8
|
* Merge branch 'feature_localization' of https://github.com/02JanDal/MultiMC5 ↵Petr Mrázek2014-01-12-1/+0
|\ | | | | | | | | | | | | | | into develop Conflicts: gui/dialogs/SettingsDialog.cpp gui/dialogs/SettingsDialog.ui
| * Fix a few things related to the translationsJan Dalheimer2014-01-04-1/+0
| |
* | Show Mojang service statuses in status barSky2014-01-12-0/+4
| |
* | No more generated resources.Petr Mrázek2014-01-11-4/+1
| |
* | Harden CacheDownload.Petr Mrázek2014-01-11-0/+2
| | | | | | | | It's now super hard. SRSLY.
* | Merge branch 'master' into developForkk2014-01-08-1/+1
|\ \
| * | Change the issue tracker URL to GitHub issuesForkk2014-01-08-1/+1
| | | | | | | | | | | | Bump hotfix version number and add an entry in the changelog.
* | | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developForkk2014-01-08-7/+5
|\ \ \ | |/ / |/| |
| * | Hopefully fix OSX icon filePetr Mrázek2014-01-08-7/+5
| | |
* | | Make CMake output version type infoForkk2014-01-07-2/+8
| | |
* | | Bump minor version number and update changelog.Forkk2014-01-07-1/+1
|/ /
* | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into new-version-systemForkk2014-01-07-69/+70
|\ \
| * | Deploy jars instead of extracting them at runtime, remove non-working nvidia fixPetr Mrázek2014-01-08-69/+70
| | |
* | | Rework version numbering system.Forkk2014-01-07-11/+19
|/ / | | | | | | Again...
* | Add hack for NvidiaPetr Mrázek2014-01-06-1/+1
| |
* | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developPetr Mrázek2014-01-05-2/+2
|\ \
| * | Prepend a 5 to version strings.Forkk2014-01-04-2/+2
| | |
* | | Add an option to force using local updater binary (for updater development)Petr Mrázek2014-01-05-1/+2
| | |
* | | Mess with the updater again.Petr Mrázek2014-01-05-0/+2
|/ /
* / Notifications system. Mainly to be used in case the updater breaks.Jan Dalheimer2014-01-03-0/+4
|/
* Implement the news buttonForkk2014-01-02-2/+2
| | | | | | | | | Make the news button open the latest news post in the user's web browser. Also remove the webkit dependency. I was planning on using it to display the news in a custom window, but we'll just use the user's browser for now.
* Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_newsForkk2014-01-02-7/+54
|\ | | | | | | | | | | Conflicts: CMakeLists.txt gui/MainWindow.h
| * Fixed buttons on osx by adding the accessible plugin.Noah Mayr2014-01-02-0/+12
| |