CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
949 Commits 10 Branches 30 Tags 34 MiB
42e305bb9d
Commit Graph

426 Commits

Author SHA1 Message Date
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
5a0e7877b0 Fix groupview issues 
* indexAt was using the wrong coordinate system
* model events now trigger a delayed layout update instead of immediate.
 2014-02-10 00:51:52 +01:00
Petr Mrázek
2f0275c194 Fix kitty. Meow. 2014-02-09 22:55:44 +01:00
Petr Mrázek
1f218bb8cd Fix template magic in group view. 2014-02-09 21:14:34 +01:00
Petr Mrázek
ba401922e1 Do not divide by zero when the last group is collapsed. 2014-02-09 21:04:00 +01:00
Petr Mrázek
1f6a484cb2 Merge branch 'integration_derpstances_groupview' into develop 2014-02-09 20:49:48 +01:00
Petr Mrázek
18f532b0d7 Visual and scroll behavior changes to groupview 
Scroll by rows, not pixels.
Paint the checkboxy thing again! Make0 it behave.
Set the group header height properly.
 2014-02-09 20:45:18 +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
aa41b891f0 Group View: Use painting code from the previous group headers, small optimizations 2014-02-08 21:46:29 +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
f8df07c327 Small tweaks to make things better. 2014-02-06 09:32:44 +01:00
Petr Mrázek
573d4c8050 Paint the headers nicer. 2014-02-05 01:34:50 +01:00
Petr Mrázek
c84c51860d Fix crash bug related to data changes in new group view. 2014-02-04 21:18:02 +01:00
Petr Mrázek
6206a241ea A try at fixing the instance delegate. A bit. Maybe. 2014-02-04 02:01:11 +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
Jan Dalheimer
156bc8f276 Forge works now too, and so does forge+liteloader 2014-01-23 21:31:41 +01:00
Jan Dalheimer
0a592ab99b Work towards liteloader support. Fix creating new instance 2014-01-22 15:20:48 +01:00
Jan Dalheimer
a1a06cc89f Derpstances. Everything renamed. Launching does not yet work. 2014-01-22 07:33:32 +01:00
Petr Mrázek
3a3c9ac951 Update the changelog, version, scale the instance icon 2014-01-20 01:14:11 +01:00
Petr Mrázek
2fe033c4a0 Move a bunch of resources into the resources folder. 
Also, cat is no longer mysterious. It's just FLUFFY!
 2014-01-19 05:21:09 +01:00
Petr Mrázek
d8413fa5ec Use icon theme so we can have more than one icon size per icon 2014-01-19 04:52:34 +01:00
Sky
e6ab57b8b1 Try to improve status arrows a bit 2014-01-19 01:33:32 +00:00
Petr Mrázek
8650aa81f0 Fix settings dialog when offline 2014-01-18 10:31:34 +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
54a9ee5eb0 Merge branch 'feature_localization' of https://github.com/02JanDal/MultiMC5 into develop 
Conflicts:
	gui/dialogs/SettingsDialog.cpp
	gui/dialogs/SettingsDialog.ui
 2014-01-12 23:04:05 +01:00
Petr Mrázek
f552366e03 Merge branch 'feature_mojang_status' into develop 2014-01-12 22:34:53 +01:00
Petr Mrázek
b589a12d17 Merge branch 'feature_better_launch' into develop 2014-01-12 22:17:14 +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
Sky
398167e8b0 More space between status items 2014-01-12 18:44:54 +00:00
Sky
a774b3d248 Show Mojang service statuses in status bar 2014-01-12 18:28:42 +00:00
Sky
088ad07a80 Show active account skin whilst it's checked for updates 2014-01-11 00:22:08 +00:00
Sky
9ddf2aec31 Add tooltips to Java memory spinboxes 2014-01-10 13:16:31 +00:00
Sky
86b6cdfcb3 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop 2014-01-09 15:42:44 +00:00
Sky
e6201f9ff7 Add "MB" as a suffix to memory spinboxes 2014-01-09 15:30:21 +00:00
Forkk
52c9cd5497 Make the GitHub link in the about dialog clickable 
Fixes #38
 2014-01-08 23:38:34 -06:00
Forkk
7d74c9bc25 Change the issue tracker URL to GitHub issues 
Bump hotfix version number and add an entry in the changelog.
 2014-01-08 22:51:21 -06:00
Forkk
b767d4b134 Fix the window title 
The window title now says
"MultiMC 5 - Version <version> [on <platform>]"
 2014-01-08 18:02:15 -06:00
Forkk
b4fcbab513 Word wrap the update channel description label 
Previously, channel descriptions that were too long would mess up the
dialog.
 2014-01-08 17:56:38 -06:00
Forkk
a14eeab2d6 Add information to the about dialog. 2014-01-07 18:31:31 -06:00
Sky
28cb66e85c Merge pull request #35 from 02JanDal/fix_keep_selection 
Fix instances getting deselected after FTB instances are loaded (or when ever the model is reset, like on a reload)
 2014-01-07 05:02:35 -08:00
Petr Mrázek
28c35ea0db Fix proxy settings radio buttons not triggering updates of the proxy settings. 2014-01-07 02:19:26 +01:00
Forkk
0a312d3b08 Implement proxy settings 2014-01-06 15:02:58 -06:00
Jan Dalheimer
093143cfef Fix instances getting deselected after FTB instances are loaded (or whenever the model is reset) 2014-01-06 10:01:40 +01:00
Petr Mrázek
fcb8612c10 Implement console window tray icon, console window hiding, better scrolling 2014-01-06 02:52:51 +01:00
Petr Mrázek
ddb961fad5 Scroll console window for <= lines above the bottom instead of the very bottom. 2014-01-06 00:33:16 +01:00
Petr Mrázek
ced640f68c Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop 2014-01-05 16:53:51 +01:00
Petr Mrázek
613c01dab5 Some more updater fixes 
Paths were wrong - still used work directory instead of root
 2014-01-05 13:17:42 +01:00
Forkk
ee02eecfdc Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop 2014-01-04 19:47:28 -06:00
Forkk
d30962bf00 Implement changing update channels 
Allow the user to select which update channel they would like to
download updates from.
 2014-01-04 19:46:47 -06:00
Sky
ffacaba1aa Fix settings dialog tab ordering again 2014-01-05 01:00:29 +00:00
Sky
7d5fb1e99b Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop 2014-01-05 00:14:10 +00:00
Sky
79158144df Implement the beloved right click context menu. Just a copy of the instance toolbar 2014-01-05 00:06:59 +00:00
Petr Mrázek
e558584af0 Fix library column stretching 2014-01-04 23:45:20 +01:00
Jan Dalheimer
8950953d91 Hopefully fix Qt 5.1 compilation 2014-01-04 19:20:20 +01:00
Jan Dalheimer
7f6b344b49 Clean up/update translation code and made language selectable in the settings dialog 2014-01-04 16:13:28 +01:00
Jan Dalheimer
3b97e3c363 Fix a few things related to the translations 2014-01-04 11:49:06 +01:00
Jan Dalheimer
116a6458b5 Explicitly set the close button to be the default button 2014-01-03 21:11:33 +01:00
Jan Dalheimer
df1186e021 Add the option to disable a certain message 2014-01-03 21:05:03 +01:00
Jan Dalheimer
b3dd1eba21 Notifications system. Mainly to be used in case the updater breaks. 2014-01-03 19:19:27 +01:00
Sky
52bbf07fe5 Clean out old assets stuff, fix button hitbox regression 2014-01-02 22:10:21 +00:00
Sky
66ee0d4955 Tweak "More..." to "More news..." 2014-01-02 20:59:45 +00:00
Forkk
394360a5fc Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news 2014-01-02 14:39:54 -06:00
Forkk
431cfbc60a Implement the news button 
Make the news button open the latest news post in the user's web
browser.

Also remove the webkit dependency. I was planning on using it to
display the news in a custom window, but we'll just use the user's
browser for now.
 2014-01-02 14:37:56 -06:00
Sky
f08c0e3141 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop 2014-01-02 19:49:12 +00:00
Sky
47d577b766 Don't show extra space in status bar, tweak "none selected" message 2014-01-02 19:47:34 +00:00
Forkk
17f1864a71 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news 
Conflicts:
	CMakeLists.txt
	gui/MainWindow.h
 2014-01-02 13:38:20 -06:00
Forkk
4495e20cd7 Add news checking system and news toolbar 2014-01-02 13:25:38 -06:00
Jan Dalheimer
c0b6fd0647 Make .ico files usable (the plugin is already included) 2014-01-02 18:51:40 +01:00
Sky
eb4e7d3f67 Save/restore settings dialog (and instance specific settings) window geometry 2014-01-02 02:20:34 +00:00
Sky
7f89da2043 More credits tweaking 2014-01-01 22:35:59 +00:00
Petr Mrázek
0e78d34d4c ThreadTask for all your ThreadNeeds 
Use only when absolutely required.
 2014-01-01 19:21:58 +01:00
Sky
821fb5e0ae Move assets migration to a task. Needs threading. 2014-01-01 14:56:26 +00:00
Sky
6648c7ad90 Tweak credits in about dialog 2013-12-31 17:45:27 +00:00
Petr Mrázek
a6808b0399 Add the redistribution/fork text to the About dialog. 2013-12-31 15:44:09 +01:00
Petr Mrázek
ad7711b87c Fix silly bug with icon not changing on the toolbar when the icon key changes. 2013-12-31 01:49:07 +01:00
Petr Mrázek
952b63f68d Refactor icon lists heavily 
* Icon list now uses a filesystem watcher for updates
* Icon folder is user-customizable
* All the little details. ALL OF THEM.
 2013-12-31 01:32:51 +01:00
Sky
c44bcfab4b Merge pull request #29 from 02JanDal/java_browse_button 
Make the java browse button look like the other browse buttons
 2013-12-30 06:36:16 -08:00
Jan Dalheimer
76892c284b Make the java browse button look like the other browse buttons 2013-12-30 15:15:07 +01:00
Jan Dalheimer
76438f6afe Fix spelling mistake 2013-12-30 14:55:55 +01:00
Jan Dalheimer
5d0868a056 Notify the user of any errors 2013-12-30 14:45:59 +01:00
Jan Dalheimer
c01678a3fa Don't use stuff that's new in 5.2 if we don't compile with that 2013-12-30 14:05:53 +01:00
Jan Dalheimer
5a7fc1e123 Use /usr/bin as default on linux 2013-12-30 13:00:55 +01:00
Jan Dalheimer
3380bc7563 Launch an editor for the custom.json file. Also allow overriding of the system default editor 2013-12-29 17:51:16 +01:00
Petr Mrázek
654f444f55 Fix various LiteLoader related bugs. 2013-12-29 04:17:52 +01:00
Jan Dalheimer
5b54a4ca8c Don't hardcode stuff!!! 2013-12-28 23:34:18 +01:00
Jan Dalheimer
55e62a81b6 LiteLoader support 2013-12-28 14:22:36 +01:00
Petr Mrázek
30d4f5981d Rearrange logiv for OneSix version change 2013-12-27 12:50:24 +01:00
Petr Mrázek
acf25d8a33 Disable/enable mods with checkboxes. Needs testing. 
A lot of testing!
 2013-12-26 05:14:32 +01:00