Skip to content

Commit f911191

Browse files
Fixed issue cocos2d#1066
Mac: EventDispatcher triggers flagsChanged correctly
1 parent 1279d20 commit f911191

File tree

7 files changed

+12
-7
lines changed

7 files changed

+12
-7
lines changed

AUTHORS

+2
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,8 @@ People/companies who were/are contributing code to cocos2d for iPhone (alphabeti
328328
Author of the scraper script used to parse games data in the cocos2d site
329329
* Pieter van de Bruggen
330330
Author of Gradient layer
331+
* psi.pk.ru:
332+
EventDispatcher: flagsChanged is triggered correctly. patch
331333
* psionic81:
332334
ActionManager doesn't purge running actions patch
333335
* rac5372:

CHANGELOG

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
version 1.0-beta - XX-XXX-2011
2+
. [FIX-MAC]: EventDispatcher: flagsChanged is triggered correctly (issue #1066)
3+
14
version 0.99.5 - 16-Dec-2010
25
. [NEW] All: small performance improvements in all the code
36
. [NEW] Layer: Added gradient layer

cocos2d/Platforms/Mac/CCEventDispatcher.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ - (void)flagsChanged:(NSEvent *)event
504504
tListEntry *entry, *tmp;
505505

506506
DL_FOREACH_SAFE( keyboardDelegates_, entry, tmp ) {
507-
if ( entry->flags & kCCImplementsKeyUp ) {
507+
if ( entry->flags & kCCImplementsFlagsChanged ) {
508508
void *swallows = [entry->delegate performSelector:@selector(ccFlagsChanged:) withObject:event];
509509
if( swallows )
510510
break;

cocos2d/cocos2d.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
*/
3939

4040
// 0x00 HI ME LO
41-
// 00 00 99 05
42-
#define COCOS2D_VERSION 0x00009905
41+
// 00 01 00 00
42+
#define COCOS2D_VERSION 0x00010000
4343

4444
#import <Availability.h>
4545

cocos2d/cocos2d.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
#import <Foundation/Foundation.h>
2727

28-
static NSString *version = @"cocos2d v0.99.5";
28+
static NSString *version = @"cocos2d v1.0.0-beta";
2929

3030
NSString *cocos2dVersion()
3131
{

doxygen.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ DOXYFILE_ENCODING = UTF-8
2525
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
2626
# by quotes) that should identify the project.
2727

28-
PROJECT_NAME = "cocos2d for iPhone 0.99.5"
28+
PROJECT_NAME = "cocos2d for iPhone 1.0.0"
2929

3030
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
3131
# This could be handy for archiving the generated documentation or
3232
# if some version control system is used.
3333

34-
PROJECT_NUMBER = 0.99.5
34+
PROJECT_NUMBER = 1.0.0
3535

3636
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
3737
# base path where the generated documentation will be put.

install-templates.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
echo 'cocos2d-iphone template installer'
44

5-
COCOS2D_VER='cocos2d 0.99.5'
5+
COCOS2D_VER='cocos2d 1.0.0'
66
BASE_TEMPLATE_DIR="/Library/Application Support/Developer/Shared/Xcode"
77
BASE_TEMPLATE_USER_DIR="$HOME/Library/Application Support/Developer/Shared/Xcode"
88

0 commit comments

Comments
 (0)