Commit f3927b94 authored by thrust26's avatar thrust26
Browse files

Merge branch 'release/6.0' of https://github.com/stella-emu/stella into release/6.0

parents 89b0759d e2df53bd
...@@ -19,6 +19,6 @@ ...@@ -19,6 +19,6 @@
#define VERSION_HXX #define VERSION_HXX
#define STELLA_VERSION "6.0_pre1" #define STELLA_VERSION "6.0_pre1"
#define STELLA_BUILD "4430" #define STELLA_BUILD "4434"
#endif #endif
...@@ -65,8 +65,6 @@ void Ball::enabl(uInt8 value) ...@@ -65,8 +65,6 @@ void Ball::enabl(uInt8 value)
myTIA->flushLineCache(); myTIA->flushLineCache();
updateEnabled(); updateEnabled();
collision = (myIsVisible && myIsEnabled) ? myCollisionMaskEnabled : myCollisionMaskDisabled;
myTIA->scheduleCollisionUpdate();
} }
} }
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>StLa</string> <string>StLa</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>5.1</string> <string>6.0</string>
<key>LSApplicationCategoryType</key> <key>LSApplicationCategoryType</key>
<string>public.app-category.games</string> <string>public.app-category.games</string>
<key>LSMinimumSystemVersionByArchitecture</key> <key>LSMinimumSystemVersionByArchitecture</key>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment