Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

online load/save works #17

Merged
merged 5 commits into from
Sep 8, 2014
Merged

online load/save works #17

merged 5 commits into from
Sep 8, 2014

Conversation

bvs23bkv33
Copy link
Collaborator

No description provided.

@asmodehn
Copy link
Owner

asmodehn commented Aug 7, 2014

/home/jenkins/workspace/WkCocos_Android/depends/App42_Cocos2DX_SDK/V_1.5/App42_Cocos2dX_SDK/PushNotificationService/PushNotificationService.h:21:3: note: in expansion of macro 'ANDROID'
ANDROID,
^
:0:9: error: expected '}' before numeric constant
/home/jenkins/workspace/WkCocos_Android/depends/App42_Cocos2DX_SDK/V_1.5/App42_Cocos2dX_SDK/PushNotificationService/PushNotificationService.h:21:3: note: in expansion of macro 'ANDROID'
ANDROID,
^
:0:9: error: expected unqualified-id before numeric constant
/home/jenkins/workspace/WkCocos_Android/depends/App42_Cocos2DX_SDK/V_1.5/App42_Cocos2dX_SDK/PushNotificationService/PushNotificationService.h:21:3: note: in expansion of macro 'ANDROID'
ANDROID,

@asmodehn asmodehn added this to the for DF 0.6 milestone Aug 11, 2014
@asmodehn
Copy link
Owner

asmodehn commented Sep 2, 2014

stderr: No submodule mapping found in .gitmodules for path 'tools/database'

@bvs23bkv33
Merge branch 'feature/strongbox' into feature/onlinesave
bc48775 
Conflicts:
	.gitmodules
	Android/.idea/modules.xml
	Classes/App/MyPlayer.cpp
	Classes/App/PlayersListUI.cpp
	Classes/App/TestScene.cpp
	Classes/Lib/CMakeLists.txt
	Classes/Lib/OnlineData/Comp/OnlineData.cpp
	Classes/Lib/OnlineData/OnlineDataManager.cpp
	Classes/Lib/Player.cpp
	Classes/Lib/Timer/Systems/TimeUpdater.cpp
	Include/WkCocos/LocalData/Comp/LocalData.h
	Include/WkCocos/Player.h
	Include/WkCocos/Scene.h
	Include/WkCocosApp/MyPlayer.h
@bvs23bkv33
forgot to uncomment online manager in player
7168f3d
@bvs23bkv33
Merge branch 'develop' into feature/onlinesave
fe35e66 
Conflicts:
	.gitmodules
	Android/.idea/modules.xml
	Classes/App/MyPlayer.cpp
	Classes/Lib/OnlineData/OnlineDataManager.cpp
	Classes/Lib/Player.cpp
	Classes/Lib/Timer/Systems/TimeUpdater.cpp
	Include/WkCocos/Player.h
	Include/WkCocosApp/GameLogic.h
	Include/WkCocosApp/MyPlayer.h
@bvs23bkv33
Merge remote-tracking branch 'origin/develop' into feature/onlinesave
383f0d6
@bvs23bkv33
simplifying json doc structure to locate error
9de18af
@bvs23bkv33 bvs23bkv33 merged commit 9de18af into develop Sep 8, 2014
@asmodehn asmodehn deleted the feature/onlinesave branch September 8, 2014 07:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
for DF 0.6
Development

Successfully merging this pull request may close these issues.
2 participants
@bvs23bkv33 @asmodehn