summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of github.com:Forkk/MultiMC5Andrew2013-03-14-0/+0
|\
| * Added properties to instance.hAndrew2013-03-13-137/+107
| |
* | Fixed issues with libGroupView on Windows.Andrew2013-03-13-7/+9
| |
* | Merge branch 'master' of git://github.com/peterix/MultiMC5Andrew2013-03-13-108/+3582
|\ \
| * | Instance view, model, delegate.Petr Mrázek2013-03-11-108/+3582
| | |
* | | Added properties to Instance classAndrew2013-03-13-139/+129
| |/ |/|
* | Implemented version lists.Andrew2013-03-08-28/+955
| |
* | Added a function to get an instance's type.Andrew2013-03-06-5/+27
|/
* Massive re-organization.Andrew2013-02-26-185/+223
|
* Added instance setting overrides.Andrew2013-02-25-61/+241
|
* Fixed a lot of MSVC problemsAndrew2013-02-25-599/+651
|
* Fixed some formatting.Andrew2013-02-25-334/+339
|
* Merge branch 'master' of git://github.com/peterix/MultiMC5Andrew2013-02-25-22/+2196
|\ | | | | | | | | | | Conflicts: CMakeLists.txt main.cpp
| * *Full* folder name is the instance ID, not just the first part.Petr Mrázek2013-02-23-1/+1
| |
| * Implement ConsoleWindowOrochimarufan2013-02-22-11/+257
| |
| * Merge branch 'master' of http://github.com/Forkk/MultiMC5Orochimarufan2013-02-22-0/+74
| |\
| * | Implement Instance launchingOrochimarufan2013-02-22-20/+425
| | | | | | | | | | | | Use --launch <instance> to test
| * | 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
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: CMakeLists.txt gui/mainwindow.cpp main.cpp
| * | | | Implement About DialogOrochimarufan2013-02-21-25/+397
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+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
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: data/instancemodel.cpp
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed plugin system. Tons of other stuff...
| * | | | | 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
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |