summaryrefslogtreecommitdiffstats
path: root/gui
Commit message (Collapse)AuthorAgeLines
* Merge branch 'develop' of github.com:Drayshak/MultiMC5 into developSky2013-12-13-2/+2
|\
| * Add support for 1.7.4 user_type (needs testing with legacy accounts)Petr Mrázek2013-12-13-2/+2
| |
* | First sweep moving URLs to a constants fileSky2013-12-13-2/+5
|/
* Fix console window sticking open derpSky2013-12-11-2/+5
|
* Merge https://github.com/Drayshak/MultiMC5 into developPetr Mrázek2013-12-11-3/+6
|\
| * Better (but unsorted) Java detectionSky2013-12-11-3/+6
| |
* | Merge branch 'feature_no_firstrun' of https://github.com/robotbrain/MultiMC5 ↵Petr Mrázek2013-12-11-1/+14
|\ \ | | | | | | | | | into develop
| * | Nuke!robotbrain2013-12-10-1/+0
| | |
| * | Fix my utter derprobotbrainify2013-12-10-59/+1
| | |
| * | Fix I think.robotbrain2013-12-09-0/+1
| | |
| * | Make it update the instance when it creates it, so you can install forgerobotbrain2013-12-09-1/+72
| | | | | | | | | | | | right away
* | | Do not let the console close while Minecraft is running (prevent return to ↵Petr Mrázek2013-12-10-0/+3
| |/ |/| | | | | main window)
* | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developPetr Mrázek2013-12-10-15/+218
|\| | | | | | | | | | | Conflicts: CMakeLists.txt gui/MainWindow.cpp
| * Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developAndrew2013-12-09-8/+6
| |\
| * \ Merge branch 'feature_updater' into developAndrew2013-12-09-0/+204
| |\ \
| | * | Finish implementing update installation.Andrew2013-12-06-8/+31
| | | | | | | | | | | | | | | | Also add the option to update on exit.
| | * | Implement DownloadUpdateTaskAndrew2013-12-05-3/+11
| | | | | | | | | | | | | | | | Installing updates is not implemented yet. That's next.
| | * | Rework the update checking systemAndrew2013-12-04-6/+7
| | | |
| | * | Renew the updater branchPetr Mrázek2013-12-02-0/+168
| | | | | | | | | | | | | | | | Now with some actual consensus on what the updater will do!
* | | | Finish assets update for 1.7.3Petr Mrázek2013-12-10-13/+0
| | | |
* | | | Merge branch 'feature_assets' into developPetr Mrázek2013-12-08-1/+5
|\ \ \ \ | |_|_|/ |/| | |
| * | | Work on new assets system. Working legacy assets importer, disabled assets ↵Sky2013-12-08-1/+5
| | |/ | |/| | | | | | | downloading for now
* | | Fix offline mode bugsPetr Mrázek2013-12-08-8/+6
| |/ |/|
* | 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/+24
|\ \ | | | | | | | | | into develop
| * | Open the url direectly.robotbrainify2013-12-06-5/+1
| | |
| * | work on pasting instance logsrobotbrainify2013-12-06-0/+28
| |/ | | | | | | blame clang for formatting changes
* | Finish preliminary offline supportPetr Mrázek2013-12-08-77/+81
| | | | | | | | | | | | | | | | | | * 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-18/+16
|/ | | | | Refactor MojangAccount so it exposes a less generic interface and supports login. Hide the ugly details. Yggdrasil tasks are now only used from MojangAccount.
* Fix (hopefully) library dependency resolution.Petr Mrázek2013-12-01-90/+98
| | | | | | Installing libs is now enabled, hardcoded. Enable -Wall for all builds. Fix many warnings and latent bugs.
* Fix login and startup logging issuesPetr Mrázek2013-12-01-62/+74
| | | | | | | | 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.
* Remember the last selected instance and select it on startupJan Dalheimer2013-11-30-0/+26
|
* Fixed compilation errors.Andrew2013-11-28-5/+0
| | | | Yeah... Forgot to recompile everything after deleting those files.
* Nuke dead codeAndrew2013-11-28-463/+0
|
* Rework the password dialogAndrew2013-11-28-93/+98
| | | | | 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-7/+241
| | | | 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-13/+20
| | | | | | 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.
* Add support for "no default account"Sky2013-11-27-8/+24
|
* Merge remote-tracking branch 'upstream/feature_yggdrasil' into developSky2013-11-27-15/+294
|\
| * Allow setting no default accountAndrew2013-11-27-15/+294
| | | | | | | | | | This allows the user to select an account to use every time they launch an instance.
* | Use player face in accounts dropdown, grab all valid account skins on startupSky2013-11-27-14/+21
| |
* | Dropdown for account switchingSky2013-11-27-11/+110
|/
* Nuke skins.json, use nice yggdrasil implementation instead. Grabs all Mojang ↵Sky2013-11-27-48/+40
| | | | account skins on addition, active on startup
* Move "manage accounts" to right, use player skin when availableSky2013-11-27-42/+47
|
* Add java checker to the instance settingsPetr Mrázek2013-11-25-27/+110
|
* Detect java bitness on launch, use appropriate librariesPetr Mrázek2013-11-25-1/+1
| | | | Fixes problems with latest snapshot
* Merge branch 'feature_yggdrasil' into developPetr Mrázek2013-11-24-110/+354
|\ | | | | | | | | | | | | | | Conflicts: gui/MainWindow.cpp logic/OneSixInstance.h Fix missing session id functionality for legacy and old onesix.
| * Properly implement launching and downloadingAndrew2013-11-22-97/+88
| | | | | | | | Also added a system to select an active account to log in with.
| * Implement removing accounts.Andrew2013-11-22-1/+8
| |