Commit Graph

123 Commits

Author SHA1 Message Date
Freshmilkymilk
b815d396e0
Merge branch 'master' of https://github.com/diktatoria/HeliosLauncher into master
 Conflicts:
	app/assets/js/microsoft.js
	app/assets/js/scripts/login.js
2021-02-06 14:07:01 -07:00
Dr_Dee
68879fa7eb add login ad multiple account support 2021-02-05 16:49:36 +01:00
Dr_Dee
731f00acc9 add "Waiting on microsoft..." 2021-02-02 21:21:24 +01:00
Dr_Dee
3ebb71b368 Merge branch 'master' of https://github.com/diktatoria/HeliosLauncher 2021-02-02 14:52:48 +01:00
Dr_Dee
b4249e7108 make login window closable 2021-02-02 14:52:44 +01:00
DrDeee
1035318b42
replace launcher name in login.js 2021-02-02 12:41:03 +01:00
Freshmilkymilk
a75e70f9ac
Fix up some small things 2021-02-01 14:21:38 -07:00
Freshmilkymilk
a81923eacc
Update launcher name to match ours 2021-02-01 13:56:24 -07:00
Freshmilkymilk
1f0008d444
Merge remote-tracking branch 'MS/master' into master 2021-02-01 13:53:04 -07:00
Freshmilkymilk
8ae8d0026f
Merge branch 'master' of https://github.com/dscalzi/HeliosLauncher into master
 Conflicts:
	README.md
2021-02-01 13:47:59 -07:00
Dr_Dee
bcf44cfd52 MLS v2 2021-01-31 13:49:17 +01:00
Daniel Scalzi
8723a192b4
Minecraft.net status works again, dependency upgrade. 2020-12-09 20:06:10 -05:00
Freshmilkymilk
4374c326e8
Merge branch 'master' of https://github.com/dscalzi/HeliosLauncher into master
 Conflicts:
	app/landing.ejs
	package-lock.json
	package.json
2020-09-13 21:42:25 -06:00
Daniel Scalzi
c0776dcf61
Set broken mojang services to green until their API is fixed. 2020-09-13 13:35:49 -04:00
Michael Anderson
6fd2e187bc
Merge pull request #6 from dscalzi/master
Pull from upstream
2020-09-10 11:38:12 -06:00
Daniel Scalzi
9a2c1fd9b9
Use corretto on macOS since they use an older version of Xcode. (#70)
Vendor name is now displayed above the selected Java version on the settings page. This is to allow for easier differentiation between versions (ex. Amazon Corretto vs AdoptOpenJDK).
2020-09-08 23:19:07 -04:00
Michael Anderson
fc967a330e
Merge pull request #5 from dscalzi/master
Update from upstream
2020-08-30 14:44:42 -06:00
Daniel Scalzi
bd19b16530
Include user's displayName in server joined regex. 2020-08-25 17:11:40 -04:00
Michael Anderson
9a8ad9da1a clean up some stuff and remove reddit image stuff 2020-07-28 20:08:53 -06:00
Michael Anderson
fcef514ca1 update vars 2020-07-14 19:37:21 -06:00
Michael Anderson
ae398a06af make background come from reddit. Need to add some checks but it works 2020-07-11 12:44:33 -06:00
Daniel Scalzi
eeaa2e98d0
Update RPC game joined regex. (closes #80) 2020-06-29 11:28:55 -04:00
Daniel Scalzi
71b25d3e5c
Minor fixes and improvements.
Fixed issue with passing fullscreen argment to 1.13+, although it doesnt seem to be working well clientside.
Improved the forge version check logic.
Fixed launch area toggling and added a min linger time so that the transition doesnt look abrupt.
Upgraded dependencies.
2020-06-08 14:00:07 -04:00
Daniel Scalzi
8726638a23
Electron 9, Fixed breaking changes from 7 and 8.
Fixed file selectors not behaving properly due to breaking change in Electron 7 (#67).
Renamed shell.openItem to shell.openPath (Electron 9 breaking change).

Resolves #67.
2020-05-21 21:02:58 -04:00
Daniel Scalzi
b3f8ff9595 Fix dmg executable name. 2020-05-19 20:31:35 -04:00
Daniel Scalzi
141a753893
Electron 8. 2020-03-18 19:54:46 -04:00
Daniel Scalzi
cbc8b07467 Rebrand to Helios Launcher. 2019-09-05 16:08:47 -04:00
Daniel Scalzi
d94365f535
Use OpenJDK downloads instead of Oracle (no longer possible).
Makes use of https://adoptopenjdk.net/, star them on GitHub, great product.
2019-06-02 18:11:39 -04:00
Daniel Scalzi
c141475404
Initial work on localization. 2019-04-07 23:33:40 -04:00
Daniel Scalzi
644a32de37
Start removing specific branding. 2019-03-06 00:37:31 -05:00
Daniel Scalzi
5c0a293390
Break up assetguard. 2019-03-05 23:05:01 -05:00
Daniel Scalzi
81367bc619
1.13 Update Phase 1
Mojang has changed its manifest format for 1.13.
Forge is no longer a universal jar, it requires more hosted files, all of which are generated by the installer.
We can no longer extract the version manifest from forge's jar and have to include it in the distribution.
This commit adds support for launching forge only, mods are currently not supported from the distribution.
Handling of 1.13 launches are subject to change as we move forward.
2019-02-18 06:31:01 -05:00
Daniel Scalzi
6d1ecd73ee
Show a meaningful message if users try to login without a paid account. 2019-02-05 17:26:00 -05:00
Daniel Scalzi
8c0bf8faac
Improve error handling during launch (#21)
If anything happens to the forked process, the main should now pick up on it and alert the user.
Should no longer get 'stuck at 100%' issues when the forked process fails, for whatever reason.
2019-01-20 06:55:13 -05:00
Daniel Scalzi
de15440e6d
Added option to change data folder location. (#17)
Removed commonDirectory.
Removed instanceDirectory.
Added dataDirectory. The common and instance directories are now resolved from this.
The config.json and distribution.json are now stored in Electron's data folder (app.getPath('userData')).
Users can edit the dataDirectory under launcher settings.
2019-01-04 14:25:27 -05:00
Daniel Scalzi
d7fe519923
Preliminary Java 9+ Support (#20).
We will still not allow these versions to be used until they have been fully verified on our far-future 1.13 test server.
2018-12-31 10:39:27 -05:00
Daniel Scalzi
be533af38b
v1.4.0 - Added Shader Options, Electron v4. 2018-12-21 16:06:34 -05:00
Daniel Scalzi
b98a4ec21f
Shaderpack settings nearly finalized.
Added saving function, add pack button, drag and drop functionality to the button, ability to
refresh the list of packs.
Added height limit to the dropdown with scrolling. Cleaned up some styles.
2018-12-21 08:02:24 -05:00
Daniel Scalzi
a4d4b69791
Initial work on shader options, electron@4. 2018-12-21 06:51:08 -05:00
Daniel Scalzi
d779eacf61
Added drag/drop functionality to the add mods button.
You can now drag one or more files onto the add mods button in order to add them to the mods directory. Only jar, litemod, and zip files will be moved.
Changed eslint to use a single configuration file, with overrides for the UI scripts.
Now using fs-extra, replace usages of rimraf and mkdirp with fs-extra functions.
2018-12-01 08:20:42 -05:00
Daniel Scalzi
684e884d9c
Mod config bug fixes, electron upgrade.
If the instance mods directory does not exist when the 'Add Drop-In Mod' button is clicked, it will be created.
The update selected server code has been modified. Previously, the server would be updated before the mod config was saved. This has been fixed so that the mod config is saved before the server is switched.
Updated electron to v3.0.10.
2018-11-20 05:19:59 -05:00
Daniel Scalzi
c6051f9942
v1.1.0-pre.2 2018-11-18 22:03:17 -05:00
Daniel Scalzi
acd6143d30
Modify AutoUpdater behavior on macOS.
The AutoUpdater requires that macOS builds be code signed. That is currently not possible.
As a workaround, the autoupdater on mac will now alert users that an update is available and give the option to download the file directly from GitHub.
Closes #16.
2018-11-18 21:51:48 -05:00
Daniel Scalzi
e6b9728fe5
Updated electron-builder, electron-updater. 2018-11-09 01:03:28 -05:00
Daniel Scalzi
3acc213544
electron-is-dev is now useless, use our own copy. 2018-09-23 02:19:16 -04:00
Daniel Scalzi
b2e9223b10
Updated to Electron v3.0.0, renderer to node v10.
Fixed deprecation of Buffer constructor in node v10.
Set flag to print the stack trace of node warnings in the renderer.
2018-09-22 05:07:18 -04:00
Daniel Scalzi
2a9db6c646
Various fixes to New UI.
Add proper styling for spoiler blocks. (#6)
Fixed minor issue with relative url replacement regex.
Upgraded eslint@5.5.0
2018-09-05 02:30:26 -04:00
Daniel Scalzi
e53b92c38b
Fix styling error when logging out of last account. 2018-08-29 13:44:28 -04:00
Daniel Scalzi
0346597afe
Wrap calls to console.log through LoggerUtil (prefixes). 2018-08-22 14:21:49 -04:00
Daniel Scalzi
37606dc8d2
Improvements to overlay keybinds.
Added dynamic keybinder for overlays. If dismissable, the Escape key will dismiss the overlay. If not dismissable, Enter & Escape will trigger the main button.
If the selected account is not valid and you have more than one other account, you may cancel logging in to return to the original error overlay.
Updated electron-builder@20.28.2.
Fixed minor bug where the background of the settings UI was set to transparent. This occurred if the validation error overlay was shown on the settings UI, and you chose the login option.
2018-08-22 10:54:09 -04:00