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
Andrew
f71479ec33
Added stdinstance plugin and a ton of plugin stuff.
2013-02-20 08:32:59 -06:00
Orochimarufan
519f66efee
Merge branch 'master' of http://github.com/Forkk/MultiMC5
2013-02-20 13:17:03 +01:00
Orochimarufan
c523a2c752
implement commandline parsing
2013-02-20 00:07:52 +01:00
Andrew
6e5017e48b
Implemented loadList() stuff.
2013-02-19 12:15:22 -06:00
Andrew
80cd8b33aa
Implemented Instance
2013-02-18 16:58:53 -06:00
Andrew
d3c4db8f34
Implemented instance loader.
2013-02-18 15:39:01 -06:00
Andrew
15c7efffa1
Added InstanceLoader and InstanceType headers.
2013-02-18 14:50:11 -06:00
Andrew
56480c6fe4
Merge branch 'master' into inst_rewrite
2013-02-18 13:45:49 -06:00
Andrew
b8844e4413
Install plugins in the right dir.
2013-02-18 13:33:22 -06:00
Andrew
d00bd41c92
Switched to BundleUtils and added OS X support.
2013-02-18 12:59:01 -06:00
Orochimarufan
cf0e78b46d
Merge branch 'master' of http://github.com/Forkk/MultiMC5
2013-02-18 17:08:18 +01:00
Andrew
f6a62d98aa
Merge branch 'master' into inst_rewrite
2013-02-14 22:41:45 -06:00
Andrew
98b15ba02a
Merge branch 'master' of github.com:Forkk/MultiMC5
2013-02-14 22:41:35 -06:00
Andrew Okin
bd0e4b7606
Merge pull request #1 from mortu/master
...
Successfully build using clang 4.1 on OSX
2013-02-14 20:41:03 -08:00
Andrew
4b1680f242
Started reworking the instance system.
2013-02-14 22:40:00 -06:00
Andrew
fe452e3ac9
Added SigList class.
2013-02-13 12:16:11 -06:00
Orochimarufan
369b1c55c9
implement desktop shortcut creation. windows code not tested.
2013-02-13 04:03:15 +01:00
Orochimarufan
c755195b97
Merge branch 'master' of http://github.com/Forkk/MultiMC5
2013-02-13 00:48:20 +01:00
Orochimarufan
79c5ae121b
add first iteration of the integrated browser
2013-02-13 00:35:35 +01:00
Andrew Okin
d1b1d7e800
Don't bother installing Qt 5 dependencies. Leave it to the user. Maybe we'll make a debian package or something later.
2013-02-12 13:59:15 -06:00
mortu
b7120b293e
Successfully build using clang 4.1 on OSX
2013-02-12 13:50:45 -06:00
Andrew
5f8784a62e
More damn libxcb dependencies. DLL hell is not fun.
2013-02-12 13:25:42 -06:00
Andrew Okin
4c5d19a62a
Fixed Linux install / package support in CMakeLists. Fixed Linux start script.
2013-02-12 12:49:13 -06:00
Andrew
397c0cb555
Fixed install to automatically include required DLLs. Suck it, DLL hell!
2013-02-12 11:57:27 -06:00
Andrew Okin
5a4b2ad000
Linux packaging stuff.
2013-02-12 10:14:23 -06:00
