Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge remote-tracking branch 'origin/feature_new_login_dialog2' into develop | Petr Mrázek | 2014-04-21 | -43/+273 |
|\ | ||||
| * | Comments and reformating | Jan Dalheimer | 2014-04-16 | -1/+4 |
| | | | | | | | | [ci skip] | |||
| * | Fix bug | Jan Dalheimer | 2014-04-16 | -16/+11 |
| | | ||||
| * | LoginDialog changes | Jan Dalheimer | 2014-04-16 | -73/+30 |
| | | ||||
| * | Create a new login dialog | Taeyeon Mori | 2014-04-16 | -43/+318 |
| | | ||||
* | | Add a quit shortcut to the main window (#200) | Taeyeon Mori | 2014-04-21 | -0/+7 |
| | | | | | | | | | | The shortcut is Ctrl+Q on every platform but windows, which doesn have one. See also: http://qt-project.org/doc/qt-5/qkeysequence.html#details (StandardKey Quit) | |||
* | | Merge remote-tracking branch 'origin/feature_raise_console' into develop | Petr Mrázek | 2014-04-21 | -0/+7 |
|\ \ | ||||
| * | | Make the console window raise itself after minecraft closes (#193) | Taeyeon Mori | 2014-04-17 | -0/+7 |
| |/ | | | | | | | | | This needs further testing: http://stackoverflow.com/questions/6087887/bring-window-to-front-raise-show-activatewindow-dont-work | |||
* / | Download and cache FML libs for legacy minecraft versions. | Petr Mrázek | 2014-04-19 | -1/+3 |
|/ | | | | | | * minor fix for version filtering (1.5 no longer shows forge for 1.5.1 and 1.5.2) * FML libs are downloaded to mods/minecraftforge/libs and cached * FML libs are copied to instances which contain FML or forge | |||
* | Give the Patreon button a logo | Sky | 2014-04-12 | -2/+2 |
| | ||||
* | Add Patreon button. Needs an icon (used I for now). | Sky | 2014-04-11 | -0/+24 |
| | ||||
* | Context menu tweaks | Petr Mrázek | 2014-04-08 | -11/+38 |
| | | | | | | * Add create/copy instance actions to the context menu. * Context menu for the instance view background. * Top of the context menu is now a header, fixing the misclick problems. | |||
* | Workaround for dirty build folders. | Petr Mrázek | 2014-04-06 | -2/+2 |
| | | | | My disgust just turned into barely contained rage :< | |||
* | Get rid of long rebuilds because of minor cmake config changes | Petr Mrázek | 2014-04-06 | -14/+15 |
| | ||||
* | Fix FTB-related issues0.3.1 | Petr Mrázek | 2014-03-31 | -1/+22 |
| | ||||
* | Fix many memory leaks. | Petr Mrázek | 2014-03-30 | -33/+56 |
| | ||||
* | Fix issues with badly encoded escape sequences in config files. | Petr Mrázek | 2014-03-29 | -1/+2 |
| | ||||
* | Raise console window when it's open, but hidden behind other windows. | Petr Mrázek | 2014-03-24 | -0/+6 |
| | ||||
* | Make some more error messages translateable. | Petr Mrázek | 2014-03-23 | -8/+8 |
| | ||||
* | Merge remote-tracking branch 'origin/feature_notif_65449324' into develop | Petr Mrázek | 2014-03-19 | -20/+231 |
|\ | ||||
| * | Allow reseting notifications | Jan Dalheimer | 2014-03-15 | -0/+15 |
| | | ||||
| * | Add a timer for clicking away the notification dialog | Jan Dalheimer | 2014-03-15 | -20/+216 |
| | | ||||
* | | Merge remote-tracking branch 'origin/feature_json_fixes' into develop | Petr Mrázek | 2014-03-19 | -85/+44 |
|\ \ | ||||
| * | | Get rid of one reloadInstanceVersion | Jan Dalheimer | 2014-03-14 | -4/+0 |
| | | | ||||
| * | | Pull in BaseInstaller related changes from quickmod | Jan Dalheimer | 2014-03-14 | -52/+4 |
| | | | ||||
| * | | Move version stuff to the model and reimplement reordering | Jan Dalheimer | 2014-03-14 | -29/+40 |
| |/ | ||||
* | | Merge branch 'develop' into feature_badges | Jan Dalheimer | 2014-03-10 | -147/+83 |
|\| | | | | | | | | | Conflicts: logic/OneSixInstance.cpp | |||
| * | Merge remote-tracking branch 'origin/feature_commands' into integration_butchery | Petr Mrázek | 2014-03-09 | -0/+15 |
| |\ | ||||
| * | | Improve reporting of version file errors.x | Petr Mrázek | 2014-03-09 | -18/+46 |
| | | | ||||
| * | | Remove version patch reordering. Remove the main class display from onesix ↵ | Petr Mrázek | 2014-03-09 | -130/+34 |
| | | | | | | | | | | | | edit mods. | |||
| * | | More refactor. | Petr Mrázek | 2014-03-05 | -1/+1 |
| | | | ||||
| * | | Merge branch 'develop' into feature_version_json_butchery | Petr Mrázek | 2014-03-03 | -0/+2 |
| |\ \ | ||||
| * | | | No end in sight :< | Petr Mrázek | 2014-03-03 | -0/+4 |
| | | | | ||||
| * | | | Remove widgets from logic. | Petr Mrázek | 2014-03-02 | -9/+9 |
| | | | | ||||
| * | | | Reorganize the version-related code. | Petr Mrázek | 2014-03-01 | -3/+3 |
| | | | | ||||
* | | | | Instance badges. Some easter eggs and one for broken so far. | Jan Dalheimer | 2014-03-10 | -5/+86 |
| |_|/ |/| | | ||||
* | | | Fix another GroupView bug | Jan Dalheimer | 2014-03-07 | -0/+15 |
| |/ |/| | ||||
* | | Fix a GroupView crash that was triggered by the FTB tracking | Jan Dalheimer | 2014-03-03 | -0/+2 |
|/ | ||||
* | Merge branch 'feature_screenshots' into integration_json_and_tools | Petr Mrázek | 2014-02-25 | -6/+281 |
|\ | | | | | | | | | | | | | 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ázek | 2014-02-25 | -14/+17 |
| | | ||||
| * | Reorganize all the screenshot files | Petr Mrázek | 2014-02-25 | -11/+11 |
| | | ||||
| * | Fix memory leak in system | robotbrain | 2014-02-24 | -5/+5 |
| | | ||||
| * | Deleting screenshots. Needs fixing. | robotbrain | 2014-02-24 | -6/+19 |
| | | ||||
| * | Imgur album creation | Jan Dalheimer | 2014-02-24 | -26/+27 |
| | | ||||
| * | Working screenshot upload | Jan Dalheimer | 2014-02-24 | -60/+75 |
| | | ||||
| * | Screenshot fixes, move some code around, fix some stuff | Jan Dalheimer | 2014-02-24 | -48/+70 |
| | | ||||
| * | Close to finished. Need to fix the upload part. Viewing works (in grayscale) | robotbrain | 2014-02-23 | -28/+16 |
| | | ||||
| * | Initial stuff. It doesnt work. | robotbrain | 2014-02-23 | -8/+240 |
| | | ||||
* | | 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. |