summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* 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
|/
* 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
| | |
| * | Dropdown for account switchingSky2013-11-27-11/+110
| | |
* | | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_yggdrasilAndrew2013-11-28-1/+19
|\ \ \ | |_|/ |/| |
| * | Update BUILD.mdPetr Mrázek2013-11-28-1/+19
| | | | | | | | | Add OSX build instructions taken from https://gist.github.com/number5/7250865
* | | Allow setting no default accountAndrew2013-11-27-18/+308
|/ / | | | | | | | | This allows the user to select an account to use every time they launch an instance.
* | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developAndrew2013-11-27-87/+156
|\|
| * Nuke skins.json, use nice yggdrasil implementation instead. Grabs all Mojang ↵Sky2013-11-27-87/+51
| | | | | | | | account skins on addition, active on startup
| * Move "manage accounts" to right, use player skin when availableSky2013-11-27-42/+147
| |
* | Add Arcanist config fileAndrew2013-11-27-0/+5
|/
* Fix for latest snapshot ``changes''Petr Mrázek2013-11-27-3/+54
|
* Add java checker to the instance settingsPetr Mrázek2013-11-25-28/+110
|
* Detect java bitness on launch, use appropriate librariesPetr Mrázek2013-11-25-105/+165
| | | | Fixes problems with latest snapshot
* Merge branch 'feature_yggdrasil' into developPetr Mrázek2013-11-24-129/+1846
|\ | | | | | | | | | | | | | | Conflicts: gui/MainWindow.cpp logic/OneSixInstance.h Fix missing session id functionality for legacy and old onesix.
| * Properly implement launching and downloadingAndrew2013-11-22-103/+148
| | | | | | | | Also added a system to select an active account to log in with.
| * Implement removing accounts.Andrew2013-11-22-1/+21
| |
| * Tweak the "no accounts" warning a bit.Andrew2013-11-22-3/+10
| | | | | | | | | | It now asks users if they want to open the manage accounts dialog to add their accounts.
| * Fix crashing when there are no accounts addedAndrew2013-11-22-1/+3
| | | | | | | | | | The warning message actually displays now when there are no Mojang accounts to log in with, rather than simply crashing MultiMC.
| * Nuke and pave the old login systemAndrew2013-11-20-114/+144
| | | | | | | | Also, account list now saves profile lists.
| * Add a button to open the account list.Andrew2013-11-20-2/+20
| | | | | | | | Also fix the account list dialog's close button.
| * Implement saving account list to fileAndrew2013-11-19-3/+133
| | | | | | | | | | Currently it only saves when accounts are added or removed. We'll have to fix this, but we need signals for when account objects change first.
| * Implement loading accounts from list.Andrew2013-11-18-7/+141
| |
| * Implement account list and account list dialogAndrew2013-11-18-9/+520
| |
| * Implement auth task's response processing.Andrew2013-11-14-8/+256
| | | | | | | | The authenticate task can now successfully log a user in.
| * Add test authentication task.Andrew2013-11-14-7/+134
| | | | | | | | It doesn't actually do anything with the server's reply yet.
| * Add abstract base class for Yggdrasil tasks.Andrew2013-11-13-1/+297
| |
| * Added YouCompleteMe config to .gitignoreAndrew2013-11-13-0/+6
| |
| * Added data structures for Mojang Account.Andrew2013-11-11-0/+129
| |
| * Added vim *.swp files to .gitignoreAndrew2013-11-11-0/+2
| |
| * Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developAndrew2013-11-11-77/+85
| |\
| * \ Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developAndrew2013-11-04-3767/+4492
| |\ \
* | | | Prepare for rework of instance launch/updatePetr Mrázek2013-11-24-234/+451
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added missing licenses Added a Java functionality checker (detects 32/64bit java) Refactor of *Update - no longer based on BaseUpdate, but Task directly Fixed runner script to not derp up on 32bit linux. Could add more detection and error reporting there. Resources are now split into graphics and generated. Generated resources are placed in the build tree and included from there. Used the Java checker in the main settings dialog (TODO: instance settings). Partial support for ${arch}-using libraries - both 32 and 64 variants of ${arch} are downloaded.
* | | | Fix console window (now not a QDialog)Petr Mrázek2013-11-23-133/+152
| | | | | | | | | | | | | | | | | | | | | | | | It now opens and coloses as expected, depending on user preferences and the status of the various processes involved. Console window geometry and state are remembered between runs.
* | | | Implement user info stub for newest minecraft snapshotPetr Mrázek2013-11-22-20/+25
| | | |