summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
Commit message (Collapse)AuthorAgeLines
* Add hack for NvidiaPetr Mrázek2014-01-06-1/+1
|
* Merge branch 'develop' of github.com:MultiMC/MultiMC5 into developPetr Mrázek2014-01-05-2/+2
|\
| * Prepend a 5 to version strings.Forkk2014-01-04-2/+2
| |
* | Add an option to force using local updater binary (for updater development)Petr Mrázek2014-01-05-1/+2
| |
* | Mess with the updater again.Petr Mrázek2014-01-05-0/+2
|/
* Notifications system. Mainly to be used in case the updater breaks.Jan Dalheimer2014-01-03-0/+4
|
* Implement the news buttonForkk2014-01-02-2/+2
| | | | | | | | | Make the news button open the latest news post in the user's web browser. Also remove the webkit dependency. I was planning on using it to display the news in a custom window, but we'll just use the user's browser for now.
* Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_newsForkk2014-01-02-7/+54
|\ | | | | | | | | | | Conflicts: CMakeLists.txt gui/MainWindow.h
| * Fixed buttons on osx by adding the accessible plugin.Noah Mayr2014-01-02-0/+12
| |
| * ThreadTask for all your ThreadNeedsPetr Mrázek2014-01-01-2/+6
| | | | | | | | Use only when absolutely required.
| * Move assets migration to a task. Needs threading.Sky2014-01-01-0/+2
| |
| * Enable high DPI support on OSXPetr Mrázek2013-12-31-1/+4
| |
| * Refactor icon lists heavilyPetr Mrázek2013-12-31-2/+7
| | | | | | | | | | | | * Icon list now uses a filesystem watcher for updates * Icon folder is user-customizable * All the little details. ALL OF THEM.
| * LiteLoader supportJan Dalheimer2013-12-28-0/+2
| |
| * Various updater fixesPetr Mrázek2013-12-28-1/+5
| | | | | | | | | | | | | | Updater tests for path utils The updater now doesn't use splitpath on Windows (fixes problems with Windows XP) Fix up paths for the OSX updater - should now install the updates into the right place Fix translations install path - translation isntall and deploy should be fixed
| * Initial FTB support. Allows "tracking" of FTB instances.Jan Dalheimer2013-12-21-0/+8
| |
| * Some test madnessPetr Mrázek2013-12-20-1/+8
| |
* | Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_newsAndrew2013-12-15-6/+21
|\| | | | | | | | | Conflicts: CMakeLists.txt
| * Use asset sizes from the index to make the progress bar betterPetr Mrázek2013-12-15-2/+0
| |
| * Fix bugs introduced by unit test branchPetr Mrázek2013-12-14-2/+2
| | | | | | | | | | Account json was getting rewritten by a folder Missing icon on Windows (hopefully fixed, `doing it live`)
| * Use ctestPetr Mrázek2013-12-14-0/+1
| |
| * Merge branch 'testing' of https://github.com/02JanDal/MultiMC5 into developPetr Mrázek2013-12-14-4/+20
| |\ | | | | | | | | | | | | Conflicts: MultiMC.cpp
| | * Unit testingJan Dalheimer2013-12-02-4/+20
| | |
* | | Added a system to load news from MultiMC.org's RSSAndrew2013-12-15-1/+12
|/ / | | | | | | Currently it doesn't show it anywhere in the UI. That's next.
* | Merge branch 'develop' of github.com:Drayshak/MultiMC5 into developSky2013-12-13-2/+2
|\ \
| * | Add support for 1.7.4 user_type (needs testing with legacy accounts)Petr Mrázek2013-12-13-2/+2
| | |
* | | First sweep moving URLs to a constants fileSky2013-12-13-0/+1
|/ /
* | Better (but unsorted) Java detectionSky2013-12-11-0/+2
| |
* | Move fixup_bundle CMake stuff into a separate fileAndrew2013-12-10-16/+5
| |
* | 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.