Commit Graph

561 Commits

Author SHA1 Message Date
50e9574c0c Fix various Dialogs (Titles, License formatting) 2013-12-14 01:54:27 +01:00
Sky
b69351d50d Merge branch 'develop' of github.com:Drayshak/MultiMC5 into develop 2013-12-13 14:58:35 +00:00
Sky
979946b7bb First sweep moving URLs to a constants file 2013-12-13 14:58:11 +00:00
39aebddf3b Add support for 1.7.4 user_type (needs testing with legacy accounts) 2013-12-13 02:47:59 +01:00
Sky
35ec599730 Fix console window sticking open derp 2013-12-11 12:26:23 +00:00
26a7544325 Merge https://github.com/Drayshak/MultiMC5 into develop 2013-12-11 08:39:35 +01:00
Sky
afa5e14e20 Better (but unsorted) Java detection 2013-12-11 04:54:00 +00:00
018f328993 Merge branch 'feature_no_firstrun' of https://github.com/robotbrain/MultiMC5 into develop 2013-12-11 00:08:39 +01:00
ecf7bcf184 Nuke! 2013-12-10 18:06:35 -05:00
fa2ba01a17 Do not let the console close while Minecraft is running (prevent return to main window) 2013-12-10 23:48:20 +01:00
6eb512e5d6 Fix my utter derp 2013-12-10 11:05:40 -05:00
aa61bbe9e4 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
Conflicts:
	CMakeLists.txt
	gui/MainWindow.cpp
2013-12-10 07:22:22 +01:00
3f5c46a1c4 Finish assets update for 1.7.3 2013-12-10 07:12:52 +01:00
4d348581d3 Fix I think. 2013-12-09 19:16:58 -05:00
c7dbc14885 Make it update the instance when it creates it, so you can install forge
right away
2013-12-09 19:13:35 -05:00
712b87c643 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop 2013-12-09 12:06:33 -06:00
7f52bed9e3 Merge branch 'feature_updater' into develop 2013-12-09 12:04:05 -06:00
8db2e5db81 Merge branch 'feature_assets' into develop 2013-12-08 22:19:58 +01:00
b0dbd4f4af Fix offline mode bugs 2013-12-08 22:06:04 +01:00
9410dd042e Move pastebin button on the console window to the left
It's been there before, it's there now :D
2013-12-08 17:43:41 +01:00
d68f49ffc0 Merge branch 'feature_pasting' of https://github.com/robotbrain/MultiMC5 into develop 2013-12-08 17:39:32 +01:00
0cb8ff40b2 Finish preliminary offline support
* 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.
2013-12-08 17:34:45 +01:00
Sky
6d438b2ef3 Work on new assets system. Working legacy assets importer, disabled assets downloading for now 2013-12-08 02:58:44 +00:00
4548930e34 Open the url direectly. 2013-12-06 17:17:32 -05:00
5ad95134dc work on pasting instance logs
blame clang for formatting changes
2013-12-06 16:24:55 -05:00
6ac94ddcb6 Finish implementing update installation.
Also add the option to update on exit.
2013-12-06 12:59:58 -06:00
48ec8e67b8 Implement DownloadUpdateTask
Installing updates is not implemented yet. That's next.
2013-12-05 13:52:55 -06:00
f028aa76bc Offline mode support, part 1
Refactor MojangAccount so it exposes a less generic interface and supports login. Hide the ugly details.
Yggdrasil tasks are now only used from MojangAccount.
2013-12-05 02:39:52 +01:00
bf94aaea75 Rework the update checking system 2013-12-04 12:34:12 -06:00
6aa9bd0f77 Renew the updater branch
Now with some actual consensus on what the updater will do!
2013-12-02 00:55:24 +01:00
f56eff04ef Fix (hopefully) library dependency resolution.
Installing libs is now enabled, hardcoded.
Enable -Wall for all builds.
Fix many warnings and latent bugs.
2013-12-01 16:34:51 +01:00
f27a6c39ea Fix login and startup logging issues
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.
2013-12-01 02:00:42 +01:00
8831856172 Remember the last selected instance and select it on startup 2013-11-30 12:28:20 +01:00
eff38858ef Fixed compilation errors.
Yeah... Forgot to recompile everything after deleting those files.
2013-11-28 22:18:22 -06:00
0395474a0c Nuke dead code 2013-11-28 22:05:58 -06:00
f3a9dde52e Rework the password dialog
It's now used as a general purpose "account edit dialog". It'll be used
for entering usernames, passwords, or both.
2013-11-28 21:40:40 -06:00
bfc9e1e5d5 Verify access tokens before launching Minecraft
Kind of an important thing to do... Heh...
2013-11-28 20:45:52 -06:00
1f150dcb78 Tweak the layout of the accounts button 2013-11-28 16:05:07 -06:00
f7b64a551b Add icon for when no default account is selected
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.
2013-11-28 15:46:04 -06:00
Sky
191e850cf1 Add support for "no default account" 2013-11-27 23:39:36 +00:00
Sky
d32cb1c95d Merge remote-tracking branch 'upstream/feature_yggdrasil' into develop 2013-11-27 22:51:45 +00:00
Sky
70973d111a Use player face in accounts dropdown, grab all valid account skins on startup 2013-11-27 22:47:15 +00:00
Sky
69d8ab16c5 Dropdown for account switching 2013-11-27 22:39:49 +00:00
a4c5f0135e Allow setting no default account
This allows the user to select an account to use every time they launch
an instance.
2013-11-27 16:14:18 -06:00
Sky
38732636d3 Nuke skins.json, use nice yggdrasil implementation instead. Grabs all Mojang account skins on addition, active on startup 2013-11-27 18:45:29 +00:00
Sky
7d7579d7f0 Move "manage accounts" to right, use player skin when available 2013-11-27 16:56:15 +00:00
d6b09f7c13 Add java checker to the instance settings 2013-11-25 01:14:30 +01:00
088b039cf7 Detect java bitness on launch, use appropriate libraries
Fixes problems with latest snapshot
2013-11-25 00:46:52 +01:00
82225a21e1 Merge branch 'feature_yggdrasil' into develop
Conflicts:
	gui/MainWindow.cpp
	logic/OneSixInstance.h

Fix missing session id functionality for legacy and old onesix.
2013-11-24 18:41:35 +01:00
ca297fca79 Prepare for rework of instance launch/update
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.
2013-11-24 06:36:16 +01:00