ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
thrust26 2018-08-07 09:37:42 +02:00
parent 89b0759da5 e2df53bd05
commit f3927b94c4
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/Version.hxx
View File

@ -19,6 +19,6 @@
#define VERSION_HXX
#define STELLA_VERSION "6.0_pre1"
#define STELLA_BUILD "4430"
#define STELLA_BUILD "4434"
#endif

2
src/emucore/tia/Ball.cxx
View File

@ -65,8 +65,6 @@ void Ball::enabl(uInt8 value)
myTIA->flushLineCache();
updateEnabled();
collision = (myIsVisible && myIsEnabled) ? myCollisionMaskEnabled : myCollisionMaskDisabled;
myTIA->scheduleCollisionUpdate();
}
}

2
src/macosx/Info-Stella.plist
View File

@ -53,7 +53,7 @@
<key>CFBundleSignature</key>
<string>StLa</string>
<key>CFBundleVersion</key>
<string>5.1</string>
<string>6.0</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.games</string>
<key>LSMinimumSystemVersionByArchitecture</key>