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

160 Commits

Author SHA1 Message Date
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
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
8650aa81f0 Fix settings dialog when offline 2014-01-18 10:31:34 +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
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
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
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
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
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
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
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
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
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
8d0ca72abb Log SSL errors, give common solutions 2013-12-24 23:39:04 +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
be8dba9ee2 Remove obsolete auto login option. 2013-12-16 22:30:42 +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
afa5e14e20 Better (but unsorted) Java detection 2013-12-11 04:54:00 +00:00
Andrew
7f52bed9e3 Merge branch 'feature_updater' into develop 2013-12-09 12:04:05 -06: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
Andrew
6ac94ddcb6 Finish implementing update installation. 
Also add the option to update on exit.
 2013-12-06 12:59:58 -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
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
Andrew
eff38858ef Fixed compilation errors. 
Yeah... Forgot to recompile everything after deleting those files.
 2013-11-28 22:18:22 -06:00
Andrew
0395474a0c Nuke dead code 2013-11-28 22:05:58 -06:00
Andrew
f3a9dde52e Rework the password dialog 
It's now used as a general purpose "account edit dialog". It'll be used
for entering usernames, passwords, or both.
 2013-11-28 21:40:40 -06:00
Andrew
bfc9e1e5d5 Verify access tokens before launching Minecraft 
Kind of an important thing to do... Heh...
 2013-11-28 20:45:52 -06:00
Sky
191e850cf1 Add support for "no default account" 2013-11-27 23:39:36 +00:00
Sky
d32cb1c95d Merge remote-tracking branch 'upstream/feature_yggdrasil' into develop 2013-11-27 22:51:45 +00:00
Sky
69d8ab16c5 Dropdown for account switching 2013-11-27 22:39:49 +00:00
Andrew
a4c5f0135e Allow setting no default account 
This allows the user to select an account to use every time they launch
an instance.
 2013-11-27 16:14:18 -06:00
Sky
38732636d3 Nuke skins.json, use nice yggdrasil implementation instead. Grabs all Mojang account skins on addition, active on startup 2013-11-27 18:45:29 +00:00
Sky
7d7579d7f0 Move "manage accounts" to right, use player skin when available 2013-11-27 16:56:15 +00:00
Petr Mrázek
d6b09f7c13 Add java checker to the instance settings 2013-11-25 01:14:30 +01:00
Petr Mrázek
82225a21e1 Merge branch 'feature_yggdrasil' into develop 
Conflicts:
	gui/MainWindow.cpp
	logic/OneSixInstance.h

Fix missing session id functionality for legacy and old onesix.
 2013-11-24 18:41:35 +01:00