Jan Dalheimer
3cd2b898e5
Merge remote-tracking branch 'origin/develop' into feature_cmake_style
...
Conflicts:
CMakeLists.txt
2014-04-07 17:44:52 +02:00
Jan Dalheimer
dd7b6642a3
Use the same style of CMake files everywhere
2014-04-06 19:43:09 +02:00
Jan Dalheimer
eb246c4fa7
.cmake files to reduce "code" duplicate
2014-04-06 18:12:48 +02:00
Petr Mrázek
5f7a48a35e
Fix issues with badly encoded escape sequences in config files.
2014-03-29 21:16:54 +01:00
Jan Dalheimer
f1dc456802
Also reload the instance cfg
...
While this should work, there don't seem to be any places where the signals are listened for, so changes probably will only be available when calling Setting::get
TODO: Fix that ^
2014-03-09 08:43:08 +01:00
Petr Mrázek
7ceb2cacb1
Fix a few bugs in profilers.
...
* Legacy was launching before the profiler.
* Some clarity changes.
* Report problem with empty strings as profiler paths.
2014-02-16 00:10:45 +01:00
Jan Dalheimer
8219dbf612
Underp. Don't depend on OneSix. Nicer "menu" style choosing.
2014-02-15 22:26:44 +01:00
Petr Mrázek
af33b96684
Merge branch 'feature_groupview' into integration_derpstances_groupview
2014-02-08 22:18:32 +01:00
Petr Mrázek
7839c4ecc0
Pave.
2014-02-04 01:40:51 +01:00
Petr Mrázek
b82eb5873e
Add 'depends/groupview/' from commit '946d49675cb4725c31ab49a51f3bcae302f89a19'
...
git-subtree-dir: depends/groupview
git-subtree-mainline: a17caba2c9
git-subtree-split: 946d49675c
2014-02-04 00:53:05 +01:00
Petr Mrázek
a17caba2c9
Nuke.
2014-02-04 00:43:18 +01:00
Jan Dalheimer
ece826bdbc
Add a MMC-depend field (soft/hard) for version checking
2014-02-02 14:05:07 +01:00
Petr Mrázek
c46c508fc6
Extract native libs in the launcher part.
2014-01-22 02:20:09 +01:00
Petr Mrázek
ecc80bd763
Change the native extraction/loading logic.
2014-01-18 03:33:04 +01:00
Orochimarufan
188d0d5886
Improve Console window output.
...
-> Log Pre- and Post-Launch command happenings
-> Enable the java part to specify the level
TODO: fix logging with mc 1.7's log4j logging infrastructure
Signed-off-by: Orochimarufan <orochimarufan.x3@gmail.com>
2014-01-17 22:55:10 +01:00
Petr Mrázek
555cbe00ce
Do not use the java checker during instance update
2014-01-14 01:13:35 +01:00
Petr Mrázek
fca4441229
Replace old launcher part with a shiny new one. No more garbage on the command line.
2014-01-12 21:57:34 +01:00
Petr Mrázek
fb83299e59
Deploy jars instead of extracting them at runtime, remove non-working nvidia fix
2014-01-08 01:28:33 +01:00
Petr Mrázek
0dcf694c87
More updater fixage
...
Preserve --dir parameter after updating
Allow more than one copy of a command line parameter in MultiMC
Linux runner script no longer changes current directory, which allows '--dir .'
Fixed unit tests, removed the obsolete one (for some legacy updater command line params that were also removed)
[fixes 63127704]
2014-01-05 16:47:12 +01:00
Petr Mrázek
cb0f7a06a1
Remove offending Settings constructor.
...
Was causing build problems on OSX.
2014-01-01 15:30:26 +01:00
Petr Mrázek
396e63500e
Allow the use of synonyms in settings. Refactor settings.
...
Remove a bunch of obsolete/unused code.
2014-01-01 15:10:35 +01:00
Petr Mrázek
3051d0d328
Make pack200 use QFile by proxy, eliminating some unicode issues.
2013-12-22 18:49:52 +01:00
Petr Mrázek
d6c71488b3
Some test madness
2013-12-20 23:04:11 +01:00
Petr Mrázek
8f856f5573
Merge branch 'testing' of https://github.com/02JanDal/MultiMC5 into develop
...
Conflicts:
MultiMC.cpp
2013-12-14 14:00:23 +01:00
Sky
afa5e14e20
Better (but unsorted) Java detection
2013-12-11 04:54:00 +00:00
Jan Dalheimer
0a6399b52c
Unit testing
2013-12-02 11:09:56 +01:00
Petr Mrázek
f56eff04ef
Fix (hopefully) library dependency resolution.
...
Installing libs is now enabled, hardcoded.
Enable -Wall for all builds.
Fix many warnings and latent bugs.
2013-12-01 16:34:51 +01:00
Petr Mrázek
ca297fca79
Prepare for rework of instance launch/update
...
Added missing licenses
Added a Java functionality checker (detects 32/64bit java)
Refactor of *Update - no longer based on BaseUpdate, but Task directly
Fixed runner script to not derp up on 32bit linux. Could add more detection and error reporting there.
Resources are now split into graphics and generated. Generated resources are placed in the build tree and included from there.
Used the Java checker in the main settings dialog (TODO: instance settings).
Partial support for ${arch}-using libraries - both 32 and 64 variants of ${arch} are downloaded.
2013-11-24 06:36:16 +01:00
Petr Mrázek
bb7e8985f6
Reformat and (slightly) decruft all the things.
2013-11-04 02:53:05 +01:00
Petr Mrázek
4466929074
Add instance copying, fix instance creation (with identical names)
2013-11-03 21:28:04 +01:00
Petr Mrázek
e7e03c2b54
BLIND CODE, BLIND CODE HERE! WHERE IS THE COMPILER!?!?!
...
It choked on missing headers, maybe?
2013-10-28 22:01:37 +01:00
Petr Mrázek
7df667f823
Valgrind-checked early application start
2013-10-28 21:50:58 +01:00
Petr Mrázek
6ecb833dbf
Fix problem with instance list not using the instance folder path
2013-10-28 20:55:12 +01:00
Petr Mrázek
8b18af0515
Get rid of junky timestamps, along with some select pointless log messages
2013-10-06 03:07:57 +02:00
Sky
d48aae7a16
Fix Linux CMake issues arising from Windows workaround
2013-10-06 01:09:21 +01:00
Petr Mrázek
e45b444242
Add tweaks to make things build on windows
2013-09-30 03:26:23 +02:00
Petr Mrázek
8b0f8b9e59
``Working'' forge unpackers. Needs a lot of hardening but good for alpha.
2013-09-30 02:34:46 +02:00
Petr Mrázek
604162acdf
Turn pack200 into an actual library
2013-09-29 21:11:30 +02:00
Petr Mrázek
d267d86f6e
Replace lzma with xz. Tweaks to fix debug builds.
2013-09-28 18:43:30 +02:00
Petr Mrázek
6f1278b607
Merge branch 'develop' of https://github.com/Drayshak/MultiMC5 into develop
2013-09-27 08:20:20 +02:00
Petr Mrázek
33b95c6a38
Add license of PACK200
2013-09-27 08:18:32 +02:00
Sky
8c36e69b06
Attempt fix for cmake warning spam on Windows
2013-09-26 12:49:58 +01:00
Petr Mrázek
2c8dc0b855
Compression algo dependencies, still need hackery...
2013-09-26 02:59:56 +02:00
Petr Mrázek
05de1e75e9
Fix up QuaZip zlib header lookup on Windows.
2013-09-08 22:31:49 +02:00
Sky
81fa7c3c3a
Attempt to fix quazip build error on Windows
2013-09-08 19:51:40 +01:00
Petr Mrázek
6892c11e9f
Move a good chunk of the singleton objects into a new QApplication subclass.
2013-09-07 04:00:58 +02:00
Petr Mrázek
fcd05ca2f6
Read mod files to get versions... and stuff.
2013-08-27 22:32:41 +02:00
Petr Mrázek
392c58c4b0
Ehh... things.
2013-08-26 04:57:09 +02:00
Petr Mrázek
00742af3a6
OS compatibility and generic cleanup.
...
Removed bspatch/patchlib
Now builds and runs on Windows
2013-08-26 02:53:29 +02:00
Petr Mrázek
f0990fae4b
Many improvements
...
PermGen can be tweaked from the settings menu
Groups are saved on change/exit
Install target is no longer completely broken
All the deplibs are now static
Added notes dialog
Fixed ini file format support (can save strings with newlines, tabs. UTF-8 is explicitly used!)
Rename button now uses line breaks so it doesn't grow ever wider (Added a custom tool button subclass)
There is now a CAT button. Meow.
2013-08-25 22:48:41 +02:00
Petr Mrázek
d884f849d6
All kinds of incremental improvements
...
Redone the instance action toolbar:
* Removed all the dead actions
* Change icon and Rename are now morphed into a header
* Added button for opening the config folder
Implemented support for loose files and folders as legacy jar mods
Added texture pack support
2013-08-25 01:32:42 +02:00
Petr Mrázek
e3b55067eb
Legacy jar reassembly, base of proper custom jar support
2013-08-24 03:09:46 +02:00
Petr Mrázek
c92ad7dcf8
Drag and Drop, mod management.
2013-08-18 20:52:17 +02:00
Petr Mrázek
253067c782
Move all the things (YES. Move them.)
...
Also, implemented some basic modlist logic, to be wired up.
2013-08-17 13:40:51 +02:00