Orochimarufan
e4f86893a8
fix merge issues, make console window work again
2013-03-22 14:40:55 +01:00
Orochimarufan
cd1fdbbbc2
Merge branch 'master' of http://github.com/peterix/MultiMC5
...
Conflicts:
CMakeLists.txt
main.cpp
2013-03-22 14:01:54 +01:00
Orochimarufan
f4c9cb8c1d
refactor indendation, fix a bug in MinecraftProcess & fix a bug in
...
InstanceLauncher
2013-03-22 13:56:57 +01:00
Orochimarufan
f01bf10dc5
Implement Keyring system base
2013-03-22 13:51:21 +01:00
Orochimarufan
ce867d9169
Port minecraft.jar version detection to Qt
2013-03-22 13:40:32 +01:00
Petr Mrázek
e4806ab08d
Add SVG icon rendering/cache
2013-03-20 07:59:35 +01:00
Andrew
ad70e3fd4c
Changed spaces to tabs in CMakeLists.txt because space indenting is the work of satan.
2013-03-19 19:15:19 -05:00
Andrew Okin
e9ff6fcff7
Merge pull request #3 from GUIpsp/master
...
Add travis CI building.
2013-03-19 13:26:25 -07:00
Guilherme Espada
bf49e58d11
Add travis CI building.
...
Uses GCC
2013-03-19 20:17:35 +00:00
Petr Mrázek
7d7e4034f4
Property change propagation, changing instance groups, icon preview
2013-03-19 06:24:34 +01:00
Petr Mrázek
d67d58e662
Added background cat. Proof of concept :3
2013-03-19 03:20:49 +01:00
Petr Mrázek
7e222c3e8f
Loading instance groups and exposing them to the model
2013-03-18 23:35:54 +01:00
Petr Mrázek
65faabeed4
Connect instance list to model.
2013-03-18 23:00:46 +01:00
Petr Mrázek
b84dfddd1b
Use the actual selection for instance launch.
2013-03-16 03:01:51 +01:00
Andrew
b14cd8d74a
Merge branch 'master' of github.com:Forkk/MultiMC5
2013-03-14 10:06:28 -05:00
Andrew
fd1e3bb814
Fixed issues with libGroupView on Windows.
2013-03-13 13:42:41 -05:00
Andrew
8864c7ebdc
Merge branch 'master' of git://github.com/peterix/MultiMC5
2013-03-13 13:25:24 -05:00
Andrew
f0cb300d04
Added properties to Instance class
2013-03-13 13:19:29 -05:00
Andrew
6a7b127685
Added properties to instance.h
2013-03-13 13:13:28 -05:00
Petr Mrázek
46f93311af
Instance view, model, delegate.
2013-03-11 22:19:17 +01:00
Andrew
2d6e785e4e
Implemented version lists.
2013-03-08 13:56:26 -06:00
Andrew
69040f923b
Added a function to get an instance's type.
2013-03-06 12:32:15 -06:00
Andrew
36396f7c6a
Massive re-organization.
2013-02-26 16:47:39 -06:00
Andrew
bd64cda672
Added instance setting overrides.
2013-02-25 16:36:27 -06:00
Andrew
4ca35a760d
Fixed a lot of MSVC problems
2013-02-25 14:44:36 -06:00
Andrew
b56b819c35
Fixed some formatting.
2013-02-25 13:39:07 -06:00
Andrew
23474da175
Merge branch 'master' of git://github.com/peterix/MultiMC5
...
Conflicts:
CMakeLists.txt
main.cpp
2013-02-25 13:31:37 -06:00
Andrew
498225debd
Rewrote the settings system. It may still need some work.
2013-02-25 13:24:46 -06:00
Petr Mrázek
4fd5bdb01b
*Full* folder name is the instance ID, not just the first part.
2013-02-23 00:56:17 +01:00
Orochimarufan
3a173648e7
Implement ConsoleWindow
2013-02-22 18:18:23 +01:00
Orochimarufan
10c707363b
Merge branch 'master' of http://github.com/Forkk/MultiMC5
2013-02-22 16:19:37 +01:00
Orochimarufan
9f174ad4e7
Implement Instance launching
...
Use --launch <instance> to test
2013-02-22 16:17:31 +01:00
Andrew
a7111b1328
Added interface for game update tasks.
2013-02-21 18:10:17 -06:00
Orochimarufan
eda7b6cf9d
Merge branch 'inst_rewrite' of http://github.com/Forkk/MultiMC5
2013-02-21 21:55:47 +01:00
Orochimarufan
d891032219
use QtCreator's $QTPATH in CMake
2013-02-21 21:55:35 +01:00
Andrew Okin
9118de4b7c
Fixed install on Linux
2013-02-21 14:52:23 -06:00
Andrew
2e0f6091b4
Changed java/endian.h to java/javaendian.h in CMakeLists
2013-02-21 14:36:01 -06:00
Orochimarufan
ca1fd44637
Merge branch 'master' of http://github.com/peterix/MultiMC5
...
Conflicts:
CMakeLists.txt
gui/mainwindow.cpp
main.cpp
2013-02-21 20:40:32 +01:00
Petr Mrázek
50d1f62bf4
More GCC fixes
2013-02-21 19:59:34 +01:00
Petr Mrázek
294c8e21c8
Merge branch 'inst_rewrite' of https://github.com/Forkk/MultiMC5
2013-02-21 19:37:35 +01:00
Andrew
2020d9c24b
Fixed MSVC issues.
2013-02-21 12:42:16 -06:00
Orochimarufan
576e979df4
Implement About Dialog
...
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.
2013-02-21 19:35:52 +01:00
Andrew Okin
3649904974
Fixed CXX flags.
2013-02-21 12:35:33 -06:00
Andrew Okin
e9ef332ec4
Fixed some issues with GCC.
2013-02-21 12:10:10 -06:00
Petr Mrázek
58379657e9
Merge branch 'inst_rewrite' of https://github.com/Forkk/MultiMC5
...
Conflicts:
data/instancemodel.cpp
2013-02-21 18:09:26 +01:00
Andrew
96e4f73a94
Include Git commit hash in config.h
2013-02-21 11:02:48 -06:00
Petr Mrázek
1beef3f73c
Merge https://github.com/Forkk/MultiMC5
2013-02-21 17:40:11 +01:00
Andrew
faddeb2c13
Reorganized the main CMakeLists file and added an icon on Windows.
2013-02-21 10:32:13 -06:00
Andrew
f3b6eeeac4
Got instance loading working.
2013-02-20 19:45:00 -06:00
Andrew
dd2e836b4c
Split MultiMC up into a few separate libraries.
...
Fixed plugin system.
Tons of other stuff...
2013-02-20 19:10:09 -06:00
