Commit Graph

614 Commits

Author SHA1 Message Date
168ed3e8e5 Implemented version lists.
Further work on this is still needed. Currently there is no sorting or filtering of any kind. In addition,
changes need to be made to fix issues with bad ETags since the current system here is based on MultiMC 4's
version list system before it was fixed.
2013-03-28 11:33:31 -05:00
e4f86893a8 fix merge issues, make console window work again 2013-03-22 14:40:55 +01:00
cd1fdbbbc2 Merge branch 'master' of http://github.com/peterix/MultiMC5
Conflicts:
	CMakeLists.txt
	main.cpp
2013-03-22 14:01:54 +01:00
f01bf10dc5 Implement Keyring system base 2013-03-22 13:51:21 +01:00
e4806ab08d Add SVG icon rendering/cache 2013-03-20 07:59:35 +01:00
ad70e3fd4c Changed spaces to tabs in CMakeLists.txt because space indenting is the work of satan. 2013-03-19 19:15:19 -05:00
bf49e58d11 Add travis CI building.
Uses GCC
2013-03-19 20:17:35 +00:00
46f93311af Instance view, model, delegate. 2013-03-11 22:19:17 +01:00
36396f7c6a Massive re-organization. 2013-02-26 16:47:39 -06:00
23474da175 Merge branch 'master' of git://github.com/peterix/MultiMC5
Conflicts:
	CMakeLists.txt
	main.cpp
2013-02-25 13:31:37 -06:00
498225debd Rewrote the settings system. It may still need some work. 2013-02-25 13:24:46 -06:00
3a173648e7 Implement ConsoleWindow 2013-02-22 18:18:23 +01:00
10c707363b Merge branch 'master' of http://github.com/Forkk/MultiMC5 2013-02-22 16:19:37 +01:00
9f174ad4e7 Implement Instance launching
Use --launch <instance> to test
2013-02-22 16:17:31 +01:00
a7111b1328 Added interface for game update tasks. 2013-02-21 18:10:17 -06:00
eda7b6cf9d Merge branch 'inst_rewrite' of http://github.com/Forkk/MultiMC5 2013-02-21 21:55:47 +01:00
d891032219 use QtCreator's $QTPATH in CMake 2013-02-21 21:55:35 +01:00
9118de4b7c Fixed install on Linux 2013-02-21 14:52:23 -06:00
2e0f6091b4 Changed java/endian.h to java/javaendian.h in CMakeLists 2013-02-21 14:36:01 -06:00
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
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
3649904974 Fixed CXX flags. 2013-02-21 12:35:33 -06:00
96e4f73a94 Include Git commit hash in config.h 2013-02-21 11:02:48 -06:00
faddeb2c13 Reorganized the main CMakeLists file and added an icon on Windows. 2013-02-21 10:32:13 -06:00
dd2e836b4c Split MultiMC up into a few separate libraries.
Fixed plugin system.

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