0xf8/pollymc
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
565 Commits 1 Branch 0 Tags
d6c71488b34a2854461feee3296c11568542ecbe
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Petr Mrázek d6c71488b3 Some test madness 2013-12-20 23:04:11 +01:00
Petr Mrázek 20e86801b3 Merge branch 'feature_runner_symlink' of https://github.com/02JanDal/MultiMC5 into develop 2013-12-17 00:42:21 +01:00
Petr Mrázek fab8d6ae0b Merge branch 'feature_runner' of https://github.com/02JanDal/MultiMC5 into develop 2013-12-17 00:41:50 +01:00
Petr Mrázek 911dfa8530 Merge branch 'updater_tests' of https://github.com/02JanDal/MultiMC5 into develop 2013-12-17 00:41:31 +01:00
Petr Mrázek f8067a6034 Magical pixie dust for windows updater reliability 
Don't ask.
 2013-12-17 00:37: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
Petr Mrázek c1f560d385 Fix broken test (wrong URL) 2013-12-16 00:09:24 +01:00
Petr Mrázek 5df86d9ffa Merge branch 'updater_tests' of https://github.com/02JanDal/MultiMC5 into develop 2013-12-15 23:47:57 +01:00
Petr Mrázek b773ef08af Fix/remove tests from the gutted updater 2013-12-15 23:46:48 +01: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
Petr Mrázek 5a3043398e Use asset sizes from the index to make the progress bar better 2013-12-15 15:00:09 +01:00
Petr Mrázek ae169abd74 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop 2013-12-14 19:28:12 +01:00
Petr Mrázek d15a6490f6 Fix bugs introduced by unit test branch 
Account json was getting rewritten by a folder
Missing icon on Windows (hopefully fixed, `doing it live`)
 2013-12-14 19:26:50 +01:00
Petr Mrázek f15306a0ac Use ctest 2013-12-14 14:17:59 +01:00
Petr Mrázek 8f856f5573 Merge branch 'testing' of https://github.com/02JanDal/MultiMC5 into develop 
Conflicts:
	MultiMC.cpp
 2013-12-14 14:00:23 +01:00
Petr Mrázek bbd17b6224 Fix twitch 2013-12-14 01:18:54 +01:00
Petr Mrázek 0af6f96c3d Do not log auth crud 2013-12-13 03:06:10 +01:00
Petr Mrázek 382e4fe6b3 Fix syntax error 
You do not need goto for that. Really.
 2013-12-13 02:52:54 +01:00
Petr Mrázek 7d20e2478a Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop 2013-12-13 02:48:31 +01: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
Petr Mrázek bf34aa7fbd Use temporary files for the java checker 2013-12-13 00:02:58 +01:00
Petr Mrázek 26a7544325 Merge https://github.com/Drayshak/MultiMC5 into develop 2013-12-11 08:39:35 +01:00
Petr Mrázek bace3c2eab Swap https -> http for asset indexes 2013-12-11 08:34:22 +01: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
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
Petr Mrázek ab69c1b9e6 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop 2013-12-10 20:57:30 +01:00
Petr Mrázek 10e13df00d Use metacache for minecraft.jar downloads 2013-12-10 20:33:24 +01:00
Petr Mrázek 1b185eba41 Nuke. 2013-12-10 07:52:36 +01: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
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
Petr Mrázek 220e07aef4 Merge branch 'feature_updater' of github.com:MultiMC/MultiMC5 into feature_updater 2013-12-07 03:57:40 +01:00
Petr Mrázek 858916b951 Fix build failures on Windows. 
* remove atoll
* fix include path of updater depends
 2013-12-07 03:51:21 +01: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 75c4d97b90 Exclude more debug libs (on OSX), debug builds include debug libs. 2013-12-01 17:33:40 +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 a3fbf05c7b Fix private info censor 2013-12-01 02:14:32 +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
Petr Mrázek 2eaf33816b Merge https://github.com/brainiac744/MultiMC5 into develop 2013-11-30 13:17:23 +01:00
Petr Mrázek 60e325b8af Merge https://github.com/brainiac744/MultiMC5 into develop 2013-11-28 21:28:57 +01:00
Petr Mrázek 61f1dd6e2b Merge https://github.com/Drayshak/MultiMC5 into develop 2013-11-28 21:28:32 +01:00
Petr Mrázek e18feee26f Update BUILD.md 
Add OSX build instructions taken from https://gist.github.com/number5/7250865
 2013-11-28 13:41:14 +01:00
Petr Mrázek 7024e5a83e Fix for latest snapshot ``changes'' 2013-11-27 01:50:38 +01:00
Petr Mrázek d6b09f7c13 Add java checker to the instance settings 2013-11-25 01:14:30 +01:00
Petr Mrázek 088b039cf7 Detect java bitness on launch, use appropriate libraries 
Fixes problems with latest snapshot
 2013-11-25 00:46:52 +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
Petr Mrázek ca297fca79 Prepare for rework of instance launch/update 
Added missing licenses
Added a Java functionality checker (detects 32/64bit java)
Refactor of *Update - no longer based on BaseUpdate, but Task directly
Fixed runner script to not derp up on 32bit linux. Could add more detection and error reporting there.
Resources are now split into graphics and generated. Generated resources are placed in the build tree and included from there.
Used the Java checker in the main settings dialog (TODO: instance settings).
Partial support for ${arch}-using libraries - both 32 and 64 variants of ${arch} are downloaded.
 2013-11-24 06:36:16 +01:00
Petr Mrázek 4124faf474 Fix console window (now not a QDialog) 
It now opens and coloses as expected, depending on user
preferences and the status of the various processes involved.
Console window geometry and state are remembered between runs.
 2013-11-23 01:41:28 +01:00
Petr Mrázek 7f5eb5d61a Implement user info stub for newest minecraft snapshot 2013-11-22 01:04:14 +01:00
Petr Mrázek 57a9dadb08 Forge XZ downloads now use temp files local to MultiMC, files are removed. 2013-11-19 00:47:59 +01:00
Petr Mrázek 294c2d122f Fix assets URL (expected to change... again) 2013-11-18 20:12:24 +01:00
Petr Mrázek 30b3395770 Re-enable assets download 2013-11-17 12:08:07 +01:00
Petr Mrázek 9fcb287ea2 Fix broken signal in ConsoleWindow 
Wasn't detecting minecraft shutdown properly
 2013-11-17 11:48:01 +01:00
Petr Mrázek 9559be32bd Merge branch 'master' into develop 2013-11-17 11:46:44 +01:00
Petr Mrázek 210629e274 Use the forge mirrors for downloading forge libraries 
Let's hope we never, ever see a forge download error again.
 2013-11-17 11:44:18 +01:00
Petr Mrázek 2a45302dfc Mark forge lib downloads as failed when they fail 2013-11-16 20:36:01 +01:00
Petr Mrázek 662b4bc8cb Merge branch 'develop' 2013-11-13 00:25:57 +01:00
Petr Mrázek 9693a5e6e9 Fix signal derp from previous commit 
Console should now properly close/not close based on minecraft return code/signal.
 2013-11-13 00:24:49 +01:00
Petr Mrázek ee595fb1da Merge branch 'develop' 2013-11-12 09:35:53 +01:00
Petr Mrázek fdc58bb913 Fix console not staying open on minecraft crash 2013-11-12 09:23:39 +01:00
Petr Mrázek 997054a535 Merge branch 'develop' 2013-11-11 04:47:09 +01:00
Petr Mrázek e611aef0e7 Recover from the bin folder of converted legacy instance being deleted. 
Use the new vanilla jar as the base jar if mcbackup.jar is missing.
 2013-11-11 04:45:31 +01:00
Petr Mrázek b097d2f744 Use the right LWJGL path while creating an instance 2013-11-11 03:47:14 +01:00
Petr Mrázek ad7c41114f Fix layout margins in console window 2013-11-07 22:31:15 +01:00
Petr Mrázek cc6e9358fe Merge branch 'develop' 2013-11-06 21:03:22 +01:00
Petr Mrázek 452cc1849f Fix Sourceforge lwjgl version index download. 2013-11-06 20:59:44 +01:00
Petr Mrázek bb7e8985f6 Reformat and (slightly) decruft all the things. 2013-11-04 02:53:05 +01:00
Petr Mrázek d6e4fb2971 Implement instance sorting options. 2013-11-04 00:11:20 +01:00
Petr Mrázek 4466929074 Add instance copying, fix instance creation (with identical names) 2013-11-03 21:28:04 +01:00
Petr Mrázek b018aab1e9 Merge branch 'develop' 2013-10-31 09:06:42 +01:00
Petr Mrázek 8cd6604e40 List available proxies on start 2013-10-31 09:03:18 +01:00
Petr Mrázek f39a83edc6 Hack for Intel graphics drivers on Windows. 2013-10-31 01:39:37 +01:00
Petr Mrázek f941119fbd Merge branch 'develop' 2013-10-30 00:56:43 +01:00
Petr Mrázek 44823324f9 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop 2013-10-29 22:14:57 +01:00
Petr Mrázek 946d397cce Customizable folder browsing is same as for the instance folder. Syste Proxy usage. 2013-10-29 22:13:42 +01:00
Petr Mrázek e7e03c2b54 BLIND CODE, BLIND CODE HERE! WHERE IS THE COMPILER!?!?! 
It choked on missing headers, maybe?
 2013-10-28 22:01:37 +01:00
Petr Mrázek 7df667f823 Valgrind-checked early application start 2013-10-28 21:50:58 +01:00
Petr Mrázek 6ecb833dbf Fix problem with instance list not using the instance folder path 2013-10-28 20:55:12 +01:00
Petr Mrázek c46292c9b1 Merge branch 'develop' 2013-10-26 20:23:26 +02:00
Petr Mrázek 9233477295 S3 bucket listing support and network code refactors. 
* Adds support for listing all objects in an S3 bucket.
* Renames a bunch of network related classes (Download->Action)
* Net actions now have static constructors
 2013-10-26 19:55:48 +02:00
Petr Mrázek ba938dd8e2 Fix java detection segfault 2013-10-24 01:47:54 +02:00
Petr Mrázek c8b84257ae Actually use QJson for Yggdrasil requests 2013-10-23 02:08:39 +02:00
Petr Mrázek 32ce5c5c02 Local libs that won't get replaced/redownloaded 2013-10-20 23:18:40 +02:00
Petr Mrázek aca7764afc Ask for java path when hostname changes from the last run. 2013-10-20 22:28:31 +02:00
Petr Mrázek 205570be32 Support version format 9, fix version-related segfault, (maybe) fix forge lists. 2013-10-18 01:00:46 +02:00
Petr Mrázek ee1be22055 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop 2013-10-15 20:17:51 +02:00
Petr Mrázek f5733f201b Make permgen limit ridiculously high. 2013-10-15 20:11:05 +02:00
Petr Mrázek f8b4c2c0b2 Fix auth for 13w41a 2013-10-11 16:13:01 +02:00
Petr Mrázek 541c044d52 Meh 2013-10-10 03:05:21 +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
Petr Mrázek 6bc9df84d9 Mod info, with less HTML! 
And responding to keyboard events too.
 2013-10-09 02:03:02 +02:00
Petr Mrázek 36edf6cbc6 Merge branch 'feature_mcmod_info' into develop 2013-10-09 00:24:14 +02:00