Commit message (Collapse) | Author | Age | Lines | ||
---|---|---|---|---|---|
... | |||||
| * | | Move version stuff to the model and reimplement reordering | Jan Dalheimer | 2014-03-14 | -19/+163 | |
| |/ | |||||
* | | Merge remote-tracking branch 'origin/feature_badges' into develop | Petr Mrázek | 2014-03-19 | -20/+22 | |
|\ \ | |/ |/| | |||||
| * | Merge branch 'develop' into feature_badges | Jan Dalheimer | 2014-03-10 | -1441/+1420 | |
| |\ | | | | | | | | | | | | | Conflicts: logic/OneSixInstance.cpp | ||||
| * | | Instance badges. Some easter eggs and one for broken so far. | Jan Dalheimer | 2014-03-10 | -20/+22 | |
| | | | |||||
* | | | 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 | -5/+5 | |
| | | |||||
* | | 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/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/+147 | |
|\ \ | |||||
| * | | Also reload the instance cfg | Jan Dalheimer | 2014-03-09 | -2/+1 | |
| | | | | | | | | | | | | | | | 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) | ||||
* | | Improve reporting of version file errors.x | Petr Mrázek | 2014-03-09 | -102/+154 | |
| | | |||||
* | | Remove version patch reordering. Remove the main class display from onesix ↵ | Petr Mrázek | 2014-03-09 | -14/+11 | |
| | | | | | | | | edit mods. | ||||
* | | More refactor. | Petr Mrázek | 2014-03-05 | -214/+183 | |
| | | |||||
* | | Fix missed version file assignment. | Petr Mrázek | 2014-03-03 | -4/+3 | |
| | | |||||
* | | No end in sight :< | Petr Mrázek | 2014-03-03 | -19/+23 | |
| | | |||||
* | | 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/+196 | |
| | | |||||
* | | Remove widgets from logic. | Petr Mrázek | 2014-03-02 | -14/+25 | |
| | | |||||
* | | Gather and store liteloader metadata. | Petr Mrázek | 2014-03-02 | -13/+55 | |
| | | |||||
* | | Get rid of parse flags | Petr Mrázek | 2014-03-02 | -15/+4 | |
| | | |||||
* | | Reorganize the version-related code. | Petr Mrázek | 2014-03-01 | -839/+863 | |
| | | |||||
* | | Remove obsolete OneSixFTBInstanceForge | Petr Mrázek | 2014-03-01 | -70/+0 | |
|/ | |||||
* | 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 | -21/+531 | |
|\ | | | | | | | | | | | | | 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 | -1/+20 | |
| | | |||||
| * | Reorganize all the screenshot files | Petr Mrázek | 2014-02-25 | -32/+40 | |
| | | |||||
| * | Fix memory leak in system | robotbrain | 2014-02-24 | -2/+2 | |
| | | |||||
| * | Deleting screenshots. Needs fixing. | robotbrain | 2014-02-24 | -1/+37 | |
| | | |||||
| * | Imgur album creation | Jan Dalheimer | 2014-02-24 | -24/+162 | |
| | | |||||
| * | Working screenshot upload | Jan Dalheimer | 2014-02-24 | -9/+9 | |
| | | |||||
| * | Screenshot fixes, move some code around, fix some stuff | Jan Dalheimer | 2014-02-24 | -15/+21 | |
| | | |||||
| * | Close to finished. Need to fix the upload part. Viewing works (in grayscale) | robotbrain | 2014-02-23 | -106/+37 | |
| | | |||||
| * | Initial stuff. It doesnt work. | robotbrain | 2014-02-23 | -0/+354 | |
| | | |||||
* | | Merge branch 'fix_json_version' into integration_json_and_tools | Petr Mrázek | 2014-02-24 | -159/+214 | |
|\ \ | | | | | | | | | | | | | | | | | | | | | | 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 | -7/+79 | |
| | | | | | | | | | | | | 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 | |
| | | | |||||
| * | | Check if the json version is one we know how to handle | Jan Dalheimer | 2014-02-17 | -6/+26 | |
| |/ | | | | | | | Also some formatting. | ||||
* | | Merge branch 'feature_profiling' into integration_json_and_tools | Petr Mrázek | 2014-02-24 | -4/+531 | |
|\ \ | |||||
| * | | Fix MCEdit on OSX | Jan Dalheimer | 2014-02-21 | -2/+12 | |
| | | | |||||
| * | | Restructure | Jan Dalheimer | 2014-02-16 | -2/+2 | |
| | | | |||||
| * | | Only show folders that really are worlds | Jan Dalheimer | 2014-02-16 | -9/+34 | |
| | | | |||||
| * | | Attempt to find jvisualvm | Jan Dalheimer | 2014-02-16 | -1/+6 | |
| | | | |||||
| * | | Use a combobox instead of a file dialog | Jan Dalheimer | 2014-02-16 | -5/+8 | |
| | | | |||||
| * | | Fix for windows and update tool menu after closing settings dialog | Jan Dalheimer | 2014-02-16 | -3/+11 | |
| | | | |||||
| * | | Fix more stuff. Detached tools, only MCEdit for now. | Jan Dalheimer | 2014-02-16 | -40/+199 | |
| | | |