summaryrefslogtreecommitdiffstats
path: root/gui
Commit message (Collapse)AuthorAgeLines
* Merge remote-tracking branch 'origin/feature_notif_65449324' into developPetr Mrázek2014-03-19-20/+231
|\
| * Allow reseting notificationsJan Dalheimer2014-03-15-0/+15
| |
| * Add a timer for clicking away the notification dialogJan Dalheimer2014-03-15-20/+216
| |
* | Merge remote-tracking branch 'origin/feature_json_fixes' into developPetr Mrázek2014-03-19-85/+44
|\ \
| * | Get rid of one reloadInstanceVersionJan Dalheimer2014-03-14-4/+0
| | |
| * | Pull in BaseInstaller related changes from quickmodJan Dalheimer2014-03-14-52/+4
| | |
| * | Move version stuff to the model and reimplement reorderingJan Dalheimer2014-03-14-29/+40
| |/
* | Merge branch 'develop' into feature_badgesJan Dalheimer2014-03-10-147/+83
|\| | | | | | | | | Conflicts: logic/OneSixInstance.cpp
| * Merge remote-tracking branch 'origin/feature_commands' into integration_butcheryPetr Mrázek2014-03-09-0/+15
| |\
| * | Improve reporting of version file errors.xPetr Mrázek2014-03-09-18/+46
| | |
| * | Remove version patch reordering. Remove the main class display from onesix ↵Petr Mrázek2014-03-09-130/+34
| | | | | | | | | | | | edit mods.
| * | More refactor.Petr Mrázek2014-03-05-1/+1
| | |
| * | Merge branch 'develop' into feature_version_json_butcheryPetr Mrázek2014-03-03-0/+2
| |\ \
| * | | No end in sight :<Petr Mrázek2014-03-03-0/+4
| | | |
| * | | Remove widgets from logic.Petr Mrázek2014-03-02-9/+9
| | | |
| * | | Reorganize the version-related code.Petr Mrázek2014-03-01-3/+3
| | | |
* | | | Instance badges. Some easter eggs and one for broken so far.Jan Dalheimer2014-03-10-5/+86
| |_|/ |/| |
* | | Fix another GroupView bugJan Dalheimer2014-03-07-0/+15
| |/ |/|
* | Fix a GroupView crash that was triggered by the FTB trackingJan Dalheimer2014-03-03-0/+2
|/
* Merge branch 'feature_screenshots' into integration_json_and_toolsPetr Mrázek2014-02-25-6/+281
|\ | | | | | | | | | | | | Conflicts: logic/net/URLConstants.h Resolve issues with multiple definitions of URL constants by moving them to their own object file.
| * Screenshots: Optimize image loading and memory use, fix list and button layout.Petr Mrázek2014-02-25-14/+17
| |
| * Reorganize all the screenshot filesPetr Mrázek2014-02-25-11/+11
| |
| * Fix memory leak in systemrobotbrain2014-02-24-5/+5
| |
| * Deleting screenshots. Needs fixing.robotbrain2014-02-24-6/+19
| |
| * Imgur album creationJan Dalheimer2014-02-24-26/+27
| |
| * Working screenshot uploadJan Dalheimer2014-02-24-60/+75
| |
| * Screenshot fixes, move some code around, fix some stuffJan Dalheimer2014-02-24-48/+70
| |
| * Close to finished. Need to fix the upload part. Viewing works (in grayscale)robotbrain2014-02-23-28/+16
| |
| * Initial stuff. It doesnt work.robotbrain2014-02-23-8/+240
| |
* | Merge branch 'fix_json_version' into integration_json_and_toolsPetr Mrázek2014-02-24-1/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: logic/OneSixInstance.cpp logic/OneSixVersionBuilder.cpp Some fixage. Yay for conflicts.
| * | Instance flags. Currently used for marking instances as broken. Can later be ↵Jan Dalheimer2014-02-17-1/+2
| |/ | | | | | | used for badges.
* | Merge branch 'feature_profiling' into integration_json_and_toolsPetr Mrázek2014-02-24-51/+449
|\ \
| * | Fix MCEdit on OSXJan Dalheimer2014-02-21-0/+5
| | |
| * | Fix some external tool related string sin the settings dialog.Petr Mrázek2014-02-16-2/+2
| | |
| * | Nicer way of selecting tool folders and executablesPetr Mrázek2014-02-16-79/+129
| | |
| * | Links to the toolsJan Dalheimer2014-02-16-0/+21
| | |
| * | RestructureJan Dalheimer2014-02-16-2/+2
| | |
| * | Fix path selections for tools (settings dialog)Petr Mrázek2014-02-16-5/+18
| | |
| * | Fix for windows and update tool menu after closing settings dialogJan Dalheimer2014-02-16-41/+49
| | |
| * | Fix more stuff. Detached tools, only MCEdit for now.Jan Dalheimer2014-02-16-3/+90
| | |
| * | More fixes.Jan Dalheimer2014-02-16-1/+1
| | |
| * | Fix stuff. Make sure different ways of aborting profiling work.Jan Dalheimer2014-02-16-3/+17
| | |
| * | Fix a few bugs in profilers.Petr Mrázek2014-02-16-17/+20
| | | | | | | | | | | | | | | | | | * Legacy was launching before the profiler. * Some clarity changes. * Report problem with empty strings as profiler paths.
| * | Underp. Don't depend on OneSix. Nicer "menu" style choosing.Jan Dalheimer2014-02-15-98/+45
| | |
| * | Profiler support. Currently JProfiler and JVisualVM are implemented.Jan Dalheimer2014-02-15-14/+264
| |/
* / New, better, liteloader supportJan Dalheimer2014-02-19-18/+23
|/
* fixed the destination (href) of the link http://github.com/MultiMC/MultiMC5 ↵p-schneider2014-02-14-1/+1
| | | | in AboutDialog.ui (+German translation)
* Fix groupview issuesPetr Mrázek2014-02-10-27/+26
| | | | | * indexAt was using the wrong coordinate system * model events now trigger a delayed layout update instead of immediate.
* Fix kitty. Meow.Petr Mrázek2014-02-09-1/+1
|
* Fix template magic in group view.Petr Mrázek2014-02-09-5/+5
|