summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
Commit message (Collapse)AuthorAgeLines
* 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
| |
* | 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
|/ / / /
* / / / Added SigList class.Andrew2013-02-13-0/+2
|/ / /
* / / Don't bother installing Qt 5 dependencies. Leave it to the user. Maybe we'll ↵Andrew Okin2013-02-12-4/+4
|/ / | | | | | | make a debian package or something later.
* | More damn libxcb dependencies. DLL hell is not fun.Andrew2013-02-12-1/+4
| |
* | Fixed Linux install / package support in CMakeLists. Fixed Linux start script.Andrew Okin2013-02-12-7/+17
| |
* | Fixed install to automatically include required DLLs. Suck it, DLL hell!Andrew2013-02-12-14/+61
| |
* | Linux packaging stuff.Andrew Okin2013-02-12-10/+55
|/
* Merge branch 'master' of ciserver.forkk.net:MultiMC5Andrew2013-02-06-2/+10
|\
| * Added Linux support to CMakeLists.Andrew Okin2013-02-06-2/+10
| |
* | Implemented login system.Andrew2013-02-05-1/+2
| |