Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge branch 'feature_screenshots' into integration_json_and_tools | Petr Mrázek | 2014-02-25 | -2/+25 |
|\ | | | | | | | | | | | | | Conflicts: logic/net/URLConstants.h Resolve issues with multiple definitions of URL constants by moving them to their own object file. | |||
| * | Imgur album creation | Jan Dalheimer | 2014-02-24 | -8/+1 |
| | | ||||
| * | Working screenshot upload | Jan Dalheimer | 2014-02-24 | -2/+2 |
| | | ||||
| * | Screenshot fixes, move some code around, fix some stuff | Jan Dalheimer | 2014-02-24 | -27/+9 |
| | | ||||
| * | Close to finished. Need to fix the upload part. Viewing works (in grayscale) | robotbrain | 2014-02-23 | -19/+0 |
| | | ||||
| * | Initial stuff. It doesnt work. | robotbrain | 2014-02-23 | -2/+69 |
| | | ||||
* | | Merge branch 'fix_json_version' into integration_json_and_tools | Petr Mrázek | 2014-02-24 | -1/+2 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | Conflicts: logic/OneSixInstance.cpp logic/OneSixVersionBuilder.cpp Some fixage. Yay for conflicts. | |||
| * | | Instance flags. Currently used for marking instances as broken. Can later be ↵ | Jan Dalheimer | 2014-02-17 | -1/+2 |
| |/ | | | | | | | used for badges. | |||
* | | Restructure | Jan Dalheimer | 2014-02-16 | -1/+1 |
| | | ||||
* | | Fix for windows and update tool menu after closing settings dialog | Jan Dalheimer | 2014-02-16 | -41/+47 |
| | | ||||
* | | Fix more stuff. Detached tools, only MCEdit for now. | Jan Dalheimer | 2014-02-16 | -1/+28 |
| | | ||||
* | | More fixes. | Jan Dalheimer | 2014-02-16 | -1/+1 |
| | | ||||
* | | Fix stuff. Make sure different ways of aborting profiling work. | Jan Dalheimer | 2014-02-16 | -0/+12 |
| | | ||||
* | | Fix a few bugs in profilers. | Petr Mrázek | 2014-02-16 | -3/+4 |
| | | | | | | | | | | | | * Legacy was launching before the profiler. * Some clarity changes. * Report problem with empty strings as profiler paths. | |||
* | | Underp. Don't depend on OneSix. Nicer "menu" style choosing. | Jan Dalheimer | 2014-02-15 | -24/+38 |
| | | ||||
* | | Profiler support. Currently JProfiler and JVisualVM are implemented. | Jan Dalheimer | 2014-02-15 | -8/+48 |
|/ | ||||
* | Fix kitty. Meow. | Petr Mrázek | 2014-02-09 | -1/+1 |
| | ||||
* | Pave. | Petr Mrázek | 2014-02-04 | -15/+15 |
| | ||||
* | Offline mode can be used even when online. | Petr Mrázek | 2014-01-27 | -82/+122 |
| | | | | | | 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. | |||
* | Update the changelog, version, scale the instance icon | Petr Mrázek | 2014-01-20 | -3/+3 |
| | ||||
* | Use icon theme so we can have more than one icon size per icon | Petr Mrázek | 2014-01-19 | -21/+10 |
| | ||||
* | Try to improve status arrows a bit | Sky | 2014-01-19 | -4/+7 |
| | ||||
* | More space between status items | Sky | 2014-01-12 | -4/+4 |
| | ||||
* | Show Mojang service statuses in status bar | Sky | 2014-01-12 | -0/+79 |
| | ||||
* | Show active account skin whilst it's checked for updates | Sky | 2014-01-11 | -3/+6 |
| | ||||
* | 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>]" | |||
* | Fix instances getting deselected after FTB instances are loaded (or whenever ↵ | Jan Dalheimer | 2014-01-06 | -18/+19 |
| | | | | the model is reset) | |||
* | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop | Petr Mrázek | 2014-01-05 | -0/+27 |
|\ | ||||
| * | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop | Sky | 2014-01-05 | -0/+61 |
| |\ | ||||
| * | | Implement the beloved right click context menu. Just a copy of the instance ↵ | Sky | 2014-01-05 | -0/+27 |
| | | | | | | | | | | | | toolbar | |||
* | | | Some more updater fixes | Petr Mrázek | 2014-01-05 | -2/+6 |
| |/ |/| | | | | | Paths were wrong - still used work directory instead of root | |||
* | | 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/+56 |
|/ | ||||
* | Clean out old assets stuff, fix button hitbox regression | Sky | 2014-01-02 | -32/+0 |
| | ||||
* | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news | Forkk | 2014-01-02 | -2/+2 |
|\ | ||||
| * | 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/+10 |
| | | | | | | | | | | | | | | | | | | 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 | -36/+103 |
|\| | | | | | | | | | | | Conflicts: CMakeLists.txt gui/MainWindow.h | |||
| * | 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/+24 |
| | | ||||
| * | Fix silly bug with icon not changing on the toolbar when the icon key changes. | Petr Mrázek | 2013-12-31 | -2/+0 |
| | | ||||
| * | Refactor icon lists heavily | Petr Mrázek | 2013-12-31 | -7/+24 |
| | | | | | | | | | | | | * Icon list now uses a filesystem watcher for updates * Icon folder is user-customizable * All the little details. ALL OF THEM. | |||
| * | Rearrange logiv for OneSix version change | Petr Mrázek | 2013-12-27 | -17/+19 |
| | | ||||
| * | Fix more updater derps. | Petr Mrázek | 2013-12-25 | -5/+9 |
| | | | | | | | | | | * Updater requires unix style paths on input. * No update notification was getting cloned with every check | |||
| * | Merge branch 'develop' of https://github.com/robotbrain/MultiMC5 into develop | Petr Mrázek | 2013-12-25 | -1/+4 |
| |\ | ||||
| | * | Get the updater to display a no update found message. | robotbrainify | 2013-12-24 | -1/+4 |
| | | | ||||
| * | | Log SSL errors, give common solutions | Petr Mrázek | 2013-12-24 | -5/+22 |
| |/ | ||||
| * | Fixed updater not restarting MultiMC after update. | ashka | 2013-12-22 | -1/+1 |
| | |