Anthony Parrott
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
Andrew
fec8c054c3
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_yggdrasil
2013-11-28 13:24:08 -06:00
Petr Mrázek
e18feee26f
Update BUILD.md
...
Add OSX build instructions taken from https://gist.github.com/number5/7250865
2013-11-28 13:41:14 +01:00
Andrew
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
Andrew
d794a4d0bf
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
2013-11-27 14:20:42 -06:00
Andrew
7e87278da9
Add Arcanist config file
2013-11-27 14:19:31 -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
Petr Mrázek
7024e5a83e
Fix for latest snapshot ``changes''
2013-11-27 01:50:38 +01:00
Petr Mrázek
d6b09f7c13
Add java checker to the instance settings
2013-11-25 01:14:30 +01:00
Petr Mrázek
088b039cf7
Detect java bitness on launch, use appropriate libraries
...
Fixes problems with latest snapshot
2013-11-25 00:46:52 +01:00
Petr Mrázek
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
Petr Mrázek
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
Petr Mrázek
4124faf474
Fix console window (now not a QDialog)
...
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.
2013-11-23 01:41:28 +01:00
Andrew
75e7932607
Properly implement launching and downloading
...
Also added a system to select an active account to log in with.
2013-11-22 12:47:39 -06:00
Andrew
23bc195b3c
Implement removing accounts.
2013-11-22 10:54:52 -06:00
Andrew
69ac3e5a86
Tweak the "no accounts" warning a bit.
...
It now asks users if they want to open the manage accounts dialog to
add their accounts.
2013-11-22 10:12:16 -06:00
Andrew
a332e0d7b1
Fix crashing when there are no accounts added
...
The warning message actually displays now when there are no Mojang
accounts to log in with, rather than simply crashing MultiMC.
2013-11-22 09:53:27 -06:00
Petr Mrázek
7f5eb5d61a
Implement user info stub for newest minecraft snapshot
2013-11-22 01:04:14 +01:00
Andrew
abf8408911
Nuke and pave the old login system
...
Also, account list now saves profile lists.
2013-11-20 18:31:15 -06:00
Andrew
03652b01d2
Add a button to open the account list.
...
Also fix the account list dialog's close button.
2013-11-20 12:20:35 -06:00
Andrew
928e0d0b15
Implement saving account list to file
...
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.
2013-11-19 12:53:30 -06:00
Petr Mrázek
57a9dadb08
Forge XZ downloads now use temp files local to MultiMC, files are removed.
2013-11-19 00:47:59 +01:00
Petr Mrázek
294c2d122f
Fix assets URL (expected to change... again)
2013-11-18 20:12:24 +01:00
Andrew
a9a0b65358
Implement loading accounts from list.
2013-11-18 12:58:03 -06:00
Andrew
cdca530139
Implement account list and account list dialog
2013-11-18 12:05:35 -06:00
Petr Mrázek
30b3395770
Re-enable assets download
2013-11-17 12:08:07 +01:00
Petr Mrázek
9fcb287ea2
Fix broken signal in ConsoleWindow
...
Wasn't detecting minecraft shutdown properly
2013-11-17 11:48:01 +01:00
Petr Mrázek
9559be32bd
Merge branch 'master' into develop
2013-11-17 11:46:44 +01:00
Petr Mrázek
210629e274
Use the forge mirrors for downloading forge libraries
...
Let's hope we never, ever see a forge download error again.
2013-11-17 11:44:18 +01:00
Petr Mrázek
2a45302dfc
Mark forge lib downloads as failed when they fail
2013-11-16 20:36:01 +01:00
Andrew
ad8aeb0b2b
Implement auth task's response processing.
...
The authenticate task can now successfully log a user in.
2013-11-14 14:32:43 -06:00
Andrew
9cfd5ae465
Add test authentication task.
...
It doesn't actually do anything with the server's reply yet.
2013-11-14 12:17:38 -06:00
Andrew
d84b1a91f4
Add abstract base class for Yggdrasil tasks.
2013-11-13 14:12:31 -06:00
Andrew
f6a652f3ae
Added YouCompleteMe config to .gitignore
2013-11-13 12:37:54 -06:00
Petr Mrázek
662b4bc8cb
Merge branch 'develop'
2013-11-13 00:25:57 +01:00
Petr Mrázek
9693a5e6e9
Fix signal derp from previous commit
...
Console should now properly close/not close based on minecraft return code/signal.
2013-11-13 00:24:49 +01:00
Petr Mrázek
ee595fb1da
Merge branch 'develop'
2013-11-12 09:35:53 +01:00
Petr Mrázek
fdc58bb913
Fix console not staying open on minecraft crash
2013-11-12 09:23:39 +01:00
Andrew
962639aa6d
Added data structures for Mojang Account.
2013-11-11 12:59:59 -06:00
Andrew
52e927a6fd
Added vim *.swp files to .gitignore
2013-11-11 12:59:41 -06:00
Andrew
950088bee5
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
2013-11-11 11:37:15 -06:00
Petr Mrázek
997054a535
Merge branch 'develop'
2013-11-11 04:47:09 +01:00
Petr Mrázek
e611aef0e7
Recover from the bin folder of converted legacy instance being deleted.
...
Use the new vanilla jar as the base jar if mcbackup.jar is missing.
2013-11-11 04:45:31 +01:00
Petr Mrázek
b097d2f744
Use the right LWJGL path while creating an instance
2013-11-11 03:47:14 +01:00
Petr Mrázek
ad7c41114f
Fix layout margins in console window
2013-11-07 22:31:15 +01:00
Petr Mrázek
cc6e9358fe
Merge branch 'develop'
2013-11-06 21:03:22 +01:00
Petr Mrázek
452cc1849f
Fix Sourceforge lwjgl version index download.
2013-11-06 20:59:44 +01:00
Sky
7ddc2b6a89
Merge branch 'develop'
2013-11-06 17:02:23 +00:00
Sky
bba4ed5ab2
Open on the correct settings tab
2013-11-06 17:00:02 +00:00