summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
...
| * Merge branch 'master' of http://github.com/Forkk/MultiMC5Orochimarufan2013-02-22-0/+74
| |\
| * | Implement Instance launchingOrochimarufan2013-02-22-20/+425
| * | Merge branch 'inst_rewrite' of http://github.com/Forkk/MultiMC5Orochimarufan2013-02-21-5/+9
| |\ \
| * | | use QtCreator's $QTPATH in CMakeOrochimarufan2013-02-21-1/+5
| * | | Merge branch 'master' of http://github.com/peterix/MultiMC5Orochimarufan2013-02-21-993/+1979
| |\ \ \
| * | | | Implement About DialogOrochimarufan2013-02-21-25/+397
| * | | | Merge branch 'master' of http://github.com/Forkk/MultiMC5Orochimarufan2013-02-20-101/+372
| |\ \ \ \
| * | | | | implement commandline parsingOrochimarufan2013-02-20-7/+764
| * | | | | Merge branch 'master' of http://github.com/Forkk/MultiMC5Orochimarufan2013-02-18-1/+7
| |\ \ \ \ \
| * | | | | | implement desktop shortcut creation. windows code not tested.Orochimarufan2013-02-13-4/+152
| * | | | | | Merge branch 'master' of http://github.com/Forkk/MultiMC5Orochimarufan2013-02-13-13/+133
| |\ \ \ \ \ \
| * | | | | | | add first iteration of the integrated browserOrochimarufan2013-02-13-4/+233
* | | | | | | | Rewrote the settings system. It may still need some work.Andrew2013-02-25-271/+782
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Added interface for game update tasks.Andrew2013-02-21-0/+74
| |_|_|_|_|/ |/| | | | |
* | | | | | Fixed install on LinuxAndrew Okin2013-02-21-5/+9
* | | | | | Changed java/endian.h to java/javaendian.h in CMakeListsAndrew2013-02-21-1/+1
| |_|_|_|/ |/| | | |
* | | | | More GCC fixesPetr Mrázek2013-02-21-6/+6
* | | | | Merge branch 'inst_rewrite' of https://github.com/Forkk/MultiMC5Petr Mrázek2013-02-21-31/+28
|\ \ \ \ \
| * | | | | Fixed MSVC issues.Andrew2013-02-21-9/+6
| * | | | | Fixed CXX flags.Andrew Okin2013-02-21-15/+13
| * | | | | Fixed some issues with GCC.Andrew Okin2013-02-21-12/+14
* | | | | | Merge branch 'inst_rewrite' of https://github.com/Forkk/MultiMC5Petr Mrázek2013-02-21-941/+1914
|\| | | | |
| * | | | | Include Git commit hash in config.hAndrew2013-02-21-1/+20
| * | | | | Reorganized the main CMakeLists file and added an icon on Windows.Andrew2013-02-21-82/+118
| * | | | | Got instance loading working.Andrew2013-02-20-16/+46
| * | | | | Split MultiMC up into a few separate libraries.Andrew2013-02-20-316/+420
| * | | | | Added stdinstance plugin and a ton of plugin stuff.Andrew2013-02-20-7/+614
| * | | | | Implemented loadList() stuff.Andrew2013-02-19-654/+145
| * | | | | Implemented InstanceAndrew2013-02-18-3/+38
| * | | | | Implemented instance loader.Andrew2013-02-18-3/+90
| * | | | | Added InstanceLoader and InstanceType headers.Andrew2013-02-18-2/+225
| * | | | | Merge branch 'master' into inst_rewriteAndrew2013-02-18-104/+84
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'master' into inst_rewriteAndrew2013-02-14-1/+7
| |\ \ \ \ \
| * | | | | | Started reworking the instance system.Andrew2013-02-14-195/+533
* | | | | | | Merge https://github.com/Forkk/MultiMC5Petr Mrázek2013-02-21-30/+434
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | 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' 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 OSXmortu2013-02-12-1/+7
| * | | | Added SigList class.Andrew2013-02-13-0/+288
| |/ / /
| * / / Don't bother installing Qt 5 dependencies. Leave it to the user. Maybe we'll ...Andrew Okin2013-02-12-4/+4
| |/ /
| * | 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-8/+19
| * | Fixed install to automatically include required DLLs. Suck it, DLL hell!Andrew2013-02-12-14/+61
| * | Linux packaging stuff.Andrew Okin2013-02-12-11/+70
| |/
| * Merge branch 'master' of ciserver.forkk.net:MultiMC5Andrew2013-02-06-3/+13
| |\
| | * Added Linux support to CMakeLists.Andrew Okin2013-02-06-3/+13
* | | Merge https://github.com/Forkk/MultiMC5Petr Mrázek2013-02-06-495/+2112
|\| |
| * | Implemented login system.Andrew2013-02-05-21/+141