summaryrefslogtreecommitdiffstats
path: root/gui
Commit message (Collapse)AuthorAgeLines
* 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
|
* Do not divide by zero when the last group is collapsed.Petr Mrázek2014-02-09-8/+9
|
* Merge branch 'integration_derpstances_groupview' into developPetr Mrázek2014-02-09-146/+1740
|\
| * Visual and scroll behavior changes to groupviewPetr Mrázek2014-02-09-130/+135
| | | | | | | | | | | | Scroll by rows, not pixels. Paint the checkboxy thing again! Make0 it behave. Set the group header height properly.
| * Merge branch 'feature_groupview' into integration_derpstances_groupviewPetr Mrázek2014-02-08-25/+1526
| |\
| | * Group View: Use painting code from the previous group headers, small ↵Petr Mrázek2014-02-08-19/+117
| | | | | | | | | | | | optimizations
| | * Paint the headers nicer.Petr Mrázek2014-02-05-28/+50
| | |
| | * Fix crash bug related to data changes in new group view.Petr Mrázek2014-02-04-0/+4
| | |
| | * A try at fixing the instance delegate. A bit. Maybe.Petr Mrázek2014-02-04-0/+5
| | |
| | * Pave.Petr Mrázek2014-02-04-25/+1397
| | |
| * | Allow overriding the order in which patches are appliedJan Dalheimer2014-02-08-0/+156
| | |
| * | Reload version after removing custom.jsonJan Dalheimer2014-02-03-0/+2
| | |
| * | Disable anything related to user.json for now. Will be re-enabled once we ↵Jan Dalheimer2014-02-01-36/+1
| | | | | | | | | | | | have a gui for it.
| * | Merge branch 'feature_derpstances' of https://github.com/02JanDal/MultiMC5 ↵Petr Mrázek2014-02-01-122/+87
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | into feature_derpstances Conflicts: gui/dialogs/OneSixModEditDialog.cpp logic/OneSixUpdate.cpp
| | * Fix a bugJan Dalheimer2014-02-01-3/+12
| | |
| | * Change the OneSix library view. It now shows a list of patches.Jan Dalheimer2014-02-01-37/+67
| | |
| | * Have the libraries tab show tweaker mods instead of librariesJan Dalheimer2014-01-27-0/+10
| | |
| | * Split parsing/applying. Better error logging. Fix crash.Jan Dalheimer2014-01-27-2/+2
| | |
| | * Change naming from Derp -> OneSix until the new instance type supports legacyJan Dalheimer2014-01-24-35/+35
| | |
| | * Forge works now too, and so does forge+liteloaderJan Dalheimer2014-01-23-5/+11
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 20:32:56 +0000