Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Make sure adding forced candidates doesn't result in duplicates | Sky | 2013-12-12 | -7/+5 |
| | ||||
* | Don't break Linux and OS X builds :( | Sky | 2013-12-12 | -9/+9 |
| | ||||
* | Java version list should be sorted, JRE->JDK, 64->32 | Sky | 2013-12-12 | -25/+28 |
| | ||||
* | Remove QsLog destinations when they are destroyed. | Andrew | 2013-12-11 | -4/+17 |
| | | | | | | This fixes some issues where MultiMC was segfaulting on exit because things were trying to write to the logger while they were being destroyed, but the destinations had already been destroyed and were left in the list. | |||
* | Fix console window sticking open derp | Sky | 2013-12-11 | -2/+5 |
| | ||||
* | Fix checker progress derp | Sky | 2013-12-11 | -1/+1 |
| | ||||
* | Merge https://github.com/Drayshak/MultiMC5 into develop | Petr Mrázek | 2013-12-11 | -78/+329 |
|\ | ||||
| * | Better (but unsorted) Java detection | Sky | 2013-12-11 | -78/+329 |
| | | ||||
* | | Swap https -> http for asset indexes | Petr Mrázek | 2013-12-11 | -1/+1 |
| | | ||||
* | | Merge branch 'feature_no_firstrun' of https://github.com/robotbrain/MultiMC5 ↵ | Petr Mrázek | 2013-12-11 | -1/+14 |
|\ \ | | | | | | | | | | into develop | |||
| * | | Nuke! | robotbrain | 2013-12-10 | -1/+0 |
| | | | ||||
| * | | Fix my utter derp | robotbrainify | 2013-12-10 | -59/+1 |
| | | | ||||
| * | | Fix I think. | robotbrain | 2013-12-09 | -0/+1 |
| | | | ||||
| * | | Make it update the instance when it creates it, so you can install forge | robotbrain | 2013-12-09 | -1/+72 |
| | | | | | | | | | | | | right away | |||
* | | | Do not let the console close while Minecraft is running (prevent return to ↵ | Petr Mrázek | 2013-12-10 | -0/+3 |
| |/ |/| | | | | | main window) | |||
* | | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop | Petr Mrázek | 2013-12-10 | -16/+21 |
|\ \ | ||||
| * | | Move fixup_bundle CMake stuff into a separate file | Andrew | 2013-12-10 | -16/+21 |
| | | | ||||
* | | | Use metacache for minecraft.jar downloads | Petr Mrázek | 2013-12-10 | -15/+24 |
| | | | ||||
* | | | Nuke. | Petr Mrázek | 2013-12-10 | -7/+0 |
|/ / | ||||
* | | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop | Petr Mrázek | 2013-12-10 | -69/+45872 |
|\| | | | | | | | | | | | Conflicts: CMakeLists.txt gui/MainWindow.cpp | |||
| * | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop | Andrew | 2013-12-09 | -40/+83 |
| |\ | ||||
| * \ | Merge branch 'feature_updater' into develop | Andrew | 2013-12-09 | -55/+45858 |
| |\ \ | ||||
| | * \ | Merge branch 'feature_updater' of github.com:MultiMC/MultiMC5 into ↵ | Petr Mrázek | 2013-12-07 | -83/+263 |
| | |\ \ | | | | | | | | | | | | | | | | feature_updater | |||
| | | * | | Include shellapi.h in the updater on Windows. | Andrew | 2013-12-06 | -0/+1 |
| | | | | | ||||
| | | * | | Added WIN32_LEAN_AND_MEAN | Andrew | 2013-12-06 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | Should reduce compile times and help get rid of some error things. | |||
| | | * | | Finish implementing update installation. | Andrew | 2013-12-06 | -10/+128 |
| | | | | | | | | | | | | | | | | | | | | Also add the option to update on exit. | |||
| | | * | | Implement update installer | Andrew | 2013-12-05 | -73/+133 |
| | | | | | ||||
| | * | | | Fix build failures on Windows. | Petr Mrázek | 2013-12-07 | -8/+1 |
| | |/ / | | | | | | | | | | | | | | | | | * remove atoll * fix include path of updater depends | |||
| | * | | Implement DownloadUpdateTask | Andrew | 2013-12-05 | -15/+555 |
| | | | | | | | | | | | | | | | | Installing updates is not implemented yet. That's next. | |||
| | * | | Rework the update checking system | Andrew | 2013-12-04 | -176/+394 |
| | | | | ||||
| | * | | Renew the updater branch | Petr Mrázek | 2013-12-02 | -45/+44913 |
| | | | | | | | | | | | | | | | | Now with some actual consensus on what the updater will do! | |||
* | | | | Finish assets update for 1.7.3 | Petr Mrázek | 2013-12-10 | -381/+203 |
| | | | | ||||
* | | | | Merge branch 'feature_assets' into develop | Petr Mrázek | 2013-12-08 | -3/+447 |
|\ \ \ \ | |_|_|/ |/| | | | ||||
| * | | | More work on new assets system. Works given a properly constructed assets ↵ | Sky | 2013-12-08 | -3/+210 |
| | | | | | | | | | | | | | | | | folder, no downloading yet | |||
| * | | | Work on new assets system. Working legacy assets importer, disabled assets ↵ | Sky | 2013-12-08 | -1/+238 |
| | |/ | |/| | | | | | | | downloading for now | |||
* | | | Fix offline mode bugs | Petr Mrázek | 2013-12-08 | -40/+83 |
| |/ |/| | ||||
* | | Move pastebin button on the console window to the left | Petr Mrázek | 2013-12-08 | -7/+7 |
| | | | | | | | | It's been there before, it's there now :D | |||
* | | Merge branch 'feature_pasting' of https://github.com/robotbrain/MultiMC5 ↵ | Petr Mrázek | 2013-12-08 | -0/+136 |
|\ \ | | | | | | | | | | into develop | |||
| * | | fix revert | robotbrainify | 2013-12-06 | -0/+2 |
| | | | ||||
| * | | revert | robotbrainify | 2013-12-06 | -113/+111 |
| | | | ||||
| * | | Open the url direectly. | robotbrainify | 2013-12-06 | -12/+3 |
| | | | ||||
| * | | Fixes to pasting | robotbrainify | 2013-12-06 | -4/+5 |
| | | | ||||
| * | | work on pasting instance logs | robotbrainify | 2013-12-06 | -111/+255 |
| |/ | | | | | | | blame clang for formatting changes | |||
* | | Finish preliminary offline support | Petr Mrázek | 2013-12-08 | -210/+223 |
| | | | | | | | | | | | | | | | | | | * ProgressProvider now has an abort() call * Abort button support added to the progress dialog * YggdrasilTask and MojangAccount adapted to support abort YggdrasilTask will time out after 10 seconds of no network activity, or when the user pushes the Play Offline button. In offline mode, all instance update tasks are skipped! This will need further work. | |||
* | | Offline mode support, part 1 | Petr Mrázek | 2013-12-05 | -314/+257 |
|/ | | | | | Refactor MojangAccount so it exposes a less generic interface and supports login. Hide the ugly details. Yggdrasil tasks are now only used from MojangAccount. | |||
* | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop | Andrew | 2013-12-01 | -563/+778 |
|\ | ||||
| * | Exclude more debug libs (on OSX), debug builds include debug libs. | Petr Mrázek | 2013-12-01 | -1/+21 |
| | | ||||
| * | Fix (hopefully) library dependency resolution. | Petr Mrázek | 2013-12-01 | -260/+244 |
| | | | | | | | | | | | | Installing libs is now enabled, hardcoded. Enable -Wall for all builds. Fix many warnings and latent bugs. | |||
| * | Fix private info censor | Petr Mrázek | 2013-12-01 | -2/+2 |
| | | ||||
| * | Fix login and startup logging issues | Petr Mrázek | 2013-12-01 | -299/+471 |
| | | | | | | | | | | | | | | | | Auth uses the refresh endpoint instead of validate. This means less password entering. Console will now only autoscroll when already scrolled all the way down. Better conformance with the Yggdrasil auth protocol (not complete yet, but Mojang launcher isn't complete either). Fix bug that prevented saving the account data (uninitialized variable). Accounts can now trigger account list saving, this is used for the refresh endpoint. |