summaryrefslogtreecommitdiffstats
path: root/gui
Commit message (Collapse)AuthorAgeLines
* Fix settings dialog when offlinePetr Mrázek2014-01-18-0/+4
|
* Improve Console window output.Orochimarufan2014-01-17-0/+3
| | | | | | | | | -> Log Pre- and Post-Launch command happenings -> Enable the java part to specify the level TODO: fix logging with mc 1.7's log4j logging infrastructure Signed-off-by: Orochimarufan <orochimarufan.x3@gmail.com>
* Merge branch 'feature_localization' of https://github.com/02JanDal/MultiMC5 ↵Petr Mrázek2014-01-12-235/+273
|\ | | | | | | | | | | | | | | into develop Conflicts: gui/dialogs/SettingsDialog.cpp gui/dialogs/SettingsDialog.ui
| * Hopefully fix Qt 5.1 compilationJan Dalheimer2014-01-04-1/+1
| |
| * Clean up/update translation code and made language selectable in the ↵Jan Dalheimer2014-01-04-2/+31
| | | | | | | | settings dialog
| * Fix a few things related to the translationsJan Dalheimer2014-01-04-2/+2
| |
* | Merge branch 'feature_mojang_status' into developPetr Mrázek2014-01-12-0/+90
|\ \
| * | More space between status itemsSky2014-01-12-4/+4
| | |
| * | Show Mojang service statuses in status barSky2014-01-12-0/+90
| | |
* | | Merge branch 'feature_better_launch' into developPetr Mrázek2014-01-12-13/+46
|\ \ \ | |/ / |/| |
| * | Replace old launcher part with a shiny new one. No more garbage on the ↵Petr Mrázek2014-01-12-13/+46
| | | | | | | | | | | | command line.
* | | Show active account skin whilst it's checked for updatesSky2014-01-11-3/+6
| | |
* | | Add tooltips to Java memory spinboxesSky2014-01-10-1/+19
| | |
* | | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developSky2014-01-09-2/+11
|\ \ \
| * | | Make the GitHub link in the about dialog clickableForkk2014-01-08-0/+2
| | | | | | | | | | | | | | | | Fixes #38
| * | | Change the issue tracker URL to GitHub issuesForkk2014-01-08-1/+1
| | | | | | | | | | | | | | | | Bump hotfix version number and add an entry in the changelog.
| * | | Fix the window titleForkk2014-01-08-1/+5
| | | | | | | | | | | | | | | | | | | | The window title now says "MultiMC 5 - Version <version> [on <platform>]"
| * | | Word wrap the update channel description labelForkk2014-01-08-1/+4
| |/ / | | | | | | | | | | | | Previously, channel descriptions that were too long would mess up the dialog.
* / / Add "MB" as a suffix to memory spinboxesSky2014-01-09-1/+19
|/ /
* | Add information to the about dialog.Forkk2014-01-07-24/+102
| |
* | Merge pull request #35 from 02JanDal/fix_keep_selectionSky2014-01-07-18/+21
|\ \ | | | | | | Fix instances getting deselected after FTB instances are loaded (or when ever the model is reset, like on a reload)
| * | Fix instances getting deselected after FTB instances are loaded (or whenever ↵Jan Dalheimer2014-01-06-18/+21
| | | | | | | | | | | | the model is reset)
* | | Fix proxy settings radio buttons not triggering updates of the proxy settings.Petr Mrázek2014-01-07-6/+18
| | |
* | | Implement proxy settingsForkk2014-01-06-3/+187
|/ /
* | Implement console window tray icon, console window hiding, better scrollingPetr Mrázek2014-01-06-27/+96
| |
* | Scroll console window for <= lines above the bottom instead of the very bottom.Petr Mrázek2014-01-06-2/+1
| |
* | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developPetr Mrázek2014-01-05-30/+162
|\ \
| * \ Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developForkk2014-01-04-7/+59
| |\ \
| | * | Fix settings dialog tab ordering againSky2014-01-05-3/+15
| | | |
| | * | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developSky2014-01-05-5/+78
| | |\ \
| | * | | Implement the beloved right click context menu. Just a copy of the instance ↵Sky2014-01-05-0/+29
| | | |/ | | |/| | | | | | | | | toolbar
| * | | Implement changing update channelsForkk2014-01-04-28/+118
| | | | | | | | | | | | | | | | | | | | Allow the user to select which update channel they would like to download updates from.
* | | | Some more updater fixesPetr Mrázek2014-01-05-2/+6
| |_|/ |/| | | | | | | | Paths were wrong - still used work directory instead of root
* | | Fix library column stretchingPetr Mrázek2014-01-04-5/+15
|/ /
* | Explicitly set the close button to be the default buttonJan Dalheimer2014-01-03-0/+1
| |
* | Add the option to disable a certain messageJan Dalheimer2014-01-03-2/+6
| |
* | Notifications system. Mainly to be used in case the updater breaks.Jan Dalheimer2014-01-03-0/+58
|/
* Clean out old assets stuff, fix button hitbox regressionSky2014-01-02-39/+0
|
* Tweak "More..." to "More news..."Sky2014-01-02-1/+1
|
* Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_newsForkk2014-01-02-2/+2
|\
| * Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developSky2014-01-02-1/+1
| |\
| * | Don't show extra space in status bar, tweak "none selected" messageSky2014-01-02-2/+2
| | |
* | | Implement the news buttonForkk2014-01-02-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-167/+594
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: CMakeLists.txt gui/MainWindow.h
| * | Make .ico files usable (the plugin is already included)Jan Dalheimer2014-01-02-1/+1
| |/
| * Save/restore settings dialog (and instance specific settings) window geometrySky2014-01-02-4/+36
| |
| * More credits tweakingSky2014-01-01-9/+14
| |
| * ThreadTask for all your ThreadNeedsPetr Mrázek2014-01-01-7/+11
| | | | | | | | Use only when absolutely required.
| * Move assets migration to a task. Needs threading.Sky2014-01-01-2/+25
| |
| * Tweak credits in about dialogSky2013-12-31-22/+29
| |