mirror of
https://github.com/yairm210/Unciv.git
synced 2025-01-08 14:33:42 +07:00
4c19347a89
* Add some very small Quality-of-Life improvements for multiplayer games - GameInfo.kt - Add timestamp for the start of the last turn to save info, hopefully this will enable a multiplayer turn timer in the near future - MultiplayerScreen.kt - Current turn indicator for multiplayer games now shows for how long it has been the current player's turn. - WorldScreen.kt - Next Turn Action will display which player we are waiting for rather than the generic "Waiting for other players..." * Update text for translations and add better elapsed times template.properties - Add translation templates for waiting turn information German.properties - Provide German translation for waiting turn info Japanese.properties - Provide Japanese translation for waiting turn info MultiplayerScreen.kt - Add translation brackets for waiting turn info - Add a function which determines whether to represent elapsed time in Minutes, Hours, or Days (and does so) WorldScreen.kt - Add translation brackets for waiting turn info * Fix line translated endings as per request MultiplayerScreen.kt - Translation for the "Last refresh:/Current Turn:" display no longer includes line endings - "Last refresh:/Current Turn:" display now uses LF line endings only * Show generic "Waiting for" message in single player WorldScreen.kt - Place an additional condition for getNextTurnAction which selects the generic "Waiting for" message in single player and the civ-specific one in multiplayer Co-authored-by: Colin S. Vanden Heuvel <colin.vandenheuvel@wisc.edu>
145 lines
2.1 KiB
Plaintext
145 lines
2.1 KiB
Plaintext
## Java
|
|
|
|
*.class
|
|
*.war
|
|
*.ear
|
|
hs_err_pid*
|
|
|
|
## Robovm
|
|
/ios/robovm-build/
|
|
|
|
## GWT
|
|
/html/war/
|
|
/html/gwt-unitCache/
|
|
.apt_generated/
|
|
.gwt/
|
|
gwt-unitCache/
|
|
www-test/
|
|
.gwt-tmp/
|
|
|
|
## Android Studio and Intellij and Android in general
|
|
/android/libs/armeabi/
|
|
/android/libs/armeabi-v7a/
|
|
/android/libs/arm64-v8a/
|
|
/android/libs/x86/
|
|
/android/libs/x86_64/
|
|
/android/gen/
|
|
.idea/
|
|
*.ipr
|
|
*.iws
|
|
*.iml
|
|
/android/out/
|
|
com_crashlytics_export_strings.xml
|
|
|
|
## Eclipse
|
|
|
|
.classpath
|
|
.project
|
|
.metadata/
|
|
/android/bin/
|
|
/core/bin/
|
|
/desktop/bin/
|
|
/html/bin/
|
|
/ios/bin/
|
|
/ios-moe/bin/
|
|
*.tmp
|
|
*.bak
|
|
*.swp
|
|
*~.nib
|
|
.settings/
|
|
.loadpath
|
|
.externalToolBuilders/
|
|
*.launch
|
|
|
|
## NetBeans
|
|
|
|
/nbproject/private/
|
|
/android/nbproject/private/
|
|
/core/nbproject/private/
|
|
/desktop/nbproject/private/
|
|
/html/nbproject/private/
|
|
/ios/nbproject/private/
|
|
/ios-moe/nbproject/private/
|
|
|
|
/build/
|
|
/android/build/
|
|
/core/build/
|
|
/desktop/build/
|
|
/html/build/
|
|
/ios/build/
|
|
/ios-moe/build/
|
|
/buildSrc/build
|
|
|
|
/nbbuild/
|
|
/android/nbbuild/
|
|
/core/nbbuild/
|
|
/desktop/nbbuild/
|
|
/html/nbbuild/
|
|
/ios/nbbuild/
|
|
/ios-moe/nbbuild/
|
|
|
|
/dist/
|
|
/android/dist/
|
|
/core/dist/
|
|
/desktop/dist/
|
|
/html/dist/
|
|
/ios/dist/
|
|
/ios-moe/dist/
|
|
|
|
/nbdist/
|
|
/android/nbdist/
|
|
/core/nbdist/
|
|
/desktop/nbdist/
|
|
/html/nbdist/
|
|
/ios/nbdist/
|
|
/ios-moe/nbdist/
|
|
|
|
nbactions.xml
|
|
nb-configuration.xml
|
|
|
|
## Gradle
|
|
|
|
/local.properties
|
|
.gradle/
|
|
gradle-app.setting
|
|
|
|
## OS Specific
|
|
.DS_Store
|
|
Thumbs.db
|
|
|
|
## iOS
|
|
/ios/xcode/*.xcodeproj/*
|
|
!/ios/xcode/*.xcodeproj/xcshareddata
|
|
!/ios/xcode/*.xcodeproj/project.pbxproj
|
|
/ios/xcode/native/
|
|
|
|
/ios-moe/xcode/*.xcodeproj/*
|
|
!/ios-moe/xcode/*.xcodeproj/xcshareddata
|
|
!/ios-moe/xcode/*.xcodeproj/project.pbxproj
|
|
/ios-moe/xcode/native/
|
|
SaveFiles/
|
|
android/android-release.apk
|
|
android/assets/GameSettings.json
|
|
android/release/output.json
|
|
android/release/android-release.apk
|
|
android/release/release/android.aab
|
|
android/assets/fonts/
|
|
android/release/android.aab
|
|
android/assets/maps/
|
|
android/release/android.aab.sig
|
|
android/release/android-release.aab
|
|
tests/build/
|
|
desktop/packr/
|
|
desktop/packrCache/
|
|
deploy/
|
|
android/release/
|
|
|
|
android/assets/mods/
|
|
android/assets/SaveFiles/
|
|
android/assets/scenarios/
|
|
android/assets/MultiplayerGames/
|
|
android/assets/music/
|
|
|
|
# Visual Studio Code
|
|
.vscode/
|