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

2587 Commits

Author SHA1 Message Date
YuLei Liao 1c18a114b1 + add tolua build config for macosx 2011-10-01 22:42:25 +08:00
minggo 7e4efc7f73 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-09-29 02:15:04 -07:00
minggo 6d358cfad7 make linux template work ok 2011-09-29 02:14:17 -07:00
minggo 33c7caf555 Merge pull request #535 from minggo/master 
fixed a assert error
 2011-09-29 01:13:49 -07:00
minggo a56034f177 fixed a assert error 2011-09-29 16:07:18 +08:00
minggo 333e08330b make create-linux-android-project.sh works ok 2011-09-29 00:49:49 -07:00
minggo a6b42c3aa5 Merge pull request #534 from minggo/master 
Do some fixes
 2011-09-28 02:38:25 -07:00
minggo fe5eeb70d5 add files from HelloWorld/Classes 2011-09-28 17:31:50 +08:00
minggo 464fd19e59 avoid memory leak for lua and invoke unscheduleScriptFunc 2011-09-28 17:27:43 +08:00
minggo 879b987f19 Merge pull request #533 from minggo/iss717 
modify some proj setting
 2011-09-28 01:52:33 -07:00
minggo dcf803f032 modify proj setting because all cpp files of HelloWorld are moved into Classes 2011-09-28 16:46:53 +08:00
minggo 7ab3a08f36 Merge pull request #532 from minggo/iss717 
Iss717
 2011-09-28 00:37:59 -07:00
minggo 8c63344c16 merge cocos2d-x master 2011-09-28 15:32:30 +08:00
minggo 3912be7f9d not get value of ok button from xml file 2011-09-28 15:27:31 +08:00
minggo 82af2051e0 add ciaranj into AUTHORS 2011-09-28 14:55:42 +08:00
minggo 4166d87869 Merge pull request #529 from ciaranj/lua_gc_additions 
Adding some lua_gc calls post script load-ins
 2011-09-27 23:36:32 -07:00
minggo 14d784c4f6 Merge pull request #530 from minggo/iss723 
fixed #723: remove unneeded files
 2011-09-27 23:36:01 -07:00
minggo 3859b7c39d fixed #723: remove unneeded files 2011-09-28 14:30:33 +08:00
minggo 446bd86fce make HelloWorld and tests runs ok on linux 2011-09-27 22:56:06 -07:00
minggo 4b02dc3e45 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-09-27 20:37:58 -07:00
minggo 4ad422defd make tests run ok on linux android 2011-09-27 20:36:21 -07:00
minggo da8a409d61 Merge pull request #528 from ciaranj/more_particle_systems_in_lua 
Add support for particleWithFile for both Quad & Point Particle Systems
 2011-09-27 18:22:07 -07:00
ciaranj 1aae893ad2 Adding some lua_gc calls post script load-ins 2011-09-27 23:23:43 +01:00
ciaranj d1f031d2de Add support for particleWithFile for both Quad & Point Particle Systems 2011-09-27 23:15:54 +01:00
minggo 7b423eb708 remove unneened link 2011-09-27 17:51:13 +08:00
minggo d4283b1f11 Merge branch 'linux_port' 2011-09-27 17:01:51 +08:00
minggo 254d93e02c Merge pull request #527 from minggo/iss736 
fixed #736: remove android:installLocation in AndroidManifest.xml
 2011-09-27 02:02:55 -07:00
minggo f3a85ae3cb remove unneeded folder 2011-09-27 17:01:12 +08:00
minggo 6e08502e9d fixed #736: remove android:installLocation in AndroidManifest.xml 2011-09-27 16:56:45 +08:00
minggo 13e17ab80e make tests build ok on linux android 2011-09-27 01:51:29 -07:00
minggo c7f75fc570 make box2d build ok on linux 2011-09-26 23:30:40 -07:00
minggo 4f7e349c0a set HelloWorld dependence and make it run ok on android emulator 2011-09-26 22:38:59 -07:00
minggo 92705a6674 rename HelloWorld/android/src/org/cocos2dx/application/ApplicationDemo.java 2011-09-27 11:43:23 +08:00
minggo a8bafaa31a Merge pull request #524 from laschweinski/linux_port1 
Linux port1
 2011-09-22 22:36:16 -07:00
laschweinski 88905c4a16 add box2d and chipmunk eclipse project 
do the similar modification in project configuration in test.
 2011-09-23 12:07:09 +08:00
minggo 41c24c2609 Merge pull request #521 from moadib/application_background_entering_testing_ability 
fixed #735:Added testing ability for case when application enters background and ret
 2011-09-22 19:27:23 -07:00
laschweinski 16b58b036c forget some files 2011-09-23 10:13:53 +08:00
laschweinski 0f7a15b1b3 recommit 
modify eclipse project config
delete libs and use the folder eclipse generated instead.
 2011-09-23 09:56:30 +08:00
moadib 267cce29a9 Added testing ability for case when application enters background and returns in foreground on windows platform. 
When application minimized applicationDidEnterBackground() called, when restored applicationWillEnterForeground().

Also break; forgotten in WM_KEYDOWN.
 2011-09-22 13:11:51 +04:00
minggo f0c744e5fd Merge pull request #520 from moadib/keypad_testing_ability_for_win32 
Added keypad testing ability for windows platform
 2011-09-22 00:38:57 -07:00
moadib 0ad5ec3557 fixed typo for win32 keypad testing ability 2011-09-22 10:27:10 +04:00
moadib 5537ba7e9e Added keypad testing ability for windows platform. Shift+F1 emulated Back key pressing, and Shift+F2 emulated Menu key pressing 2011-09-21 16:21:11 +04:00
zhangxiaoming 1cac9520cc make HelloWorld & tests build needed libraries, not use prebuilt libraries of cocos2d and cocosdenshion 2011-09-21 02:27:42 -07:00
minggo 7a930275c6 Merge pull request #519 from dumganhar/linux_port 
Linux port
 2011-09-20 18:38:20 -07:00
dumganhar eb9b3e3787 modify makefile 2011-09-20 18:13:24 +08:00
dumganhar 6b2ff4605f add box2d and chipmunk makefile project for linux 
delete some files
 2011-09-20 17:01:08 +08:00
minggo a778019153 Merge pull request #516 from minggo/iss727 
fixed #727: invoke DeleteLocalRef() to resolve memory leak
 2011-09-20 01:50:27 -07:00
minggo 8f1208368b Merge pull request #515 from ciaranj/lua_project_generator 
Initial example working version of a lua project generator
 2011-09-20 01:50:12 -07:00
dumganhar d9c36f8876 delete CMakeFiles folder 
delete Box2D folder
 2011-09-20 16:25:01 +08:00
minggo e42a4aa456 Merge pull request #517 from ciaranj/sorting_out_particles 
Adding in Particle Systems to Lua Bindings (inc. the example systems.)
 2011-09-20 00:45:11 -07:00