0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
837 Commits 1 Branch 0 Tags 29 MiB
da33fa4090
Commit Graph

379 Commits

Author SHA1 Message Date
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
Petr Mrázek
8edd0100e8 Fix more updater derps. 
* Updater requires unix style paths on input.
* No update notification was getting cloned with every check
 2013-12-25 02:46:06 +01:00
Petr Mrázek
5a2df0d41a Merge branch 'develop' of https://github.com/robotbrain/MultiMC5 into develop 2013-12-25 01:19:38 +01:00
Petr Mrázek
8d0ca72abb Log SSL errors, give common solutions 2013-12-24 23:39:04 +01:00
robotbrainify
b1ec7841e0 Get the updater to display a no update found message. 2013-12-24 16:00:07 -05:00
ashka
d507526320 Fixed updater not restarting MultiMC after update. 2013-12-22 22:43:16 +01:00
Petr Mrázek
77ddf8b5d7 Show errors when logging in in the account dialog. 2013-12-22 19:47:58 +01:00
Jan Dalheimer
82c87aa06f Initial FTB support. Allows "tracking" of FTB instances. 2013-12-21 23:40:37 +01:00
Petr Mrázek
c077c91e90 Remove OSX hack that never worked anyway 2013-12-21 19:18:56 +01:00
Petr Mrázek
be8dba9ee2 Remove obsolete auto login option. 2013-12-16 22:30:42 +01:00
Petr Mrázek
dff00a6d2a Use monospace font in the console. 
Still fugly as all hell, now in a slightly more appropriate style.
 2013-12-16 02:19:07 +01:00
Andrew
9d8006b597 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news 
Conflicts:
	CMakeLists.txt
 2013-12-15 15:01:34 -06:00
Andrew
0ee8f90d40 Added a system to load news from MultiMC.org's RSS 
Currently it doesn't show it anywhere in the UI. That's next.
 2013-12-15 14:50:27 -06:00
Petr Mrázek
b0e8037feb Make updates prevented by missing accounts verbose 2013-12-15 20:42:17 +01:00
Petr Mrázek
dd9e04000c Improve group changing, update instance on version change 
Gives a list of existing groups to choose from.
Instances are updated as long as there is at least one valid account.
 2013-12-15 18:13:46 +01:00
Sky
699aba9222 Expand appropriate column of account selection dialog 2013-12-14 17:01:15 +00:00
Orochimarufan
50e9574c0c Fix various Dialogs (Titles, License formatting) 2013-12-14 01:54:27 +01:00
Sky
b69351d50d Merge branch 'develop' of github.com:Drayshak/MultiMC5 into develop 2013-12-13 14:58:35 +00:00
Sky
979946b7bb First sweep moving URLs to a constants file 2013-12-13 14:58:11 +00:00
Petr Mrázek
39aebddf3b Add support for 1.7.4 user_type (needs testing with legacy accounts) 2013-12-13 02:47:59 +01:00
Sky
35ec599730 Fix console window sticking open derp 2013-12-11 12:26:23 +00:00
Petr Mrázek
26a7544325 Merge https://github.com/Drayshak/MultiMC5 into develop 2013-12-11 08:39:35 +01:00
Sky
afa5e14e20 Better (but unsorted) Java detection 2013-12-11 04:54:00 +00:00
Petr Mrázek
018f328993 Merge branch 'feature_no_firstrun' of https://github.com/robotbrain/MultiMC5 into develop 2013-12-11 00:08:39 +01:00
robotbrain
ecf7bcf184 Nuke! 2013-12-10 18:06:35 -05:00
Petr Mrázek
fa2ba01a17 Do not let the console close while Minecraft is running (prevent return to main window) 2013-12-10 23:48:20 +01:00
robotbrainify
6eb512e5d6 Fix my utter derp 2013-12-10 11:05:40 -05:00
Petr Mrázek
aa61bbe9e4 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop 
Conflicts:
	CMakeLists.txt
	gui/MainWindow.cpp
 2013-12-10 07:22:22 +01:00
Petr Mrázek
3f5c46a1c4 Finish assets update for 1.7.3 2013-12-10 07:12:52 +01:00
robotbrain
4d348581d3 Fix I think. 2013-12-09 19:16:58 -05:00
robotbrain
c7dbc14885 Make it update the instance when it creates it, so you can install forge 
right away
 2013-12-09 19:13:35 -05:00
Andrew
712b87c643 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop 2013-12-09 12:06:33 -06:00
Andrew
7f52bed9e3 Merge branch 'feature_updater' into develop 2013-12-09 12:04:05 -06:00
Petr Mrázek
8db2e5db81 Merge branch 'feature_assets' into develop 2013-12-08 22:19:58 +01:00
Petr Mrázek
b0dbd4f4af Fix offline mode bugs 2013-12-08 22:06:04 +01:00
Petr Mrázek
9410dd042e Move pastebin button on the console window to the left 
It's been there before, it's there now :D
 2013-12-08 17:43:41 +01:00
Petr Mrázek
d68f49ffc0 Merge branch 'feature_pasting' of https://github.com/robotbrain/MultiMC5 into develop 2013-12-08 17:39:32 +01:00
Petr Mrázek
0cb8ff40b2 Finish preliminary offline support 
* ProgressProvider now has an abort() call
* Abort button support added to the progress dialog
* YggdrasilTask and MojangAccount adapted to support abort

YggdrasilTask will time out after 10 seconds of no network activity, or when the user pushes the Play Offline button.
In offline mode, all instance update tasks are skipped! This will need further work.
 2013-12-08 17:34:45 +01:00
Sky
6d438b2ef3 Work on new assets system. Working legacy assets importer, disabled assets downloading for now 2013-12-08 02:58:44 +00:00
robotbrainify
4548930e34 Open the url direectly. 2013-12-06 17:17:32 -05:00
robotbrainify
5ad95134dc work on pasting instance logs 
blame clang for formatting changes
 2013-12-06 16:24:55 -05:00
Andrew
6ac94ddcb6 Finish implementing update installation. 
Also add the option to update on exit.
 2013-12-06 12:59:58 -06:00
Andrew
48ec8e67b8 Implement DownloadUpdateTask 
Installing updates is not implemented yet. That's next.
 2013-12-05 13:52:55 -06:00
Petr Mrázek
f028aa76bc Offline mode support, part 1 
Refactor MojangAccount so it exposes a less generic interface and supports login. Hide the ugly details.
Yggdrasil tasks are now only used from MojangAccount.
 2013-12-05 02:39:52 +01:00
Andrew
bf94aaea75 Rework the update checking system 2013-12-04 12:34:12 -06:00
Petr Mrázek
6aa9bd0f77 Renew the updater branch 
Now with some actual consensus on what the updater will do!
 2013-12-02 00:55:24 +01:00
Petr Mrázek
f56eff04ef Fix (hopefully) library dependency resolution. 
Installing libs is now enabled, hardcoded.
Enable -Wall for all builds.
Fix many warnings and latent bugs.
 2013-12-01 16:34:51 +01:00
Petr Mrázek
f27a6c39ea Fix login and startup logging issues 
Auth uses the refresh endpoint instead of validate. This means less password entering.
Console will now only autoscroll when already scrolled all the way down.
Better conformance with the Yggdrasil auth protocol (not complete yet, but Mojang launcher isn't complete either).
Fix bug that prevented saving the account data (uninitialized variable).
Accounts can now trigger account list saving, this is used for the refresh endpoint.
 2013-12-01 02:00:42 +01:00