summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
Commit message (Collapse)AuthorAgeLines
* Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developPetr Mrázek2013-12-10-40/+48
|\ | | | | | | | | | | Conflicts: CMakeLists.txt gui/MainWindow.cpp
| * Merge branch 'feature_updater' into developAndrew2013-12-09-41/+48
| |\
| | * Implement DownloadUpdateTaskAndrew2013-12-05-0/+2
| | | | | | | | | | | | Installing updates is not implemented yet. That's next.
| | * Rework the update checking systemAndrew2013-12-04-9/+37
| | |
| | * Renew the updater branchPetr Mrázek2013-12-02-37/+14
| | | | | | | | | | | | Now with some actual consensus on what the updater will do!
* | | Finish assets update for 1.7.3Petr Mrázek2013-12-10-9/+2
| | |
* | | Merge branch 'feature_assets' into developPetr Mrázek2013-12-08-0/+8
|\ \ \ | |/ / |/| |
| * | Work on new assets system. Working legacy assets importer, disabled assets ↵Sky2013-12-08-0/+8
| |/ | | | | | | downloading for now
* | Merge branch 'feature_pasting' of https://github.com/robotbrain/MultiMC5 ↵Petr Mrázek2013-12-08-0/+2
|\ \ | | | | | | | | | into develop
| * | fix revertrobotbrainify2013-12-06-0/+2
| | |
| * | revertrobotbrainify2013-12-06-113/+111
| | |
| * | work on pasting instance logsrobotbrainify2013-12-06-111/+113
| |/ | | | | | | blame clang for formatting changes
* / Finish preliminary offline supportPetr Mrázek2013-12-08-2/+0
|/ | | | | | | | | * 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.
* Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developAndrew2013-12-01-97/+126
|\
| * Exclude more debug libs (on OSX), debug builds include debug libs.Petr Mrázek2013-12-01-1/+21
| |
| * 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-7/+8
| | | | | | | | | | | | | | | | 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.
| * 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
* | Rework MultiMC's versioning systemAndrew2013-12-01-5/+18
|/
* Nuke dead codeAndrew2013-11-28-5/+0
|
* Rework the password dialogAndrew2013-11-28-3/+3
| | | | | 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-0/+5
| | | | Kind of an important thing to do... Heh...
* Allow setting no default accountAndrew2013-11-27-0/+3
| | | | | This allows the user to select an account to use every time they launch an instance.
* Move "manage accounts" to right, use player skin when availableSky2013-11-27-0/+2
|
* Merge branch 'feature_yggdrasil' into developPetr Mrázek2013-11-24-0/+13
|\ | | | | | | | | | | | | | | Conflicts: gui/MainWindow.cpp logic/OneSixInstance.h Fix missing session id functionality for legacy and old onesix.
| * Implement account list and account list dialogAndrew2013-11-18-0/+5
| |
| * Add test authentication task.Andrew2013-11-14-0/+2
| | | | | | | | It doesn't actually do anything with the server's reply yet.
| * Add abstract base class for Yggdrasil tasks.Andrew2013-11-13-0/+2
| |
| * Added data structures for Mojang Account.Andrew2013-11-11-0/+4
| |
* | Prepare for rework of instance launch/updatePetr Mrázek2013-11-24-11/+19
| | | | | | | | | | | | | | | | | | | | 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.
* | Use the forge mirrors for downloading forge librariesPetr Mrázek2013-11-17-0/+2
|/ | | | Let's hope we never, ever see a forge download error again.
* Reformat and (slightly) decruft all the things.Petr Mrázek2013-11-04-63/+71
|
* Add instance copying, fix instance creation (with identical names)Petr Mrázek2013-11-03-0/+3
|
* Added NagUtils, nag people about trying to override JVM memory optionsSky2013-11-03-0/+2
|
* Add selectable message box helper, use it, make login GUI error label selectableSky2013-10-29-0/+2
|
* S3 bucket listing support and network code refactors.Petr Mrázek2013-10-26-3/+6
| | | | | | * Adds support for listing all objects in an S3 bucket. * Renames a bunch of network related classes (Download->Action) * Net actions now have static constructors
* Fix MainWindow Icon; Fix WM_CLASS issue; now links QX11Extras and libxcb on ↵Orochimarufan2013-10-18-1/+10
| | | | linux
* Huge Java detection refactor, version dialogs on first run (no JavaPath set) ↵Sky2013-10-14-0/+2
| | | | and "auto detect" button
* Move mod info frame and handler to MCModInfoFrame, use on all instancesSky2013-10-08-0/+4
|
* Merge branch 'develop' of github.com:Drayshak/MultiMC5 into developSky2013-10-06-2/+4
|\
| * Fix Linux CMake issues arising from Windows workaroundSky2013-10-06-2/+4
| |
* | Merge branch 'develop' of https://github.com/MultiMC/MultiMC5 into developSky2013-10-06-0/+8
|\ \ | |/ |/|
| * Added file loggerPetr Mrázek2013-10-06-0/+8
| |
* | Add naive Windows Java detection - JavaUtils for finding it on other systems ↵Sky2013-10-05-0/+3
|/ | | | (incomplete)
* Added a make target that prints the version name.Andrew2013-10-01-1/+4
|
* Made run script instal as executable.Andrew2013-10-01-1/+1
| | | | Also fixed a small bug with the run script.
* Add run script to install.Andrew2013-10-01-1/+2
| | | | | Also renamed "translations_target" to "translations". The old name was dumb and annoying.
* Merge branch 'master' into developAndrew2013-10-01-25/+34
|\ | | | | | | This pulls in some changes I made to the CMakeLists file earlier.
| * Fixed CMakeLists install target on Linux.Andrew2013-09-19-25/+34
| |
* | Implemented xz and pack200 unpackers required for proper forge installation.Petr Mrázek2013-09-30-2/+12
|\ \ | | | | | | | | | | | | | | | | | | Merge branch 'feature_forge_unpackers' into develop Conflicts: CMakeLists.txt
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 02:16:43 +0000