0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,326 Commits 1 Branch 0 Tags 29 MiB
88f975eff7
Commit Graph

315 Commits

Author SHA1 Message Date
Petr Mrázek
421a46e3d3 Redo the console window. Log is now a page. Console window has relevant pages. 
Dirty fix for screenshot thumbnail generation. Needs more QTimer.
 2014-06-30 02:02:57 +02:00
Petr Mrázek
5179aed3a0 Separate page dialog into a page container and a dialog. 2014-06-29 19:59:08 +02:00
Petr Mrázek
e8731c5d01 Turn screenshot management into a page. 2014-06-28 17:07:08 +02:00
Petr Mrázek
d6e5c472b5 Update changelog and bump version to 0.4.0 (no tag yet, not final) 2014-06-26 21:49:05 +02:00
Petr Mrázek
d911c9908c Replace notes dialog with a page. 2014-06-18 01:15:01 +02:00
Petr Mrázek
171325d427 Instance settings moved to a page. 2014-06-09 01:38:31 +02:00
Petr Mrázek
bf7b070508 Show texture/resource packs when appropriate. 2014-06-09 01:38:31 +02:00
Petr Mrázek
84ae67fff5 Page dialog for legacy instances. 2014-06-09 01:38:31 +02:00
Petr Mrázek
f485885757 Add and implement pages and page dialog. 2014-06-09 01:38:31 +02:00
Petr Mrázek
e118b1f990 Implement adding jar mods, break saving library order. 2014-06-09 01:38:31 +02:00
Petr Mrázek
439e17b149 Add back legacy mod edit, add checksums for all legacy jars 2014-06-09 01:38:30 +02:00
Petr Mrázek
69c3e7111f Make 1.6+ work with new instance format. 2014-06-09 01:38:30 +02:00
Petr Mrázek
92abe4c603 All of the broken legacy things work. 2014-06-09 01:38:30 +02:00
Petr Mrázek
9860d5ee12 Introducing VersionPatch base class for version files and minecraft versions 2014-06-09 01:38:30 +02:00
Petr Mrázek
8a3a0f5a52 Reorganize logic code. 2014-06-09 01:38:30 +02:00
Petr Mrázek
69a9ca39ad Add builtin Minecraft versions for legacy 2014-06-09 01:38:29 +02:00
Petr Mrázek
4c3bd416c6 Much change, very jarmod. 2014-06-09 01:38:29 +02:00
Petr Mrázek
aade36860c Begin the transformation! 
Nuke all the things.
 2014-06-09 01:38:29 +02:00
Petr Mrázek
3a0cdf2d3d Tagging 0.3.6 2014-06-03 01:44:19 +02:00
Petr Mrázek
d2b2d55aa9 New flat icon themes from pexner 
Squash and rework of commits from robotbrain
 2014-05-25 04:01:38 +02:00
Petr Mrázek
eb9661370b Enable SVG icons 2014-05-25 03:38:45 +02:00
Jan Dalheimer
fc3c0b0971 Merge branch 'feature_crashreport' into develop 2014-05-21 15:57:34 +02:00
Petr Mrázek
8a8c4193e6 Finish status pills. 2014-05-17 16:23:48 +02:00
Petr Mrázek
a6a5241e12 Bump version to 0.3.5 2014-05-15 22:48:00 +02:00
Andrew
5099964c67 Implement backtraces on Windows. 
Much !!FUN!! was had
 2014-05-10 14:16:27 -05:00
Andrew
9e80ddb040 Implement crash report system on Windows. 2014-05-09 20:08:07 -05:00
Forkk
93ae21abfc Implement crash handling on Linux 
This will allow us to generate crash dumps and have users report
crashes.
 2014-05-09 17:33:32 -05:00
Forkk
cba22f7ee0 Bump version and update changelog. 2014-05-01 13:10:46 -05:00
Petr Mrázek
9d724e0fe4 Merge remote-tracking branch 'origin/feature_cmake_style' into develop 
Conflicts:
	CMakeLists.txt
 2014-04-21 23:33:00 +02:00
Taeyeon Mori
4674aad125 Create a new login dialog 2014-04-16 16:19:12 +02:00
Jan Dalheimer
a00fb1e8da Only use tabs for intendention 2014-04-09 15:41:49 +02:00
Jan Dalheimer
3cd2b898e5 Merge remote-tracking branch 'origin/develop' into feature_cmake_style 
Conflicts:
	CMakeLists.txt
 2014-04-07 17:44:52 +02:00
Petr Mrázek
17d4947b30 Merge remote-tracking branch 'origin/feature_dotcmake' into develop 2014-04-06 20:56:40 +02:00
Jan Dalheimer
dd7b6642a3 Use the same style of CMake files everywhere 2014-04-06 19:43:09 +02:00
Jan Dalheimer
eb246c4fa7 .cmake files to reduce "code" duplicate 2014-04-06 18:12:48 +02:00
Jan Dalheimer
6ef38d0873 Coverity build and upload target. Also GitFunctions. 2014-04-06 18:02:28 +02:00
Petr Mrázek
482ad250a4 Workaround for dirty build folders. 
My disgust just turned into barely contained rage :<
 2014-04-06 03:59:37 +02:00
Petr Mrázek
f9169654c5 Build fixage for the changed build config 2014-04-06 03:48:59 +02:00
Petr Mrázek
42e305bb9d Get rid of long rebuilds because of minor cmake config changes 2014-04-06 00:33:33 +02:00
Petr Mrázek
ad9d082f57 Do not spam logs too much, bump version and add to changelog. 2014-04-01 23:03:04 +02:00
Petr Mrázek
29b00eab31 Fix FTB-related issues 2014-03-31 00:19:43 +02:00
Petr Mrázek
b60fbf87ab Bump version to 0.3.0 2014-03-23 23:25:55 +01:00
Petr Mrázek
4a24ea6c38 Make some more error messages translateable. 2014-03-23 19:07:13 +01:00
Jan Dalheimer
4f452d5815 Add a timer for clicking away the notification dialog 2014-03-15 14:18:29 +01:00
Petr Mrázek
28ad9befdc Remove a lot of error code and error handling madness. 2014-03-02 19:12:04 +01:00
Petr Mrázek
7c24bcc834 Reorganize the version-related code. 2014-03-01 23:06:47 +01:00
Jan Dalheimer
00f4f533aa Fix to the way translations are handled. Also updated the german translation with the new strings. 2014-02-25 18:46:50 +01:00
Petr Mrázek
acff155624 Merge branch 'feature_screenshots' into integration_json_and_tools 
Conflicts:
	logic/net/URLConstants.h

Resolve issues with multiple definitions of URL constants by moving them to their own object file.
 2014-02-25 01:52:58 +01:00
Petr Mrázek
9d4e840a6e Screenshots: Optimize image loading and memory use, fix list and button layout. 2014-02-25 01:23:33 +01:00
Petr Mrázek
cb5cfe7242 Reorganize all the screenshot files 2014-02-25 00:51:24 +01:00
Jan Dalheimer
da33fa4090 Imgur album creation 2014-02-24 11:30:27 +01: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
7146724607 New, better, liteloader support 2014-02-19 22:34:17 +01:00
Jan Dalheimer
9c87bc6c4b Restructure 2014-02-16 12:52:35 +01:00
Jan Dalheimer
616c372690 Fix more stuff. Detached tools, only MCEdit for now. 2014-02-16 10:46:14 +01:00
Jan Dalheimer
efa8e26a3f Profiler support. Currently JProfiler and JVisualVM are implemented. 2014-02-15 14:19:35 +01:00
Petr Mrázek
af33b96684 Merge branch 'feature_groupview' into integration_derpstances_groupview 2014-02-08 22:18:32 +01:00
Petr Mrázek
7839c4ecc0 Pave. 2014-02-04 01:40:51 +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
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
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
966f9d1206 Merge branch 'develop' into feature_derpstances 2014-01-24 22:00:34 +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
Petr Mrázek
d7113de3bd Hotfix 0.2.1 for twitch. 
Add to the changelog and tweak the version number.
 2014-01-22 22:40:17 +01:00
Jan Dalheimer
a1a06cc89f Derpstances. Everything renamed. Launching does not yet work. 2014-01-22 07:33:32 +01:00
Petr Mrázek
3a3c9ac951 Update the changelog, version, scale the instance icon 2014-01-20 01:14:11 +01:00
Petr Mrázek
2fe033c4a0 Move a bunch of resources into the resources folder. 
Also, cat is no longer mysterious. It's just FLUFFY!
 2014-01-19 05:21:09 +01:00
Petr Mrázek
d8413fa5ec Use icon theme so we can have more than one icon size per icon 2014-01-19 04:52: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
Sky
a774b3d248 Show Mojang service statuses in status bar 2014-01-12 18:28:42 +00:00
Petr Mrázek
d52079e734 No more generated resources. 2014-01-11 02:17:51 +01:00
Petr Mrázek
43a39a3bfb Harden CacheDownload. 
It's now super hard. SRSLY.
 2014-01-11 02:06:22 +01:00
Forkk
0e22e4b399 Merge branch 'master' into develop 2014-01-08 22:52:49 -06:00
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
0b1e0221f0 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop 2014-01-08 21:50:58 -06:00
Petr Mrázek
5650a28fc6 Hopefully fix OSX icon file 2014-01-08 21:06:31 +01:00
Forkk
87b12a63a1 Make CMake output version type info 2014-01-07 19:30:08 -06:00
Forkk
d7564a51ce Bump minor version number and update changelog. 2014-01-07 19:21:42 -06:00
Forkk
3629f9b999 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into new-version-system 2014-01-07 18:31:49 -06:00
Petr Mrázek
fb83299e59 Deploy jars instead of extracting them at runtime, remove non-working nvidia fix 2014-01-08 01:28:33 +01:00
Forkk
3202b972f8 Rework version numbering system. 
Again...
 2014-01-07 18:09:05 -06:00
Petr Mrázek
267f18ca81 Add hack for Nvidia 2014-01-06 22:05:45 +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
a64eebf8eb Add an option to force using local updater binary (for updater development) 2014-01-05 14:24:33 +01:00
Forkk
ebc14a9d9d Prepend a 5 to version strings. 2014-01-04 21:44:18 -06:00
Petr Mrázek
b49fa9d2a9 Mess with the updater again. 2014-01-05 00:06:55 +01:00
Jan Dalheimer
3b97e3c363 Fix a few things related to the translations 2014-01-04 11:49:06 +01:00
Jan Dalheimer
b3dd1eba21 Notifications system. Mainly to be used in case the updater breaks. 2014-01-03 19:19:27 +01: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
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
Noah Mayr
1bdac97af5 Fixed buttons on osx by adding the accessible plugin. 2014-01-02 15:22:57 +01: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
Petr Mrázek
3a4ecb57d0 Enable high DPI support on OSX 2013-12-31 02:34:00 +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
Jan Dalheimer
55e62a81b6 LiteLoader support 2013-12-28 14:22:36 +01:00
Petr Mrázek
7652b3d64a Various updater fixes 
Updater tests for path utils
The updater now doesn't use splitpath on Windows (fixes problems with Windows XP)
Fix up paths for the OSX updater - should now install the updates into the right place
Fix translations install path - translation isntall and deploy should be fixed
 2013-12-28 04:23:48 +01:00
Jan Dalheimer
82c87aa06f Initial FTB support. Allows "tracking" of FTB instances. 2013-12-21 23:40:37 +01:00