Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,921 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

17921 Commits

Author SHA1 Message Date
Dale Stammen 347f91fcb6 Disabled console for wp8/winrt until networking code is added 2014-03-22 06:11:10 -07:00
Dale Stammen 6a4d459c77 Disabled console for wp8/winrt until networking code is added 2014-03-22 06:10:54 -07:00
Dale Stammen aa0dae4d1f added CC_PLATFORM_WINRT and WP8 2014-03-22 06:10:07 -07:00
Dale Stammen 6ee7f5d325 added CC_PLATFORM_WINRT and WP8 2014-03-22 06:09:48 -07:00
Dale Stammen bfaa5882fe fix for RELATIVE reserved word in wp8 compiler 2014-03-22 06:09:16 -07:00
Dale Stammen 44e6efea64 #pragma mark for ios and mac only 2014-03-22 06:08:05 -07:00
Dale Stammen b50a158b62 need to terminate variable args list with NULL. nullptr will not work with wp8 compiler 2014-03-22 06:04:36 -07:00
Dale Stammen 2577fc39d8 #pragma mark for ios and mac only 2014-03-22 05:58:37 -07:00
Dale Stammen fb574697aa added support for precompiled shaders in wp8 2014-03-22 05:58:07 -07:00
Dale Stammen 5e402ee433 fix for generic already defined in wp8 2014-03-22 05:56:49 -07:00
Dale Stammen 294341d0ab fixed texture memory leak and added comments to indicate problem 2014-03-22 05:56:08 -07:00
Dale Stammen 65400bf87b added wp8 device orientation. added purge for FontAtlasCache. Disabled console for wp8/winrt until networking code is added 2014-03-22 05:55:08 -07:00
Dale Stammen f6b57df505 added WP8 and WINRT platforms 2014-03-22 05:53:09 -07:00
Dale Stammen 77ab59ebab #pragma mark for ios and mac only 2014-03-22 05:52:45 -07:00
Dale Stammen 409ad77b6c disabled webp for wp8 and winrt 2014-03-22 05:51:39 -07:00
Dale Stammen e3e4e88bce added WP8 and WINRT platforms 2014-03-22 05:50:55 -07:00
Chris Hannon ba37c07053 [add-socketio-jsb] implement fireEventToScript method to integrate JSB event handling with the original native code 
-update static connect method to match JS API, kept original method but marked deprecated

Signed-off-by: Chris Hannon <himynameschris@gmail.com>
 2014-03-21 11:45:14 -04:00
James Chen 87cfbc9773 Merge pull request #5849 from shujunqiao/autotest 
[jenkins] updates autotest.py
 2014-03-21 16:52:58 +08:00
James Chen 1a9826a6cd Update CHANGELOG [ci skip] 2014-03-21 16:52:20 +08:00
James Chen 7e526f1976 Merge pull request #5918 from boyu0/iss4498_refactor_PhysicsDebugDraw 
closed #4498: Refactor PhysicsDebugDraw.
 2014-03-21 16:50:42 +08:00
James Chen 900cce2e81 Update CHANGELOG [ci skip] 2014-03-21 16:50:11 +08:00
James Chen 832ab120aa Merge pull request #5862 from samuele3hu/develop_script_mgr 
closed #4452: Adds `addCustomHandler` in the ScriptHandlerMgr for Console auto test.
 2014-03-21 16:48:53 +08:00
James Chen 81608ba153 Merge pull request #5920 from CocosRobot/update_lua_bindings_1395391030 
[AUTO]: updating luabinding automatically
 2014-03-21 16:40:14 +08:00
CocosRobot 3bd000b236 [AUTO]: updating luabinding automatically 2014-03-21 08:38:19 +00:00
James Chen 526b9d4a0c Update AUTHORS [ci skip] 2014-03-21 16:37:27 +08:00
James Chen 2328694cb1 Update CHANGELOG [ci skip] 2014-03-21 16:35:48 +08:00
James Chen a9a6c0a674 Update AUTHORS [ci skip] 2014-03-21 16:35:01 +08:00
James Chen da0c15c982 Merge pull request #5847 from newnon/develop_small_improvements 
Adds getCurrentLanguageCode() which returns iso 639-1 language code
 2014-03-21 16:33:43 +08:00
boyu0 5edb9b9f86 closed #4499: Read ParticleSystem::_endRadiusVar from "minRadiusVariance" in plist. 2014-03-21 16:25:22 +08:00
cocos2d-html5 2a2ed1ed47 Merge pull request #2 from pandamicro/develop 
Merge cocos2d:develop
 2014-03-21 15:57:48 +08:00
boyu0 41f9760f15 closed #4498: Refactor PhysicsDebugDraw. 2014-03-21 15:49:18 +08:00
James Chen 7c2ff48957 Update CHANGELOG [ci skip] 2014-03-21 15:27:22 +08:00
James Chen c30f466d56 Merge pull request #5915 from boyu0/iss3509_physicsbody_moves_randomly_when_switch_foreground_background 
closed #3509: PhysicsBody moves randomly when switch foreground/background
 2014-03-21 15:25:52 +08:00
pandamicro e59d17ffa7 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop 2014-03-21 15:17:51 +08:00
boyu0 bc13956981 closed #3509: PhysicsBody moves randomly when switch foreground/background. 2014-03-21 15:16:55 +08:00
James Chen d8bbb66864 Merge pull request #5911 from CocosRobot/update_cocosfiles_1395385180 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-03-21 15:16:35 +08:00
James Chen 8ee911adbc Merge pull request #5912 from CocosRobot/update_lua_bindings_1395385232 
[AUTO]: updating luabinding automatically
 2014-03-21 15:16:23 +08:00
James Chen e9d7937431 Merge pull request #5913 from dumganhar/develop 
Remove AccelerometerSimulation.h for cpp template.
 2014-03-21 15:16:00 +08:00
James Chen e89b203b13 Remove AccelerometerSimulation.h for cpp template. 2014-03-21 15:08:53 +08:00
CocosRobot 4721306fef [AUTO]: updating luabinding automatically 2014-03-21 07:01:27 +00:00
CocosRobot 1303985165 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-21 06:59:41 +00:00
James Chen 8f27611539 Merge pull request #5908 from CocosRobot/update_lua_bindings_1395383144 
[AUTO]: updating luabinding automatically
 2014-03-21 14:53:40 +08:00
James Chen cecc00c650 Merge pull request #5893 from Dhilan007/develop_label 
closed #4489: Label: Refactoring relevant functions of setting text color.
 2014-03-21 14:52:55 +08:00
CocosRobot 566c014060 [AUTO]: updating luabinding automatically 2014-03-21 06:26:33 +00:00
James Chen e879e0399d Merge pull request #5904 from lmskater/clean-workspace 
[Jenkins] Clean workspace after build finish
 2014-03-21 14:19:44 +08:00
James Chen 6f767cdb39 Update CHANGELOG [ci skip] 2014-03-21 14:18:20 +08:00
James Chen 6d1d7bca84 Merge pull request #5903 from dumganhar/merge5898 
closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS.
 2014-03-21 14:15:28 +08:00
lm 9598c151ed [Jenkins] Clean workspace after build finish 2014-03-21 13:57:38 +08:00
Dhilan007 1a08cd9b32 fix typo. 2014-03-21 13:52:12 +08:00
James Chen f51c39c034 closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS. 
Thank @pandamicro.
 2014-03-21 13:44:29 +08:00