b69351d50d
Merge branch 'develop' of github.com:Drayshak/MultiMC5 into develop
2013-12-13 14:58:35 +00:00
979946b7bb
First sweep moving URLs to a constants file
2013-12-13 14:58:11 +00:00
0af6f96c3d
Do not log auth crud
2013-12-13 03:06:10 +01:00
382e4fe6b3
Fix syntax error
...
You do not need goto for that. Really.
2013-12-13 02:52:54 +01:00
7d20e2478a
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
2013-12-13 02:48:31 +01:00
39aebddf3b
Add support for 1.7.4 user_type (needs testing with legacy accounts)
2013-12-13 02:47:59 +01:00
a954fc1a32
Fix updater removing all files.
...
Yeah, I don't know what I was thinking, but somehow it worked before.
2013-12-12 17:10:43 -06:00
bf34aa7fbd
Use temporary files for the java checker
2013-12-13 00:02:58 +01:00
808ca76363
Make sure adding forced candidates doesn't result in duplicates
2013-12-12 15:25:02 +00:00
b963ff7416
Don't break Linux and OS X builds :(
2013-12-12 15:04:24 +00:00
a2b0941029
Java version list should be sorted, JRE->JDK, 64->32
2013-12-12 14:56:32 +00:00
3e8e0dd639
Fix checker progress derp
2013-12-11 09:39:25 +00:00
26a7544325
Merge https://github.com/Drayshak/MultiMC5 into develop
2013-12-11 08:39:35 +01:00
bace3c2eab
Swap https -> http for asset indexes
2013-12-11 08:34:22 +01:00
afa5e14e20
Better (but unsorted) Java detection
2013-12-11 04:54:00 +00:00
10e13df00d
Use metacache for minecraft.jar downloads
2013-12-10 20:33:24 +01:00
1b185eba41
Nuke.
2013-12-10 07:52:36 +01: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
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
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
2fe27fd0da
More work on new assets system. Works given a properly constructed assets folder, no downloading yet
2013-12-08 06:12:53 +00:00
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
e2728317e7
Fixes to pasting
2013-12-06 17:13:09 -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
e90f1a2756
Implement update installer
2013-12-05 20:32:52 -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
a3fbf05c7b
Fix private info censor
2013-12-01 02:14:32 +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
8334b6a09f
Fix crash when no instances are available
2013-11-30 12:28:35 +01:00
8831856172
Remember the last selected instance and select it on startup
2013-11-30 12:28:20 +01:00
0395474a0c
Nuke dead code
2013-11-28 22:05:58 -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
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
60e325b8af
Merge https://github.com/brainiac744/MultiMC5 into develop
2013-11-28 21:28:57 +01:00
c0c7037e18
Could reach end of rulesFromJsonV4 method without returning a QList
...
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.
2013-11-28 14:50:04 -05:00
191e850cf1
Add support for "no default account"
2013-11-27 23:39:36 +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
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
7d7579d7f0
Move "manage accounts" to right, use player skin when available
2013-11-27 16:56:15 +00:00
