summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developPetr Mrázek2013-12-10-69/+45872
|\ | | | | | | | | | | Conflicts: CMakeLists.txt gui/MainWindow.cpp
| * Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developAndrew2013-12-09-40/+83
| |\
| * \ Merge branch 'feature_updater' into developAndrew2013-12-09-55/+45858
| |\ \
| | * \ Merge branch 'feature_updater' of github.com:MultiMC/MultiMC5 into ↵Petr Mrázek2013-12-07-83/+263
| | |\ \ | | | | | | | | | | | | | | | feature_updater
| | | * | Include shellapi.h in the updater on Windows.Andrew2013-12-06-0/+1
| | | | |
| | | * | Added WIN32_LEAN_AND_MEANAndrew2013-12-06-1/+2
| | | | | | | | | | | | | | | | | | | | Should reduce compile times and help get rid of some error things.
| | | * | Finish implementing update installation.Andrew2013-12-06-10/+128
| | | | | | | | | | | | | | | | | | | | Also add the option to update on exit.
| | | * | Implement update installerAndrew2013-12-05-73/+133
| | | | |
| | * | | Fix build failures on Windows.Petr Mrázek2013-12-07-8/+1
| | |/ / | | | | | | | | | | | | | | | | * remove atoll * fix include path of updater depends
| | * | Implement DownloadUpdateTaskAndrew2013-12-05-15/+555
| | | | | | | | | | | | | | | | Installing updates is not implemented yet. That's next.
| | * | Rework the update checking systemAndrew2013-12-04-176/+394
| | | |
| | * | Renew the updater branchPetr Mrázek2013-12-02-45/+44913
| | | | | | | | | | | | | | | | Now with some actual consensus on what the updater will do!
* | | | Finish assets update for 1.7.3Petr Mrázek2013-12-10-381/+203
| | | |
* | | | Merge branch 'feature_assets' into developPetr Mrázek2013-12-08-3/+447
|\ \ \ \ | |_|_|/ |/| | |
| * | | More work on new assets system. Works given a properly constructed assets ↵Sky2013-12-08-3/+210
| | | | | | | | | | | | | | | | folder, no downloading yet
| * | | Work on new assets system. Working legacy assets importer, disabled assets ↵Sky2013-12-08-1/+238
| | |/ | |/| | | | | | | downloading for now
* | | Fix offline mode bugsPetr Mrázek2013-12-08-40/+83
| |/ |/|
* | Move pastebin button on the console window to the leftPetr Mrázek2013-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ázek2013-12-08-0/+136
|\ \ | | | | | | | | | into develop
| * | fix revertrobotbrainify2013-12-06-0/+2
| | |
| * | revertrobotbrainify2013-12-06-113/+111
| | |
| * | Open the url direectly.robotbrainify2013-12-06-12/+3
| | |
| * | Fixes to pastingrobotbrainify2013-12-06-4/+5
| | |
| * | work on pasting instance logsrobotbrainify2013-12-06-111/+255
| |/ | | | | | | blame clang for formatting changes
* | Finish preliminary offline supportPetr Mrázek2013-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 1Petr Mrázek2013-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 developAndrew2013-12-01-563/+778
|\
| * Exclude more debug libs (on OSX), debug builds include debug libs.Petr Mrázek2013-12-01-1/+21
| |
| * Fix (hopefully) library dependency resolution.Petr Mrázek2013-12-01-260/+244
| | | | | | | | | | | | Installing libs is now enabled, hardcoded. Enable -Wall for all builds. Fix many warnings and latent bugs.
| * Fix private info censorPetr Mrázek2013-12-01-2/+2
| |
| * Fix login and startup logging issuesPetr Mrázek2013-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.
| * Merge https://github.com/brainiac744/MultiMC5 into developPetr Mrázek2013-11-30-1/+1
| |\
| | * Fix OS X packaging problemAnthony Parrott2013-11-29-1/+1
| | | | | | | | | | | | | | | | | | GLOB_RECURSE was pointing at the wrong directory - it needed to point at the directories that had the dylib files in them to fix them so they didn’t point at the local installed version of Qt
| * | Fix crash when no instances are availableJan Dalheimer2013-11-30-0/+5
| | |
| * | Remember the last selected instance and select it on startupJan Dalheimer2013-11-30-4/+38
| |/
* / Rework MultiMC's versioning systemAndrew2013-12-01-31/+46
|/
* Fixed compilation errors.Andrew2013-11-28-8/+0
| | | | Yeah... Forgot to recompile everything after deleting those files.
* Nuke dead codeAndrew2013-11-28-839/+3
|
* Rework the password dialogAndrew2013-11-28-96/+101
| | | | | It's now used as a general purpose "account edit dialog". It'll be used for entering usernames, passwords, or both.
* Verify access tokens before launching MinecraftAndrew2013-11-28-72/+439
| | | | Kind of an important thing to do... Heh...
* Tweak the layout of the accounts buttonAndrew2013-11-28-1/+0
|
* Add icon for when no default account is selectedAndrew2013-11-28-64/+90
| | | | | | Also fixed a bug where the icon on the accounts button wouldn't change when the user checked the "Use as default" checkbox in the account selection dialog.
* Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_yggdrasilAndrew2013-11-28-0/+1
|\
| * Merge https://github.com/brainiac744/MultiMC5 into developPetr Mrázek2013-11-28-0/+1
| |\
| | * Could reach end of rulesFromJsonV4 method without returning a QListAnthony Parrott2013-11-28-0/+1
| | | | | | | | | | | | | | | | | | It was possible for execution to reach the end of the rulesFromJsonV4 method without returning. This was causing a crash on OS X when parsing rules inside an instance.
| * | Merge https://github.com/Drayshak/MultiMC5 into developPetr Mrázek2013-11-28-27/+153
| |\ \ | | |/ | |/|
* | | Merge branch 'develop' of https://github.com/Drayshak/MultiMC5 into ↵Andrew2013-11-28-27/+153
|\ \ \ | |/ / |/| / | |/ feature_yggdrasil
| * Add support for "no default account"Sky2013-11-27-9/+29
| |
| * Merge remote-tracking branch 'upstream/feature_yggdrasil' into developSky2013-11-27-18/+313
| |\
| * | Use player face in accounts dropdown, grab all valid account skins on startupSky2013-11-27-14/+21
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-13 04:38:47 +0000