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

323 Commits

Author SHA1 Message Date
Sky
867efd53a2 Bugfixes for auto login 2013-10-21 22:08:09 +01:00
Sky
003fedde01 Implement auto login 2013-10-21 21:25:50 +01:00
Sky
11813a0621 Merge branch 'feature_skins' into develop 2013-10-21 18:00:30 +01:00
Sky
ce512e1cf2 Clean up skins, remove wrapper, save to accounts/skins 2013-10-21 17:50:45 +01:00
Petr Mrázek
aca7764afc Ask for java path when hostname changes from the last run. 2013-10-20 22:28:31 +02:00
Sky
681d36b232 First draft of player faces in the login dialog 2013-10-19 06:40:46 +01:00
Orochimarufan
be2c7f4515 Change Organization and App name, might invalidate some configs? Add Tak to credits screen 2013-10-18 20:11:28 +02:00
Sky
b2574542b1 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop 2013-10-18 18:10:41 +01:00
Sky
709252fe9e Use player username if offline, or "Player" if blank 2013-10-18 18:10:19 +01:00
Orochimarufan
dcf58cdf12 Derp - typo in platform_other.cpp 2013-10-18 19:01:40 +02:00
Orochimarufan
78882ff6b1 Fix MainWindow Icon; Fix WM_CLASS issue; now links QX11Extras and libxcb on linux 2013-10-18 18:43:19 +02:00
Sky
71d5cf91a8 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop 2013-10-16 02:54:02 +01:00
Sky
b5ae2e974d Trim console output (fixes excessive whitespace in Windows console output) 2013-10-16 02:46:57 +01:00
Petr Mrázek
f5733f201b Make permgen limit ridiculously high. 2013-10-15 20:11:05 +02:00
Sky
deffe7db43 Change "News" URL to new website 2013-10-15 00:19:22 +01:00
Sky
40a2456646 Huge Java detection refactor, version dialogs on first run (no JavaPath set) and "auto detect" button 2013-10-14 03:00:06 +01:00
Sky
0ae8073d41 Fix instance settings tab order 2013-10-13 16:01:12 +01:00
Sky
a21338866d Fix tab ordering in settings dialog 2013-10-13 15:59:15 +01:00
robotbrain
52031a6814 Update MCModInfoFrame.h 
fix moar indents :)
 2013-10-12 15:44:34 -04:00
robotbrainify
c7cc32f1d4 Indent fixing! 2013-10-12 13:59:14 -04:00
robotbrainify
4c64c3c612 cleanup 2013-10-12 09:59:18 -04:00
robotbrainify
aef28fd3a5 It works... 
yeehaa!
 2013-10-12 09:58:26 -04:00
robotbrainify
281826f713 switch from tooltip to messagebox 2013-10-12 09:19:49 -04:00
robotbrainify
71948073e9 tool tip bugfixes 2013-10-12 08:45:24 -04:00
robotbrainify
f99a3072b8 mod description size limiter done 2013-10-12 08:28:21 -04:00
robotbrainify
4d320e8fc9 remove dupe newlines from trimmed mod description. whoo 2013-10-11 17:54:58 -04:00
Kilobyte22
bd11749d2a HOTFIX: Redid about dialog stuff - working this time. Sorry again 2013-10-10 21:19:31 +02:00
Petr Mrázek
73f8bc5c92 Version changing removes any existing version json. 2013-10-10 01:47:48 +02:00
Petr Mrázek
eaf0cbeafc Fix MMC-15 
``mod does not delete from jar''
 2013-10-09 23:16:10 +02:00
Sky
595943244c Fall back to mod ID if name is missing for some reason 2013-10-09 03:10:56 +01:00
Sky
14b47057fd Clean up mcmod panel massively. Keep it simple - name (optionally linked), optional authors and description. Needs cut-off handling, frame looking at on Windows 2013-10-09 02:26:47 +01:00
Petr Mrázek
6bc9df84d9 Mod info, with less HTML! 
And responding to keyboard events too.
 2013-10-09 02:03:02 +02:00
Sky
9edc486f13 Show defaults if mod type is 'folder' 2013-10-08 22:25:56 +01:00
Sky
bf951c3eb8 Licenses, cleanup 2013-10-08 22:11:24 +01:00
Sky
f2291ef161 Move mod info frame and handler to MCModInfoFrame, use on all instances 2013-10-08 21:45:48 +01:00
Sky
60e7e019fe Start mcmod.info panel. Needs to be its own widget and included in legacy mod edit window, text labels need eliding 2013-10-08 17:07:54 +01:00
Petr Mrázek
05e2da51d8 Add mod website button thing feature widget. It is super effective. 2013-10-08 01:38:26 +02:00
Petr Mrázek
a58912eaf7 Basic version changing (OneSix only for now) 2013-10-08 01:38:26 +02:00
Petr Mrázek
346087efbb Misc version dialog changes 2013-10-08 01:38:26 +02:00
Sky
50035e9aa1 Set offline player name to "Player" to prevent a crash on world loading in an offline session 2013-10-07 22:42:14 +01:00
Sky
24f6f3059b Tweak about dialog to match website 2013-10-07 20:16:09 +01:00
Sky
ecc5153efe Fix About logo, inflate ego 2013-10-07 19:55:49 +01:00
Sky
17c98655f8 First draft of multiple Java installation detection on Windows 2013-10-06 19:54:52 +01:00
Petr Mrázek
8b18af0515 Get rid of junky timestamps, along with some select pointless log messages 2013-10-06 03:07:57 +02:00
Sky
7aeea14a02 Merge branch 'develop' of https://github.com/MultiMC/MultiMC5 into develop 2013-10-06 01:13:20 +01:00
Petr Mrázek
f83119ce7e Added file logger 2013-10-06 01:13:40 +02:00
Sky
2398acc9e4 Fix Java detection button sizes 2013-10-05 02:07:19 +01:00
Sky
932376c6e0 Add "browse" button using Qt's file browser to settings dialog 2013-10-05 02:02:47 +01:00
Sky
1dee4bb60d Add naive Windows Java detection - JavaUtils for finding it on other systems (incomplete) 2013-10-05 01:08:13 +01:00
Petr Mrázek
8b0f8b9e59 ``Working'' forge unpackers. Needs a lot of hardening but good for alpha. 2013-09-30 02:34:46 +02:00
Petr Mrázek
984c36e571 Implement basic yggdrasil auth. 
No fancy login token saving involved.
 2013-09-23 00:29:40 +02:00
Petr Mrázek
ceca6959d2 Working 1.6 modding (currently only forge) 2013-09-22 04:21:36 +02:00
Petr Mrázek
c2c7293083 Things... and stuff... with 1.6 modding. Maybe. 2013-09-20 01:21:48 +02:00
Petr Mrázek
930b07afd4 Merge branch 'feature_library_model' into develop 2013-09-18 00:08:42 +02:00
Petr Mrázek
b979d0ce5d Implement legacy forge button! 
Many refactors of the task system.
Progress dialog now accepts generic ProgressProvider objects
 2013-09-18 00:00:35 +02:00
Petr Mrázek
d38b90530b Forge version list implementation. Needs integration and testing. 2013-09-16 00:54:39 +02:00
TakSuyu
5cd3420c46 Changed about source code link to reflect the new organization 2013-09-15 14:11:58 -07:00
Stiepen22
3e1cb57988 Filed attempt on making localization work 2013-09-08 23:43:19 +02:00
Stiepen22
3a08f01509 Changed CMakeList.txt to support translations 2013-09-08 20:18:55 +02:00
Stiepen22
31e5a0fe6d Changed all strings displayed to end user to use qts localization system 2013-09-08 18:13:09 +02:00
Petr Mrázek
499ee1e365 Merge branch 'master' of https://github.com/Stiepen22/MultiMC5 into develop 
Conflicts:
	AppSettings.cpp
	MultiMC.pro
	main.cpp
 2013-09-08 16:21:49 +02:00
Petr Mrázek
7e1cf22ce6 Use youtrack for bugs 2013-09-08 15:59:50 +02:00
Stiepen22
dab2bbe4e7 Added console coloring and made the log not contain any usernames/session ids 2013-09-08 15:02:52 +02:00
Petr Mrázek
6892c11e9f Move a good chunk of the singleton objects into a new QApplication subclass. 2013-09-07 04:00:58 +02:00
Stiepen22
5cac21ca63 Enough main window hiding magic for now 2013-09-07 00:02:05 +02:00
Stiepen22
c985f68b72 Made main window hide on instace exit 2013-09-06 23:58:10 +02:00
Stiepen22
3fd2d025a1 Made main window hide on instace exit 2013-09-06 23:52:17 +02:00
Stiepen22
0990a1103c Made Offline user name default to 'Offline' if the textbox is left empty 2013-09-06 23:01:40 +02:00
Stiepen22
f897a200e2 Made instace killing actually work 2013-09-06 22:40:50 +02:00
Stiepen22
2acfd00d76 Implemented basic offline mode 2013-09-06 17:08:12 +02:00
Petr Mrázek
78e278c1e3 Misc tweaks 
* Do not nuke forge META-INF
* Disable inner DnD in mod lists on linux.
 2013-08-28 21:52:19 +02:00
Petr Mrázek
93bb7c87e3 Enable drag and drop for testing 2013-08-28 06:51:04 +02:00
Petr Mrázek
5ff6fbf464 Basic 1.6 mod management (no jar mods) 2013-08-28 04:38:29 +02:00
Petr Mrázek
aa8766581e Tweak login dialog. 2013-08-28 00:07:52 +02:00
Petr Mrázek
a266e5d0cc Slight refactor of the mod edit dialog constructor 
Also some other insignificant refactors
 2013-08-27 20:29:27 +02:00
Petr Mrázek
73f534939a And more OSX thing. 2013-08-27 18:31:49 +02:00
Petr Mrázek
de456b2b0b OSX tweakery 2013-08-27 18:27:58 +02:00
Petr Mrázek
e17655243c More OSX magic! 2013-08-27 16:50:42 +02:00
Petr Mrázek
fd4026c60a Fix ugly blue focus thing on OSX. 2013-08-27 16:20:32 +02:00
Petr Mrázek
5573ed52e8 Add/remove/drag&drop for the icon picker. 2013-08-27 05:39:49 +02:00
Petr Mrázek
e6999b3b62 Clean up the main window constructor a bit 2013-08-26 07:09:54 +02:00
Petr Mrázek
a63c7340a6 Nuke the old instance model, LONG LIVE THE NEW ONE 2013-08-26 06:30:11 +02:00
Petr Mrázek
6793f6b706 Make settings dialog layouts less derpy on windows 2013-08-26 04:34:37 +02:00
Petr Mrázek
ef3ff88510 Fix settings dialog layouts 
They didn't scale
 2013-08-26 03:59:51 +02:00
Petr Mrázek
c5725d653b Make news button go to *MultiMC* news. 2013-08-25 23:41:23 +02:00
Petr Mrázek
a852dff98d Add cat icon for the cat button. Meow. >:3 2013-08-25 23:35:52 +02:00
Petr Mrázek
f0990fae4b Many improvements 
PermGen can be tweaked from the settings menu
Groups are saved on change/exit
Install target is no longer completely broken
All the deplibs are now static
Added notes dialog
Fixed ini file format support (can save strings with newlines, tabs. UTF-8 is explicitly used!)
Rename button now uses line breaks so it doesn't grow ever wider (Added a custom tool button subclass)
There is now a CAT button. Meow.
 2013-08-25 22:48:41 +02:00
Petr Mrázek
d884f849d6 All kinds of incremental improvements 
Redone the instance action toolbar:
* Removed all the dead actions
* Change icon and Rename are now morphed into a header
* Added button for opening the config folder
Implemented support for loose files and folders as legacy jar mods
Added texture pack support
 2013-08-25 01:32:42 +02:00
Petr Mrázek
e3b55067eb Legacy jar reassembly, base of proper custom jar support 2013-08-24 03:09:46 +02:00
Petr Mrázek
b781231666 Contiguous selection and keyboard input for mod lists. 
Tweak console to take up the sides.
You can reorder mods from the keyboard.
 2013-08-21 01:07:54 +02:00
Petr Mrázek
524fbcdd3e Disable drag mod reordering 2013-08-20 20:56:21 +02:00
Petr Mrázek
bbc47cb8bd Sync, removal of webkit as a dependency, removal of the web windows. 2013-08-20 02:29:36 +02:00
Petr Mrázek
c92ad7dcf8 Drag and Drop, mod management. 2013-08-18 20:52:17 +02:00
Petr Mrázek
253067c782 Move all the things (YES. Move them.) 
Also, implemented some basic modlist logic, to be wired up.
 2013-08-17 13:40:51 +02:00
Petr Mrázek
ff33d4a1a4 OneSix instances now have a minecraft folder inside. 
Also, the main instance view was expanded with helpful key events:
F2 for rename, F5 for refresh, Enter for start instance, Delete for...
 2013-08-12 00:39:19 +02:00
Petr Mrázek
7e78a422e8 Version filtering and general related code sanitization. 
Version list dialog has alternating row background set.
Nostalgia versions, based on OneSix.
 2013-08-11 19:05:22 +02:00
Petr Mrázek
1782d5ad9a Implement icon picker, bring back raster icons. 2013-08-11 01:07:15 +02:00
Petr Mrázek
bf5f5091ef Various task related improvements. 
* Errors are reported back to task users via Failure signals.
* Lwjgl doesn't download on each legacy instance start anymore.
* Tasks were unified when it comes to success/failure.
* Task dialogs don't get spawned after short tasks finish anymore.
 2013-08-09 00:26:35 +02:00
Petr Mrázek
afaa1dc223 Get rid of QNAM (now subclassed and less needy). Basic LWJGL download and extraction. 2013-08-07 01:38:18 +02:00
Petr Mrázek
005a010ee6 More code cleanups! 2013-08-04 14:46:33 +02:00
Petr Mrázek
935ad6b02c Fix KDE includes problem 2013-08-04 12:21:51 +02:00
Petr Mrázek
0adf1828b0 Download assets for 1.6 on application start (background task). 2013-08-04 04:19:10 +02:00
Petr Mrázek
4f73091bb5 Errr... I forgot. 2013-08-03 23:58:39 +02:00
Petr Mrázek
13b1b98f7c WTF, I don't even... 2013-08-03 15:57:33 +02:00
Petr Mrázek
2e0cbf393a Massive renaming in the backend folder, all around restructure in the same. 2013-07-29 00:59:35 +02:00
Petr Mrázek
8808a8b108 Merge branch 'master' of https://github.com/TakSuyu/MultiMC5 2013-07-28 08:41:41 +02:00
Petr Mrázek
9d99b539bf Parsing the version files, part IV 
Also, start of big refactors.
 2013-07-28 08:40:15 +02:00
TakSuyu
dc39d09339 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	gui/mainwindow.cpp
 2013-07-27 12:55:51 -07:00
TakSuyu
44498f9894 Renamed some files to support naming scheme 
changed modeditwindow -> legacymodeditdialog
added modeditdialog
mapped slots for modeditdialog
 2013-07-27 12:42:32 -07:00
Petr Mrázek
e2ee6d6d25 Finalize the instance settings dialog, add setting reset mechanism 2013-07-16 00:30:32 +02:00
Stiepen
b5450042b5 Broke instance loading(?), also attempted to make Toolbar grayed out when no instance is selected. For debug purposes it is initially not grayed out 2013-07-14 22:01:30 +02:00
Stiepen
ce253ded0e Added Per-Instance settings 2013-07-14 20:26:53 +02:00
Petr Mrázek
33b9b25da7 More work on the downloader and 1.6 instance creation 2013-07-14 18:33:31 +02:00
TakSuyu
96cceeafeb implemented ModEditUI and mapped ModEditUI Buttons for implementation 
enabled EditMods button on MainWindowUI
added validation check for renaming instances
 2013-07-06 19:11:24 -07:00
TakSuyu
4f57207fd2 Added dialog box and functionality to mainwindow delete button. 2013-07-04 15:39:41 -07:00
Petr Mrázek
e49b818698 Add queued downloader, some super-minor UI tweaks in stuff that's not even visible yet. 2013-06-30 22:39:57 +02:00
Petr Mrázek
38fb702e78 Fix weird label line generation in the instance view. 2013-06-23 22:45:36 +02:00
Petr Mrázek
27b1de0d6d Implement some bits and pieces, disable dead buttons. 2013-06-23 22:10:32 +02:00
Andrew
3b38e5f924 Implemented LWJGL version lists. 
The LWJGL list actually doesn't use tasks for loading. Instead, it takes advantage of the
QNetworkAccessManager's asynchronous requests. This is a system that I may look to implement for other version
lists and things such as the Minecraft version list and possibly even instance mod lists.

Loading things this way means that code that wants to load a list can simply call the load list function, rather
than having to get a task from the list and execute the task. Unfortunately, it also means we can't have task
progress dialogs for loading lists, but it shouldn't really be too difficult to write one that works with this
system.

At some point in the future, I'll probably end up putting all the code for this method of loading lists into a
base class and then update the other lists to support it.
 2013-05-17 11:53:22 -05:00
Andrew
5f781b3053 Implement basic game updater. 
Resolves MMC-4: https://jira.forkk.net/browse/MMC-4
 2013-05-08 12:56:43 -05:00
Andrew
2e62f6e8d8 Implemented version selection stuff. 2013-05-06 21:28:28 -05:00
Andrew
7e3592bee8 Made the version list load in the background on startup. 
Resolves JIRA issue MMC-11:
	https://jira.forkk.net/browse/MMC-11
 2013-05-06 17:19:20 -05:00
Andrew
74133bb172 Allow users to filter out MCNostalgia and Snapshots from the version list. 
Resolves JIRA issue MMC-9:
	https://jira.forkk.net/browse/MMC-9
 2013-05-06 12:48:29 -05:00
Andrew
857a4e4dbe Implemented version list sorting. 
Resolves MMC-8:
	https://jira.forkk.net/browse/MMC-8
 2013-05-03 20:14:38 -05:00
Andrew
055198303c Removed old plugin system and implemented some version list stuff. 2013-05-03 14:41:37 -05:00
Andrew
1626fa013c Implement instance creation. 2013-04-22 17:15:18 -05:00
Andrew
ff3078b3a6 Make the new instance dialog support instance types. 2013-04-22 15:39:41 -05:00
Andrew
7ec32d5657 Merge branch 'master' of git://github.com/peterix/MultiMC5 2013-04-22 14:31:25 -05:00
Petr Mrázek
ae6937ab81 Focus password text box if there's an account saved by default. Save settings! 2013-04-08 18:21:43 +02:00
Andrew
ebb2c54975 Merge branch 'master' of git://github.com/peterix/MultiMC5 
Conflicts:
	CMakeLists.txt
	gui/mainwindow.cpp
 2013-03-28 11:37:12 -05:00
Andrew
168ed3e8e5 Implemented version lists. 
Further work on this is still needed. Currently there is no sorting or filtering of any kind. In addition,
changes need to be made to fix issues with bad ETags since the current system here is based on MultiMC 4's
version list system before it was fixed.
 2013-03-28 11:33:31 -05:00
Petr Mrázek
737273348f Use Keyring in the login dialog 2013-03-26 17:43:49 +01:00
Petr Mrázek
d2eef6974b Mystery meat layout hack to get things aligned 2013-03-25 20:58:45 +01:00
Petr Mrázek
65dc5d44f1 Add instance view up/down keyboard navigation, fix some layout glitches (not all) 2013-03-25 17:39:52 +01:00
Petr Mrázek
af046ff6fc Fix settings dialog java tab layout 2013-03-24 18:38:58 +01:00
Petr Mrázek
40570c3210 Fix settings objects, instances can be started from the GUI now 2013-03-24 15:36:00 +01:00
Orochimarufan
e4f86893a8 fix merge issues, make console window work again 2013-03-22 14:40:55 +01:00
Petr Mrázek
e4806ab08d Add SVG icon rendering/cache 2013-03-20 07:59:35 +01:00
Petr Mrázek
7d7e4034f4 Property change propagation, changing instance groups, icon preview 2013-03-19 06:24:34 +01:00
Petr Mrázek
d67d58e662 Added background cat. Proof of concept :3 2013-03-19 03:20:49 +01:00
Petr Mrázek
7e222c3e8f Loading instance groups and exposing them to the model 2013-03-18 23:35:54 +01:00
Petr Mrázek
65faabeed4 Connect instance list to model. 2013-03-18 23:00:46 +01:00
Petr Mrázek
b84dfddd1b Use the actual selection for instance launch. 2013-03-16 03:01:51 +01:00
Petr Mrázek
46f93311af Instance view, model, delegate. 2013-03-11 22:19:17 +01:00
Andrew
36396f7c6a Massive re-organization. 2013-02-26 16:47:39 -06:00
Andrew
4ca35a760d Fixed a lot of MSVC problems 2013-02-25 14:44:36 -06:00
Andrew
23474da175 Merge branch 'master' of git://github.com/peterix/MultiMC5 
Conflicts:
	CMakeLists.txt
	main.cpp
 2013-02-25 13:31:37 -06:00
Andrew
498225debd Rewrote the settings system. It may still need some work. 2013-02-25 13:24:46 -06:00
Orochimarufan
3a173648e7 Implement ConsoleWindow 2013-02-22 18:18:23 +01:00
Orochimarufan
ca1fd44637 Merge branch 'master' of http://github.com/peterix/MultiMC5 
Conflicts:
	CMakeLists.txt
	gui/mainwindow.cpp
	main.cpp
 2013-02-21 20:40:32 +01:00
Orochimarufan
576e979df4 Implement About Dialog 
Prepared XDG icon theme in :/icons/multimc. will only be usefull as soon
as Qt decides to support custom fallback themes. use the resources
directly for now.
 2013-02-21 19:35:52 +01:00
Petr Mrázek
58379657e9 Merge branch 'inst_rewrite' of https://github.com/Forkk/MultiMC5 
Conflicts:
	data/instancemodel.cpp
 2013-02-21 18:09:26 +01:00
Andrew
dd2e836b4c Split MultiMC up into a few separate libraries. 
Fixed plugin system.

Tons of other stuff...
 2013-02-20 19:10:09 -06:00
Orochimarufan
c523a2c752 implement commandline parsing 2013-02-20 00:07:52 +01:00
Andrew
6e5017e48b Implemented loadList() stuff. 2013-02-19 12:15:22 -06:00
Orochimarufan
369b1c55c9 implement desktop shortcut creation. windows code not tested. 2013-02-13 04:03:15 +01:00
Orochimarufan
79c5ae121b add first iteration of the integrated browser 2013-02-13 00:35:35 +01:00
Petr Mrázek
18b087e992 Merge https://github.com/Forkk/MultiMC5 
Conflicts:
	gui/mainwindow.ui
 2013-02-06 07:09:32 +01:00
Petr Mrázek
4e9006769e Some minor changes in the instance model and control 2013-02-06 07:07:44 +01:00
Andrew
e475f5d512 Implemented login system. 2013-02-05 19:22:19 -06:00
Andrew
a416c58a93 Started working on task system and login system. 2013-02-05 16:34:20 -06:00
Andrew
3c8a12aded Added new instance dialog. 2013-02-01 13:07:36 -06:00
Andrew
a96e1853de Implement news and report bug buttons. 2013-02-01 12:22:22 -06:00
Andrew
de2632af0d Added instance context menu and status tips. 2013-01-31 14:31:16 -06:00
Andrew
90764f97d9 Add instance toolbar. 2013-01-29 23:52:37 -06:00
Andrew
7ac25bf2da Implemented the view folder buttons on the main window. 2013-01-29 00:26:24 -06:00
Andrew
3a0367a79c Resized main window and added version info. 2013-01-28 18:01:20 -06:00
Andrew
a25bedd770 Implemented settings dialog. 2013-01-28 15:35:09 -06:00
Petr Mrázek
00893b3cfc Instance model (or at least something like it) 2013-01-22 05:56:12 +01:00
Andrew
b371ee1de2 Added mod edit window. 2013-01-15 19:04:10 -06:00
Andrew
f7e9a7523f Added settings dialog. 2013-01-15 18:46:27 -06:00
Andrew
fce0f5df04 Added stuff. 2013-01-14 17:42:38 -06:00
Andrew
d6d5c86a73 Initial commit 2013-01-09 12:22:22 -06:00