Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
with the new strings.
|
|
Conflicts:
logic/net/URLConstants.h
Resolve issues with multiple definitions of URL constants by moving them to their own object file.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
into feature_derpstances
Conflicts:
gui/dialogs/OneSixModEditDialog.cpp
logic/OneSixUpdate.cpp
|
|
Customize it for the Forge one so people finally shut up about 1.7.4
|
|
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.
|
|
|
|
|
|
|
|
Add to the changelog and tweak the version number.
|
|
|
|
|
|
Also, cat is no longer mysterious. It's just FLUFFY!
|
|
|
|
into develop
Conflicts:
gui/dialogs/SettingsDialog.cpp
gui/dialogs/SettingsDialog.ui
|
|
|
|
|
|
It's now super hard. SRSLY.
|
|
|
|
Bump hotfix version number and add an entry in the changelog.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Again...
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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.
|
|
Conflicts:
CMakeLists.txt
gui/MainWindow.h
|
|
|