Skip to content

Commit

Permalink
Merge pull request #26 from liplum/v4
Browse files Browse the repository at this point in the history
Cyber IO V4.0. Everything is done.
  • Loading branch information
liplum authored Jul 28, 2022
2 parents c22cd05 + d3f156f commit d6eb9cb
Show file tree
Hide file tree
Showing 739 changed files with 27,085 additions and 12,402 deletions.
60 changes: 0 additions & 60 deletions .github/workflows/AutoReleaseWhenPush.yml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: ${{ github.event.repository.name }} Pull Request
path: build/libs/${{ github.event.repository.name }}.jar
path: main/build/tmp/deploy/*.jar
74 changes: 74 additions & 0 deletions .github/workflows/Push.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
name: Build Cyber IO Push
on: push

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Set Android SDK tools
run: echo "$ANDROID_HOME/build-tools/30.0.3" >> $GITHUB_PATH

- name: Set up JDK 17
uses: actions/setup-java@v2
with:
java-version: '17'
distribution: 'temurin'
cache: 'gradle'

- name: Get short commit hash
run: echo "SHORT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_ENV

- name: Test CyberIO
run: |
chmod +x gradlew
./gradlew :main:test
- name: Build Cyber-IO
run: |
chmod +x gradlew
./gradlew :main:deploy
- uses: actions/upload-artifact@v2
with:
name: CyberIO-Unzip-This
path: main/build/tmp/deploy/*.jar

upload:
needs: build
if: ${{ startsWith(github.event.head_commit.message,'[release]') }}
runs-on: ubuntu-latest
env:
GH_REPO: ${{ github.repository }}
steps:
- uses: actions/checkout@v2

- uses: actions/download-artifact@v2
with:
name: CyberIO-Unzip-This
path: out

- name: Retrieve meta
id: retrieveMeta
run: |
chmod +x gradlew
./gradlew retrieveMeta
- name: Create release
if: ${{ steps.retrieveMeta.outputs.tag_exist == 'false' }}
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
HEADER: ${{ steps.retrieveMeta.outputs.header }}
VERSION: ${{ steps.retrieveMeta.outputs.version }}
TAG_EXIST: ${{ steps.retrieveMeta.outputs.tag_exist }}
run: |
gh release create "$VERSION" --title "$HEADER" --notes-file "Info/ReleaseMessage/$VERSION.md" out/*
- name: Update release file
if: ${{ steps.retrieveMeta.outputs.tag_exist == 'true' }}
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
VERSION: ${{ steps.retrieveMeta.outputs.version }}
run: |
gh release upload "$VERSION" out/* --clobber
23 changes: 0 additions & 23 deletions .github/workflows/TestWhenPush.yml

This file was deleted.

172 changes: 6 additions & 166 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,172 +1,12 @@
logs/
/core/assets/mindustry-saves/
/core/assets/mindustry-maps/
/core/assets/bundles/output/
/core/assets/.gifimages/
/deploy/
/desktop/packr-out/
/desktop/packr-export/
/desktop/mindustry-saves/
/desktop/mindustry-maps/
/desktop/gifexport/
/core/lib/
/ios/assets/
/core/assets-raw/sprites/generated/
/core/assets-raw/sprites_out/
/annotations/build/
/annotations/out/
/net/build/
/tools/build/
/tests/build/
/server/build/
/test_files/
/annotations/build/
/desktop-sdl/build/
desktop-sdl/build/
/android/assets/mindustry-maps/
/android/assets/mindustry-saves/
/core/assets/gifexport/
/core/assets/version.properties
/core/assets/locales
/ios/src/io/anuke/mindustry/gen/
/core/src/io/anuke/mindustry/gen/
ios/robovm.properties
packr-out/
config/
*.gif

.idea
local.properties
version.properties

.attach_*
## Java

*.class
*.war
*.ear
hs_err_pid*
crash-report-*

## 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/

/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
/build/
/android/build/
/core/build/
/desktop/build/
/html/build/
/ios/build/
/ios-moe/build/

## OS Specific
.DS_Store
Thumbs.db
android/libs/

## Liplum's own files
!GFX/
run
cache

.gradle
build
## OpenGAL
*.node

## Python
__pycache__/

## Gradle :main project
main/build
buildSrc/build
extra
local_settings.json
assets-gen
Binary file added GFX/HoloProjector-new.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added GFX/IC-new-erekir.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added GFX/IC-new-vanilla.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added GFX/SenderReciever-new.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 7 additions & 1 deletion Info/Copyright.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,10 @@ In [assets/sounds](/assets/sounds):
2. laser0.wav to laser2.wav
3. laser-weak0.wav to laser-weak2.wav
4. laser-strong0.wav to laser-strong2.wav
5. tv-static.wav
5. tv-static.wav
6. heartbeat.wav
7. heartbeat-faster.wav

In [assets/sprites](/assets/sprites):
1. blood-bullet.png
2. blood-bullet-hit.png
Loading

0 comments on commit d6eb9cb

Please sign in to comment.