Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge branch 'feature_localization' of https://github.com/02JanDal/MultiMC5 ↵ | Petr Mrázek | 2014-01-12 | -235/+273 |
|\ | | | | | | | | | | | | | | | into develop Conflicts: gui/dialogs/SettingsDialog.cpp gui/dialogs/SettingsDialog.ui | |||
| * | Hopefully fix Qt 5.1 compilation | Jan Dalheimer | 2014-01-04 | -1/+1 |
| | | ||||
| * | Clean up/update translation code and made language selectable in the ↵ | Jan Dalheimer | 2014-01-04 | -2/+31 |
| | | | | | | | | settings dialog | |||
| * | Fix a few things related to the translations | Jan Dalheimer | 2014-01-04 | -2/+2 |
| | | ||||
* | | Merge branch 'feature_mojang_status' into develop | Petr Mrázek | 2014-01-12 | -0/+90 |
|\ \ | ||||
| * | | More space between status items | Sky | 2014-01-12 | -4/+4 |
| | | | ||||
| * | | Show Mojang service statuses in status bar | Sky | 2014-01-12 | -0/+90 |
| | | | ||||
* | | | Merge branch 'feature_better_launch' into develop | Petr Mrázek | 2014-01-12 | -13/+46 |
|\ \ \ | |/ / |/| | | ||||
| * | | Replace old launcher part with a shiny new one. No more garbage on the ↵ | Petr Mrázek | 2014-01-12 | -13/+46 |
| | | | | | | | | | | | | command line. | |||
* | | | Show active account skin whilst it's checked for updates | Sky | 2014-01-11 | -3/+6 |
| | | | ||||
* | | | Add tooltips to Java memory spinboxes | Sky | 2014-01-10 | -1/+19 |
| | | | ||||
* | | | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop | Sky | 2014-01-09 | -2/+11 |
|\ \ \ | ||||
| * | | | Make the GitHub link in the about dialog clickable | Forkk | 2014-01-08 | -0/+2 |
| | | | | | | | | | | | | | | | | Fixes #38 | |||
| * | | | Change the issue tracker URL to GitHub issues | Forkk | 2014-01-08 | -1/+1 |
| | | | | | | | | | | | | | | | | Bump hotfix version number and add an entry in the changelog. | |||
| * | | | Fix the window title | Forkk | 2014-01-08 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | The window title now says "MultiMC 5 - Version <version> [on <platform>]" | |||
| * | | | Word wrap the update channel description label | Forkk | 2014-01-08 | -1/+4 |
| |/ / | | | | | | | | | | | | | Previously, channel descriptions that were too long would mess up the dialog. | |||
* / / | Add "MB" as a suffix to memory spinboxes | Sky | 2014-01-09 | -1/+19 |
|/ / | ||||
* | | Add information to the about dialog. | Forkk | 2014-01-07 | -24/+102 |
| | | ||||
* | | Merge pull request #35 from 02JanDal/fix_keep_selection | Sky | 2014-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 Dalheimer | 2014-01-06 | -18/+21 |
| | | | | | | | | | | | | the model is reset) | |||
* | | | Fix proxy settings radio buttons not triggering updates of the proxy settings. | Petr Mrázek | 2014-01-07 | -6/+18 |
| | | | ||||
* | | | Implement proxy settings | Forkk | 2014-01-06 | -3/+187 |
|/ / | ||||
* | | Implement console window tray icon, console window hiding, better scrolling | Petr Mrázek | 2014-01-06 | -27/+96 |
| | | ||||
* | | Scroll console window for <= lines above the bottom instead of the very bottom. | Petr Mrázek | 2014-01-06 | -2/+1 |
| | | ||||
* | | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop | Petr Mrázek | 2014-01-05 | -30/+162 |
|\ \ | ||||
| * \ | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop | Forkk | 2014-01-04 | -7/+59 |
| |\ \ | ||||
| | * | | Fix settings dialog tab ordering again | Sky | 2014-01-05 | -3/+15 |
| | | | | ||||
| | * | | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop | Sky | 2014-01-05 | -5/+78 |
| | |\ \ | ||||
| | * | | | Implement the beloved right click context menu. Just a copy of the instance ↵ | Sky | 2014-01-05 | -0/+29 |
| | | |/ | | |/| | | | | | | | | | toolbar | |||
| * | | | Implement changing update channels | Forkk | 2014-01-04 | -28/+118 |
| | | | | | | | | | | | | | | | | | | | | Allow the user to select which update channel they would like to download updates from. | |||
* | | | | Some more updater fixes | Petr Mrázek | 2014-01-05 | -2/+6 |
| |_|/ |/| | | | | | | | | Paths were wrong - still used work directory instead of root | |||
* | | | Fix library column stretching | Petr Mrázek | 2014-01-04 | -5/+15 |
|/ / | ||||
* | | Explicitly set the close button to be the default button | Jan Dalheimer | 2014-01-03 | -0/+1 |
| | | ||||
* | | Add the option to disable a certain message | Jan Dalheimer | 2014-01-03 | -2/+6 |
| | | ||||
* | | Notifications system. Mainly to be used in case the updater breaks. | Jan Dalheimer | 2014-01-03 | -0/+58 |
|/ | ||||
* | Clean out old assets stuff, fix button hitbox regression | Sky | 2014-01-02 | -39/+0 |
| | ||||
* | Tweak "More..." to "More news..." | Sky | 2014-01-02 | -1/+1 |
| | ||||
* | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news | Forkk | 2014-01-02 | -2/+2 |
|\ | ||||
| * | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop | Sky | 2014-01-02 | -1/+1 |
| |\ | ||||
| * | | Don't show extra space in status bar, tweak "none selected" message | Sky | 2014-01-02 | -2/+2 |
| | | | ||||
* | | | Implement the news button | Forkk | 2014-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_news | Forkk | 2014-01-02 | -167/+594 |
|\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: CMakeLists.txt gui/MainWindow.h | |||
| * | | Make .ico files usable (the plugin is already included) | Jan Dalheimer | 2014-01-02 | -1/+1 |
| |/ | ||||
| * | Save/restore settings dialog (and instance specific settings) window geometry | Sky | 2014-01-02 | -4/+36 |
| | | ||||
| * | More credits tweaking | Sky | 2014-01-01 | -9/+14 |
| | | ||||
| * | ThreadTask for all your ThreadNeeds | Petr Mrázek | 2014-01-01 | -7/+11 |
| | | | | | | | | Use only when absolutely required. | |||
| * | Move assets migration to a task. Needs threading. | Sky | 2014-01-01 | -2/+25 |
| | | ||||
| * | Tweak credits in about dialog | Sky | 2013-12-31 | -22/+29 |
| | | ||||
| * | Add the redistribution/fork text to the About dialog. | Petr Mrázek | 2013-12-31 | -4/+37 |
| | | ||||
| * | Fix silly bug with icon not changing on the toolbar when the icon key changes. | Petr Mrázek | 2013-12-31 | -2/+0 |
| | |