summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
Commit message (Collapse)AuthorAgeLines
...
* Merge remote-tracking branch 'upstream/master'TakSuyu2013-07-27-0/+3
|\ | | | | | | | | Conflicts: gui/mainwindow.cpp
| * Broke instance loading(?), also attempted to make Toolbar grayed out when no ↵Stiepen2013-07-14-0/+3
| | | | | | | | instance is selected. For debug purposes it is initially not grayed out
* | Renamed some files to support naming schemeTakSuyu2013-07-27-3/+6
|/ | | | | | changed modeditwindow -> legacymodeditdialog added modeditdialog mapped slots for modeditdialog
* Add queued downloader, some super-minor UI tweaks in stuff that's not even ↵Petr Mrázek2013-06-30-5/+16
| | | | visible yet.
* Implemented LWJGL version lists.Andrew2013-05-17-0/+3
| | | | | | | | | | | | | | The LWJGL list actually doesn't use tasks for loading. Instead, it takes advantage of the QNetworkAccessManager's asynchronous requests. This is a system that I may look to implement for other version lists and things such as the Minecraft version list and possibly even instance mod lists. Loading things this way means that code that wants to load a list can simply call the load list function, rather than having to get a task from the list and execute the task. Unfortunately, it also means we can't have task progress dialogs for loading lists, but it shouldn't really be too difficult to write one that works with this system. At some point in the future, I'll probably end up putting all the code for this method of loading lists into a base class and then update the other lists to support it.
* Removed old plugin system and implemented some version list stuff.Andrew2013-05-03-4/+0
|
* Fix quazip issues.Andrew2013-04-01-2/+6
|
* Merge branch 'master' of git://github.com/peterix/MultiMC5Andrew2013-03-28-1/+9
|\ | | | | | | | | | | Conflicts: CMakeLists.txt gui/mainwindow.cpp
| * fix merge issues, make console window work againOrochimarufan2013-03-22-1/+1
| |
| * Merge branch 'master' of http://github.com/peterix/MultiMC5Orochimarufan2013-03-22-1/+2
| |\ | | | | | | | | | | | | | | | Conflicts: CMakeLists.txt main.cpp
| | * Add SVG icon rendering/cachePetr Mrázek2013-03-20-2/+3
| | |
| * | Implement Keyring system baseOrochimarufan2013-03-22-0/+7
| | |
* | | Implemented version lists.Andrew2013-03-28-0/+3
|/ / | | | | | | | | | | Further work on this is still needed. Currently there is no sorting or filtering of any kind. In addition, changes need to be made to fix issues with bad ETags since the current system here is based on MultiMC 4's version list system before it was fixed.
* | Changed spaces to tabs in CMakeLists.txt because space indenting is the work ↵Andrew2013-03-19-15/+15
| | | | | | | | of satan.
* | Add travis CI building.Guilherme Espada2013-03-19-0/+2
|/ | | | Uses GCC
* Instance view, model, delegate.Petr Mrázek2013-03-11-3/+11
|
* Massive re-organization.Andrew2013-02-26-31/+7
|
* Merge branch 'master' of git://github.com/peterix/MultiMC5Andrew2013-02-25-2/+18
|\ | | | | | | | | | | Conflicts: CMakeLists.txt main.cpp
| * Implement ConsoleWindowOrochimarufan2013-02-22-0/+3
| |
| * Merge branch 'master' of http://github.com/Forkk/MultiMC5Orochimarufan2013-02-22-0/+2
| |\
| * | Implement Instance launchingOrochimarufan2013-02-22-0/+3
| | | | | | | | | | | | Use --launch <instance> to test
| * | Merge branch 'inst_rewrite' of http://github.com/Forkk/MultiMC5Orochimarufan2013-02-21-5/+5
| |\ \
| * | | use QtCreator's $QTPATH in CMakeOrochimarufan2013-02-21-1/+5
| | | |
| * | | Merge branch 'master' of http://github.com/peterix/MultiMC5Orochimarufan2013-02-21-142/+191
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: CMakeLists.txt gui/mainwindow.cpp main.cpp
| * | | | Implement About DialogOrochimarufan2013-02-21-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepared XDG icon theme in :/icons/multimc. will only be usefull as soon as Qt decides to support custom fallback themes. use the resources directly for now.
| * | | | Merge branch 'master' of http://github.com/Forkk/MultiMC5Orochimarufan2013-02-20-101/+86
| |\ \ \ \
| * | | | | implement commandline parsingOrochimarufan2013-02-20-0/+2
| | | | | |
| * | | | | Merge branch 'master' of http://github.com/Forkk/MultiMC5Orochimarufan2013-02-18-1/+7
| |\ \ \ \ \
| * | | | | | implement desktop shortcut creation. windows code not tested.Orochimarufan2013-02-13-0/+2
| | | | | | |
| * | | | | | Merge branch 'master' of http://github.com/Forkk/MultiMC5Orochimarufan2013-02-13-12/+117
| |\ \ \ \ \ \
| * | | | | | | add first iteration of the integrated browserOrochimarufan2013-02-13-1/+6
| | | | | | | |
* | | | | | | | Rewrote the settings system. It may still need some work.Andrew2013-02-25-0/+2
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Added interface for game update tasks.Andrew2013-02-21-0/+2
| |_|_|_|_|/ |/| | | | |
* | | | | | Fixed install on LinuxAndrew Okin2013-02-21-5/+5
| | | | | |
* | | | | | Changed java/endian.h to java/javaendian.h in CMakeListsAndrew2013-02-21-1/+1
| |_|_|_|/ |/| | | |
* | | | | Fixed CXX flags.Andrew Okin2013-02-21-15/+13
| | | | |
* | | | | Include Git commit hash in config.hAndrew2013-02-21-1/+18
| | | | |
* | | | | Reorganized the main CMakeLists file and added an icon on Windows.Andrew2013-02-21-82/+117
| | | | |
* | | | | Split MultiMC up into a few separate libraries.Andrew2013-02-20-62/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed plugin system. Tons of other stuff...
* | | | | Added stdinstance plugin and a ton of plugin stuff.Andrew2013-02-20-3/+12
| | | | |
* | | | | Implemented loadList() stuff.Andrew2013-02-19-2/+0
| | | | |
* | | | | Added InstanceLoader and InstanceType headers.Andrew2013-02-18-0/+4
| | | | |
* | | | | Merge branch 'master' into inst_rewriteAndrew2013-02-18-104/+84
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Install plugins in the right dir.Andrew2013-02-18-2/+2
| | | | |
| * | | | Switched to BundleUtils and added OS X support.Andrew2013-02-18-104/+84
| | | | |
* | | | | Merge branch 'master' into inst_rewriteAndrew2013-02-14-1/+7
|\| | | |
| * | | | Merge branch 'master' of github.com:Forkk/MultiMC5Andrew2013-02-14-1/+7
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge pull request #1 from mortu/masterAndrew Okin2013-02-14-1/+7
| | |\ \ \ | | | |_|/ | | |/| | Successfully build using clang 4.1 on OSX
| | | * | Successfully build using clang 4.1 on OSXmortu2013-02-12-1/+7
| | | | |
* | | | | Started reworking the instance system.Andrew2013-02-14-6/+14
|/ / / /