Просмотр исходного кода

Squashed 'asteroids/' changes from 10dcf7066..55dbbe5b3

55dbbe5b3 fix catalog versions
bbc261052 categories part 1
642b2bece more manifestos, xbox controller and videopoker ufbt fixes
eee7341d7 Add Screenshots
9c6dc1f2e API 31 / unzip sources
REVERT: 10dcf7066 Add rare chance trigger for power ups
REVERT: b46e722d1 make shield more rare, additional logging
REVERT: 9bd77bd8b Make extra life power up more rare
REVERT: 343e87d2b Keep power up on game play area
REVERT: 12443abf9 No time
REVERT: e50cb64db Update readme for new power up system
REVERT: d8fc8cba8 Updated application manifest, new power up system
REVERT: acc738af0 V1 of power up system and pause screen
REVERT: 96e7a6b04 Add haptic feedback on power up pick up
REVERT: 4c0f3adab disable debug mode
REVERT: 9c9eb8f71 Update readme to include power up and pause menu
REVERT: 48188ec9d reverse the for loop for power up status check
REVERT: 4150a8b7c allow immediate collsion with smaller asteroids
REVERT: f97247ef1 need more logs
REVERT: 7633b2bdb debugging power ups
REVERT: 6687bf162 minor comment clarification
REVERT: eff243b47 Add pause screen
REVERT: 9ed721ee7 Add basic pause state using back button
REVERT: cccf54c4a limit bonus <3, add should_add_powerups, adj spawn
REVERT: 35a2c6fdc Bugfix: Powerup spawn anti-collide, code reorganiz
REVERT: 827031c4e change power up size to %f, organize code
REVERT: ce40ee9bf Added isPowerUpCollidingWithEachOther
REVERT: 8b64ee985 restore asteroids
REVERT: 790ff263d make circle shield a little smaller
REVERT: 505aef0fc Fix realtime power up status
REVERT: 45b41b48b Adjust bonus lives to something more reasonable
REVERT: 1af018af1 bugfix: power up off by one index
REVERT: fb1f116a6 bugfix towards power up system add/remove
REVERT: 97f08666a flashing powerups when expiring
REVERT: 44da826e3 shield artwork
REVERT: 520178787 shield artwork update
REVERT: e52246b08 Re-enable random power up
REVERT: 6ecb58f0d add nuke, fix firepower bug
REVERT: c88ab5b65 improvd firepower asset
REVERT: 4e1d1cb2e Update assets: add nuke and split shield
REVERT: 11bc81ed7 add PowerUpShieldType
REVERT: 29863ada5 improved PowerUpTypeFirePower
REVERT: 912daa6d9 use image assets, add Lives Power up
REVERT: cd76484d9 Add images, update manifest
REVERT: 8d5e78af5 Fix power up system
REVERT: 99ffbfa6f first draft of power up system
REVERT: 0ad2a3168 Update readme about long back button press
REVERT: f1ecffbc8 Autosave on exit, set longpress to exit for safety
REVERT: 06f8f55a6 Update ReadMe
REVERT: 292faddee Merge branch 'main' of https://github.com/SimplyMinimal/FlipperZero-Asteroids
REVERT: 73d562540 haptic feedback thrusters
REVERT: 82ec5fdfa Update ReadMe to add high score details and credit
REVERT: 8f0c10ceb Hiscore, disable pretty game over anim for clarity
REVERT: fd1b4ede7 bugfix: last score display, added new high score
REVERT: 4a49e0458 Prep for automated build system
REVERT: 5829369a8 Added auto save/load game state to save high score
REVERT: da4cfe091 Add thrusters animation
REVERT: deadbf533 Add High Score system
REVERT: 0beaa3f47 update .gitignore and add .editorconfig
REVERT: 6c0a03329 Cosmetically show 3 lives on Game Over screen
REVERT: d7c8a220d Bugfix: Properly account for lives (from antirez)
REVERT: 9ea751f9e Update ReadMe
REVERT: 12a62a9a0 New Astroid build
REVERT: ef4c55286 Vibrate on bullets fired. FIRE ZE LAZERS!
REVERT: c55cde8d2 Add vibration and red LED on crash
REVERT: a2555237d Shorten Bullet TTL, Reorganize defines
REVERT: d05a98010 Reduce max bullets for increased difficulty
REVERT: 81d7a2b44 Bugfix: Wrong branch. Keys not registering
REVERT: 5e7e4c771 Press and Hold to continuous fire to reduce wear
REVERT: 6c8444e49 Map key press up to thrusters
REVERT: 68fe5af01 clang autoformat (no code change)
REVERT: b2ee8e3a3 Other path fixed as well.
REVERT: d8d03d84a Fix path in README.
REVERT: 9ce401b1f Binary file updated.
REVERT: b6d99d7a3 README updated.
REVERT: 7437ec24e Application icon updated.
REVERT: cd817d088 Ship controls improved.
REVERT: 6f7abf0b0 Delay between bullet firing.
REVERT: 325220b12 Don't start in game over mode.
REVERT: fbd989b0c Game binary added.
REVERT: 9bb3f4c80 GAME OVER screen.
REVERT: d4d21f988 Lives and ship collision.
REVERT: e4bb88792 When hit, asteroids split into fragments.
REVERT: 17b2addc5 Specify in README that it is a work in progress.
REVERT: f1607d7d9 Asteroids drawing and other progresses.
REVERT: 6dbb6060e More of the 2D engine. Bullets.
REVERT: f3b93226d Cleaner data structures.
REVERT: 9c1afd02b Asteroids structure.
REVERT: caac011c4 More general 2D abstractions, to make more games.
REVERT: 596f77c04 First commit. Just draw ship.

git-subtree-dir: asteroids
git-subtree-split: 55dbbe5b3f94790cad30c08ab896678605d3c0bd
Willy-JL 2 лет назад
Родитель
Сommit
676536e52c
5 измененных файлов с 6 добавлено и 21 удалено
  1. 0 13
      .editorconfig
  2. 0 3
      .gitignore
  3. 6 5
      application.fam
  4. BIN
      img/1.png
  5. BIN
      img/2.png

+ 0 - 13
.editorconfig

@@ -1,13 +0,0 @@
-root = true
-
-[*]
-end_of_line = lf
-insert_final_newline = true
-charset = utf-8
-
-[*.{cpp,h,c,py,sh}]
-indent_style = space
-indent_size = 4
-
-[{Makefile,*.mk}]
-indent_size = tab

+ 0 - 3
.gitignore

@@ -1,3 +0,0 @@
-.vscode/
-dist/
-.clang-format

+ 6 - 5
application.fam

@@ -3,14 +3,15 @@ App(
     name="Asteroids",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="asteroids_app_entry",
-    cdefines=["APP_PROTOVIEW"],
+    cdefines=["APP_ASTEROIDS"],
     requires=["gui"],
     stack_size=8 * 1024,
     order=50,
     fap_icon="appicon.png",
+    fap_icon_assets="assets",
     fap_category="Games",
-    fap_icon_assets="assets",  # Image assets to compile for this application
-    fap_description="An implementation of the classic arcade game Asteroids",
-    fap_author="antirez, SimplyMinimal",
-    fap_weburl="https://github.com/SimplyMinimal/FlipperZero-Asteroids",
+    fap_author="@antirez & @SimplyMinimal",
+    fap_weburl="https://github.com/antirez/flipper-asteroids",
+    fap_version="1.1",
+    fap_description="Asteroids game",
 )