Commit Graph

423 Commits

Author SHA1 Message Date
Petr Mrázek
5f7a48a35e Fix issues with badly encoded escape sequences in config files. 2014-03-29 21:16:54 +01:00
Petr Mrázek
9617326cf8 Raise console window when it's open, but hidden behind other windows. 2014-03-24 01:54:18 +01:00
Petr Mrázek
4a24ea6c38 Make some more error messages translateable. 2014-03-23 19:07:13 +01:00
Petr Mrázek
1705832feb Merge remote-tracking branch 'origin/feature_notif_65449324' into develop 2014-03-19 22:28:04 +01:00
Petr Mrázek
39d3739442 Merge remote-tracking branch 'origin/feature_json_fixes' into develop 2014-03-19 22:26:25 +01:00
Jan Dalheimer
55e4cb6fb5 Allow reseting notifications 2014-03-15 14:35:35 +01:00
Jan Dalheimer
4f452d5815 Add a timer for clicking away the notification dialog 2014-03-15 14:18:29 +01:00
Jan Dalheimer
42a85def60 Get rid of one reloadInstanceVersion 2014-03-14 21:18:17 +01:00
Jan Dalheimer
e95619fa67 Pull in BaseInstaller related changes from quickmod 2014-03-14 20:48:57 +01:00
Jan Dalheimer
e5b4dee1c0 Move version stuff to the model and reimplement reordering 2014-03-14 19:51:56 +01:00
Jan Dalheimer
fcc5bc2ce0 Merge branch 'develop' into feature_badges
Conflicts:
	logic/OneSixInstance.cpp
2014-03-10 19:24:29 +01:00
Jan Dalheimer
73fc9c79cf Instance badges. Some easter eggs and one for broken so far. 2014-03-10 17:38:27 +01:00
Petr Mrázek
7fd56a30bd Merge remote-tracking branch 'origin/feature_commands' into integration_butchery 2014-03-09 23:46:46 +01:00
Petr Mrázek
b2c803a378 Improve reporting of version file errors.x 2014-03-09 23:42:25 +01:00
Petr Mrázek
ffff2cd324 Remove version patch reordering. Remove the main class display from onesix edit mods. 2014-03-09 17:38:42 +01:00
Jan Dalheimer
cc1de6a649 Fix another GroupView bug 2014-03-07 15:46:56 +01:00
Petr Mrázek
47bc7e5ee3 More refactor. 2014-03-05 01:50:05 +01:00
Petr Mrázek
6b76af116e Merge branch 'develop' into feature_version_json_butchery 2014-03-03 21:57:45 +01:00
Jan Dalheimer
211a72e144 Fix a GroupView crash that was triggered by the FTB tracking 2014-03-03 19:12:48 +01:00
Petr Mrázek
d66f2500a6 No end in sight :< 2014-03-03 01:44:07 +01:00
Petr Mrázek
80d146866c Remove widgets from logic. 2014-03-02 02:17:55 +01:00
Petr Mrázek
7c24bcc834 Reorganize the version-related code. 2014-03-01 23:06:47 +01:00
Petr Mrázek
acff155624 Merge branch 'feature_screenshots' into integration_json_and_tools
Conflicts:
	logic/net/URLConstants.h

Resolve issues with multiple definitions of URL constants by moving them to their own object file.
2014-02-25 01:52:58 +01:00
Petr Mrázek
9d4e840a6e Screenshots: Optimize image loading and memory use, fix list and button layout. 2014-02-25 01:23:33 +01:00
Petr Mrázek
cb5cfe7242 Reorganize all the screenshot files 2014-02-25 00:51:24 +01:00
robotbrain
b1cddb4600 Fix memory leak in system 2014-02-24 17:49:18 -05:00
robotbrain
55e21737dd Deleting screenshots. Needs fixing. 2014-02-24 17:40:05 -05:00
Jan Dalheimer
da33fa4090 Imgur album creation 2014-02-24 11:30:27 +01:00
Jan Dalheimer
a8811a27f7 Working screenshot upload 2014-02-24 10:34:51 +01:00
Jan Dalheimer
226c1bdae5 Screenshot fixes, move some code around, fix some stuff 2014-02-24 09:34:21 +01:00
Petr Mrázek
49dc9695f5 Merge branch 'fix_json_version' into integration_json_and_tools
Conflicts:
	logic/OneSixInstance.cpp
	logic/OneSixVersionBuilder.cpp

Some fixage. Yay for conflicts.
2014-02-24 02:35:01 +01:00
robotbrain
5e33da258c Close to finished. Need to fix the upload part. Viewing works (in grayscale) 2014-02-23 19:48:00 -05:00
Petr Mrázek
f7c97efcf3 Merge branch 'feature_profiling' into integration_json_and_tools 2014-02-24 00:29:13 +01:00
robotbrain
4a77524b05 Initial stuff. It doesnt work. 2014-02-23 16:14:24 -05:00
Jan Dalheimer
a354e8bfae Fix MCEdit on OSX 2014-02-21 20:13:12 +01:00
Jan Dalheimer
7146724607 New, better, liteloader support 2014-02-19 22:34:17 +01:00
Jan Dalheimer
0b56b5efaf Instance flags. Currently used for marking instances as broken. Can later be used for badges. 2014-02-17 20:31:50 +01:00
Petr Mrázek
16d378687c Fix some external tool related string sin the settings dialog. 2014-02-16 14:53:03 +01:00
Petr Mrázek
dd2d8f48fa Nicer way of selecting tool folders and executables 2014-02-16 14:42:44 +01:00
Jan Dalheimer
e4ecc31e07 Links to the tools 2014-02-16 13:02:59 +01:00
Jan Dalheimer
9c87bc6c4b Restructure 2014-02-16 12:52:35 +01:00
Petr Mrázek
1dc34269bd Fix path selections for tools (settings dialog) 2014-02-16 12:04:26 +01:00
Jan Dalheimer
c88c639b8e Fix for windows and update tool menu after closing settings dialog 2014-02-16 11:49:55 +01:00
Jan Dalheimer
616c372690 Fix more stuff. Detached tools, only MCEdit for now. 2014-02-16 10:46:14 +01:00
Jan Dalheimer
994972bf5d More fixes. 2014-02-16 09:30:38 +01:00
Jan Dalheimer
82b35b5445 Fix stuff. Make sure different ways of aborting profiling work. 2014-02-16 08:54:52 +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
Jan Dalheimer
efa8e26a3f Profiler support. Currently JProfiler and JVisualVM are implemented. 2014-02-15 14:19:35 +01:00
p-schneider
725e6a36bb fixed the destination (href) of the link http://github.com/MultiMC/MultiMC5 in AboutDialog.ui (+German translation) 2014-02-14 13:39:00 +01:00