0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,353 Commits 1 Branch 0 Tags 29 MiB
fc4c57f0d9
Commit Graph

5353 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
2fe27fd0da More work on new assets system. Works given a properly constructed assets folder, no downloading yet 2013-12-08 06:12:53 +00: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
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
robotbrainify
c6f0d9ce93 fix revert 2013-12-06 17:37:12 -05:00
Andrew
7a6705030c Include shellapi.h in the updater on Windows. 2013-12-06 16:36:22 -06:00
robotbrainify
c614fe1cef revert 2013-12-06 17:36:22 -05:00
robotbrainify
4548930e34 Open the url direectly. 2013-12-06 17:17:32 -05:00
robotbrainify
e2728317e7 Fixes to pasting 2013-12-06 17:13:09 -05:00
Andrew
bab6c18965 Added WIN32_LEAN_AND_MEAN 
Should reduce compile times and help get rid of some error things.
 2013-12-06 16:08:09 -06: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
e90f1a2756 Implement update installer 2013-12-05 20:32:52 -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
Jan Dalheimer
1167a66ac8 Tests for the user utils 2013-12-02 15:51:30 +01:00
Jan Dalheimer
befeeaa15c Add some new folders 2013-12-02 12:32:35 +01:00
Jan Dalheimer
4435016fae Fix some bugs that surfaced 2013-12-02 12:02:37 +01:00
Jan Dalheimer
0a6399b52c Unit testing 2013-12-02 11:09:56 +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
Andrew
613699b362 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop 2013-12-01 14:28:47 -06:00
Andrew
2427ad6871 Rework MultiMC's versioning system 2013-12-01 14:27:36 -06: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
Jan Dalheimer
8334b6a09f Fix crash when no instances are available 2013-11-30 12:28:35 +01:00
Jan Dalheimer
8831856172 Remember the last selected instance and select it on startup 2013-11-30 12:28:20 +01:00
Anthony Parrott
6518296e99 Fix OS X packaging problem 
GLOB_RECURSE was pointing at the wrong directory - it needed to point
at the directories that had the dylib files in them to fix them so they
didn’t point at the local installed version of Qt
 2013-11-29 02:31:30 -05: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
Andrew
1f150dcb78 Tweak the layout of the accounts button 2013-11-28 16:05:07 -06:00
Andrew
f7b64a551b Add icon for when no default account is selected 
Also fixed a bug where the icon on the accounts button wouldn't change
when the user checked the "Use as default" checkbox in the account
selection dialog.
 2013-11-28 15:46:04 -06:00
Andrew
8232271c00 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_yggdrasil 2013-11-28 14:51:34 -06:00
Andrew
a914e8bd24 Merge branch 'develop' of https://github.com/Drayshak/MultiMC5 into feature_yggdrasil 2013-11-28 14:50:12 -06:00