Commit message (Collapse) | Author | Age | Lines | ||
---|---|---|---|---|---|
... | |||||
* | | | | Merge pull request #153 from Drayshak/develop | Sky | 2014-03-16 | -1/+9 | |
|\ \ \ \ | |_|_|/ |/| | | | Better right-click behaviour, context menu on mouse-up instead of down, fixes #151 | ||||
| * | | | Better right-click behaviour, context menu on mouse-up instead of mouse down | Sky | 2014-03-16 | -1/+9 | |
|/ / / | |||||
* | / | Fix missing return in ensureDouble() | Petr Mrázek | 2014-03-10 | -1/+1 | |
| |/ |/| | |||||
* | | Fix a compiling error by adding noexcept | Jan Dalheimer | 2014-03-10 | -6/+6 | |
| | | |||||
* | | Add missing include for math.h | Petr Mrázek | 2014-03-10 | -0/+1 | |
| | | |||||
* | | Merge remote-tracking branch 'origin/feature_paste_66994990' into ↵ | Petr Mrázek | 2014-03-10 | -7/+6 | |
|\ \ | | | | | | | | | | integration_butchery | ||||
| * | | Fix a few paste upload bugs | Jan Dalheimer | 2014-03-07 | -7/+6 | |
| |/ | | | | | | | Fixes https://www.pivotaltracker.com/story/show/66994990 | ||||
* | | Merge remote-tracking branch 'origin/fix_ftb_again' into integration_butchery | Petr Mrázek | 2014-03-09 | -2/+17 | |
|\ \ | |||||
| * | | Add project files I use to gitignore. | robotbrain | 2014-03-07 | -0/+2 | |
| | | | | | | | | | Its easier than opening a new pr for it. :P | ||||
| * | | Use a constant for the buffer size. | robotbrain | 2014-03-05 | -3/+4 | |
| | | | |||||
| * | | Fix it - it did it even if the op failed. | robotbrain | 2014-03-05 | -3/+6 | |
| | | | |||||
| * | | Use windows api to prevent encoding problems. | robotbrain | 2014-03-05 | -1/+10 | |
| | | | |||||
| * | | Fix ftb locations on old windows... again. | robotbrain | 2014-03-03 | -1/+1 | |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/feature_fix_log' into integration_butchery | Petr Mrázek | 2014-03-09 | -1/+14 | |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: logic/MinecraftProcess.cpp | ||||
| * | | | Fix logging when system language is not en_US. | robotbrain | 2014-03-07 | -0/+1 | |
| | |/ | |/| | |||||
* | | | Merge remote-tracking branch 'origin/feature_commands' into integration_butchery | Petr Mrázek | 2014-03-09 | -72/+184 | |
|\ \ \ | |||||
| * | | | Also reload the instance cfg | Jan Dalheimer | 2014-03-09 | -2/+23 | |
| | | | | | | | | | | | | | | | | | | | | While this should work, there don't seem to be any places where the signals are listened for, so changes probably will only be available when calling Setting::get TODO: Fix that ^ | ||||
| * | | | Some pre/post related stuff | Jan Dalheimer | 2014-03-09 | -72/+148 | |
| |/ / | | | | | | | | | | | | | Reload the onesix version config after the commands (addresses https://www.pivotaltracker.com/story/show/60360652) Add a few more variables and also substitute them in the command (fixes https://www.pivotaltracker.com/story/show/66994828) | ||||
| * | | Merge pull request #134 from MultiMC/feature_groupview | Petr Mrázek | 2014-03-07 | -0/+15 | |
| |\ \ | | | | | | | | | Fix another GroupView bug | ||||
| | * | | Fix another GroupView bug | Jan Dalheimer | 2014-03-07 | -0/+15 | |
| |/ / | |||||
* | | | Improve reporting of version file errors.x | Petr Mrázek | 2014-03-09 | -126/+202 | |
| | | | |||||
* | | | Remove version patch reordering. Remove the main class display from onesix ↵ | Petr Mrázek | 2014-03-09 | -144/+45 | |
| | | | | | | | | | | | | edit mods. | ||||
* | | | More refactor. | Petr Mrázek | 2014-03-05 | -215/+184 | |
| | | | |||||
* | | | Merge branch 'develop' into feature_version_json_butchery | Petr Mrázek | 2014-03-03 | -0/+2 | |
|\| | | |||||
| * | | Fix a GroupView crash that was triggered by the FTB tracking | Jan Dalheimer | 2014-03-03 | -0/+2 | |
| | | | |||||
* | | | Fix missed version file assignment. | Petr Mrázek | 2014-03-03 | -4/+3 | |
| | | | |||||
* | | | No end in sight :< | Petr Mrázek | 2014-03-03 | -19/+27 | |
| | | | |||||
* | | | More code butchery related to version files. No end in sight. | Petr Mrázek | 2014-03-03 | -122/+109 | |
| | | | |||||
* | | | Remove a lot of error code and error handling madness. | Petr Mrázek | 2014-03-02 | -309/+230 | |
| | | | |||||
* | | | Remove widgets from logic. | Petr Mrázek | 2014-03-02 | -23/+34 | |
| | | | |||||
* | | | Gather and store liteloader metadata. | Petr Mrázek | 2014-03-02 | -13/+56 | |
| | | | |||||
* | | | Get rid of parse flags | Petr Mrázek | 2014-03-02 | -15/+4 | |
| | | | |||||
* | | | Reorganize the version-related code. | Petr Mrázek | 2014-03-01 | -849/+880 | |
| | | | |||||
* | | | Remove obsolete OneSixFTBInstanceForge | Petr Mrázek | 2014-03-01 | -70/+0 | |
| | | | |||||
* | | | Fix to the way translations are handled. Also updated the german translation ↵ | Jan Dalheimer | 2014-02-25 | -155/+1090 | |
|/ / | | | | | | | with the new strings. | ||||
* | | Fix missing includes in litaloader installer. | Petr Mrázek | 2014-02-25 | -0/+2 | |
| | | |||||
* | | Merge branch 'feature_screenshots' into integration_json_and_tools | Petr Mrázek | 2014-02-25 | -172/+971 | |
|\| | | | | | | | | | | | | | 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 | -15/+38 | |
| | | |||||
| * | Reorganize all the screenshot files | Petr Mrázek | 2014-02-25 | -49/+60 | |
| | | |||||
| * | Fix memory leak in system | robotbrain | 2014-02-24 | -7/+7 | |
| | | |||||
| * | Deleting screenshots. Needs fixing. | robotbrain | 2014-02-24 | -7/+56 | |
| | | |||||
| * | Imgur album creation | Jan Dalheimer | 2014-02-24 | -52/+193 | |
| | | |||||
| * | Working screenshot upload | Jan Dalheimer | 2014-02-24 | -69/+84 | |
| | | |||||
| * | Screenshot fixes, move some code around, fix some stuff | Jan Dalheimer | 2014-02-24 | -63/+91 | |
| | | |||||
| * | Close to finished. Need to fix the upload part. Viewing works (in grayscale) | robotbrain | 2014-02-23 | -134/+53 | |
| | | |||||
| * | Initial stuff. It doesnt work. | robotbrain | 2014-02-23 | -153/+746 | |
| | | |||||
* | | Merge branch 'fix_json_version' into integration_json_and_tools | Petr Mrázek | 2014-02-24 | -160/+216 | |
|\ \ | | | | | | | | | | | | | | | | | | | | | | 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 | -8/+81 | |
| | | | | | | | | | | | | used for badges. | ||||
| * | | Different error message if it's a launcher version mismatch | Jan Dalheimer | 2014-02-17 | -19/+49 | |
| | | | |||||
| * | | Actually remove instances if they fail to load | Jan Dalheimer | 2014-02-17 | -1/+8 | |
| | | |