ZK Merge #499
Merged
ZK Merge #499
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ion. Made the download popup able to download a list of games.
This copies the .gitattributes file from the Zero-K repository, and adds .css to the list of always-text files.
This ensures we have no CRLF checked into the index. This process can be automated by the following: git add --renormalize .
This process can be automated by the following:
while read f; do
if diff /dev/null "$f" | tail -1 | grep '^\\ No newline' > /dev/null; then
echo >> "$f";
fi;
done < <(git ls-files '*.lua' '*.tdf' '*.h' '*.glsl' '*.fs' '*.json' '*.txt' '*.css')
This applies only to trailing whitespace after real content. Lines consisting entirely of whitespace have been left untouched. This process can be automated by the following: while read f; do sed -i 's/\([^\t ]\)[\t ]*$/\1/' "$f"; done < <(git ls-files '*.lua' '*.tdf' '*.h' '*.glsl' '*.fs' '*.json' '*.txt' '*.css')
Clean up text file encodings, and some formatting
\n is standard, \r\n is convertible, \r on its own is just plain weird.
CRLF strikes at automated tooling again! Fixing CRLF in the index doesn't necessarily fix them in the working tree. I deleted all files in the repository, then checked out fresh copies to make sure my local working tree had no CRLF. I then invoked the same whitespace-after-content stripping command again: rm -r * git reset --hard HEAD while read f; do sed -i 's/\([^\t ]\)[\t ]*$/\1/' "$f"; done < <(git ls-files '*.lua' '*.tdf' '*.h' '*.glsl' '*.fs' '*.json' '*.txt' '*.css')
Clean up text file encodings, and some formatting p2
Replaced the briefing texts of planets 69 and 1 to 9. text separated into text and extendedText. Previous text used as basis for extendeText.
…fing of planet 1 Continuing to replace the briefing text/adding extendedText. About the left half of the galaxy map is done with this one.
…tweaked 7, 11, 26
Finished Haven and Rebel planet briefings.
… from the briefings.
…s 1, 30. Finished all briefings with the last Empire planets
Fixed a typo on planet 67.
New briefing text and extendedText for the campaign
Fix vanguard module description.
Not really a ZK concept.
Offline users have a nil isAdmin, non-admins have a false isAdmin. This caused comparisons to often enter the admin branch prematurely, breaking alphabetical etc ordering.
This is generally more relevant while in the lobby, and helps make clearer the: > [liblobby] Warning: Duplicate user(...) added to channel (...) problems, where it appears that an online and an offline user share the same name. This issue is not fixed here.
* Replaced most Minotaurs with Ogres. * Reduced Welder spam. * Fixed descriptions.
fix register not sending userid
Update CircuitAI {1.0.8}
Reverted compatibility-breaking battlelist changes. # Conflicts: # .gitattributes # LuaMenu/configs/gameConfig/byar/aiBlacklist.lua # LuaMenu/configs/gameConfig/byar/defaultSettings/springsettings.cfg # LuaMenu/configs/gameConfig/byar/mapWhitelist.lua # LuaMenu/configs/gameConfig/byar/settingsMenu.lua # LuaMenu/configs/gameConfig/byar/skinning/skinConfig.lua # LuaMenu/configs/gameConfig/evorts/ModOptions.lua # LuaMenu/configs/gameConfig/evorts/aiBlacklist.lua # LuaMenu/configs/gameConfig/evorts/defaultSettings/springsettings.cfg # LuaMenu/configs/gameConfig/evorts/mainConfig.lua # LuaMenu/configs/gameConfig/evorts/mapWhitelist.lua # LuaMenu/configs/gameConfig/evorts/settingsMenu.lua # LuaMenu/configs/gameConfig/evorts/singleplayerMenu.lua # LuaMenu/configs/gameConfig/evorts/skinning/skinConfig.lua # LuaMenu/configs/gameConfig/evortsdev/mainConfig.lua # LuaMenu/configs/gameConfig/evortsdev/skirmishDefault.lua # LuaMenu/configs/gameConfig/tc/aiblacklist.lua # LuaMenu/configs/gameConfig/tc/benchmarkFile.lua # LuaMenu/configs/gameConfig/tc/defaultsettings/chobby_config.json # LuaMenu/configs/gameConfig/tc/defaultsettings/springsettings.cfg # LuaMenu/configs/gameConfig/tc/gameUnitInformation.lua # LuaMenu/configs/gameConfig/tc/helpSubmenuConfig.lua # LuaMenu/configs/gameConfig/tc/linkFunctions.lua # LuaMenu/configs/gameConfig/tc/mainconfig.lua # LuaMenu/configs/gameConfig/tc/mapwhitelist.lua # LuaMenu/configs/gameConfig/tc/modoptions.lua # LuaMenu/configs/gameConfig/tc/rankfunction.lua # LuaMenu/configs/gameConfig/tc/settingsmenu.lua # LuaMenu/configs/gameConfig/tc/singleplayerquickskirmish.lua # LuaMenu/configs/gameConfig/tc/skinning/skinconfig.lua # LuaMenu/configs/gameConfig/tc/startscripts/cpv_1.lua # LuaMenu/configs/gameConfig/tc/startscripts/koth_1.lua # LuaMenu/configs/gameConfig/zk/ModOptions.lua # LuaMenu/configs/gameConfig/zk/defaultSettings/benchmarks/config.lua # LuaMenu/configs/gameConfig/zk/defaultSettings/configversions.json # LuaMenu/configs/gameConfig/zk/mainConfig.lua # LuaMenu/configs/gameConfig/zk/settingsMenu.lua # LuaMenu/configs/gameConfig/zkdev/skirmishDefault.lua # LuaMenu/configs/liblobby_configuration.lua # LuaMenu/widgets/api_user_handler.lua # LuaMenu/widgets/dbg_img_preload.lua # LuaMenu/widgets/gui_battle_room_window.lua # LuaMenu/widgets/gui_campaign_handler.lua # LuaMenu/widgets/gui_login_window.lua # LuaMenu/widgets/gui_planetwars_list_window.lua # LuaMenu/widgets/gui_replay_handler.lua # LuaMenu/widgets/gui_steam_coop_handler.lua # LuaMenu/widgets/gui_user_status_panel.lua # campaign/dev/commConfig.lua # campaign/sample/commConfig.lua # campaign/sample/planetDocumentation.lua # campaign/sample/planets/planet1.lua # campaign/sample/planets/planet10.lua # campaign/sample/planets/planet11.lua # campaign/sample/planets/planet12.lua # campaign/sample/planets/planet13.lua # campaign/sample/planets/planet14.lua # campaign/sample/planets/planet15.lua # campaign/sample/planets/planet16.lua # campaign/sample/planets/planet17.lua # campaign/sample/planets/planet18.lua # campaign/sample/planets/planet19.lua # campaign/sample/planets/planet2.lua # campaign/sample/planets/planet20.lua # campaign/sample/planets/planet21.lua # campaign/sample/planets/planet22.lua # campaign/sample/planets/planet23.lua # campaign/sample/planets/planet24.lua # campaign/sample/planets/planet25.lua # campaign/sample/planets/planet3.lua # campaign/sample/planets/planet4.lua # campaign/sample/planets/planet5.lua # campaign/sample/planets/planet6.lua # campaign/sample/planets/planet7.lua # campaign/sample/planets/planet70.lua # campaign/sample/planets/planet71.lua # campaign/sample/planets/planet8.lua # campaign/sample/planets/planet9.lua # libs/chiliui/luamenu/chili/chili/controls/font.lua # libs/liblobby/lobby/interface_skirmish.lua # modinfo.lua
Contributor
Author
|
Reverted font. Current Spring-Chobby: Current ZK-Chobby: |
Member
|
I'm going to first merge this on a branch and then apply some changes before merging it to master |
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I already did the merge hell from chobby -> ZK.
Note that I reverted the changes to LuaMenu/widgets/chobby/components/battle/battle_list_window.lua since they remove intended functionality.