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
1705832feb
Merge remote-tracking branch 'origin/feature_notif_65449324' into develop
2014-03-19 22:28:04 +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
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
Petr Mrázek
47bc7e5ee3
More refactor.
2014-03-05 01:50:05 +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
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
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
616c372690
Fix more stuff. Detached tools, only MCEdit for now.
2014-02-16 10:46:14 +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
Petr Mrázek
af33b96684
Merge branch 'feature_groupview' into integration_derpstances_groupview
2014-02-08 22:18:32 +01:00
Jan Dalheimer
53069205fa
Allow overriding the order in which patches are applied
2014-02-08 17:22:26 +01:00
Petr Mrázek
7839c4ecc0
Pave.
2014-02-04 01:40:51 +01:00
Jan Dalheimer
ac2f64f337
Reload version after removing custom.json
2014-02-03 20:42:04 +01:00
Jan Dalheimer
790402bdce
Disable anything related to user.json for now. Will be re-enabled once we have a gui for it.
2014-02-01 22:32:48 +01:00
Petr Mrázek
1936bd181f
Merge branch 'feature_derpstances' of https://github.com/02JanDal/MultiMC5 into feature_derpstances
...
Conflicts:
gui/dialogs/OneSixModEditDialog.cpp
logic/OneSixUpdate.cpp
2014-02-01 19:37:16 +01:00
Jan Dalheimer
8637cce433
Fix a bug
2014-02-01 16:26:38 +01:00
Jan Dalheimer
4a9e213238
Change the OneSix library view. It now shows a list of patches.
2014-02-01 14:52:21 +01:00
Petr Mrázek
b4b6091372
Add 'empty text' to all the version selection dialogs.
...
Customize it for the Forge one so people finally shut up about 1.7.4
2014-01-29 01:20:19 +01:00
Jan Dalheimer
176783c8ca
Have the libraries tab show tweaker mods instead of libraries
2014-01-27 20:17:29 +01:00
Jan Dalheimer
f9ea3dbfde
Split parsing/applying. Better error logging. Fix crash.
2014-01-27 19:20:07 +01:00
Petr Mrázek
ffbc5bb62c
Offline mode can be used even when online.
...
Allow the user to pick a player name for offline mode.
Big auth refactor. Now using session objects instead of the accounts themselves.
Sessions only last for one instance start and hold all the auth and player data.
2014-01-27 03:00:49 +01:00
Jan Dalheimer
7d5787025a
Change naming from Derp -> OneSix until the new instance type supports legacy
2014-01-24 18:12:02 +01:00
