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

2659 Commits

Author SHA1 Message Date
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
dumganhar faed6b5770 modify post.sh for creating lib folder 
add build-linux.sh file
 2011-09-20 15:41:25 +08:00
ciaranj 0296027335 Supplying README file 2011-09-20 08:03:52 +01:00
ciaranj 209214008e Adding in Particle Systems to Lua Bindings (inc. the example systems.) 2011-09-20 07:58:04 +01:00
dumganhar eeb0956fb8 add linux makefiles 2011-09-20 14:38:12 +08:00
minggo 762e342b4d fixed #727: invoke DeleteLocalRef() to resolve memory leak 2011-09-20 14:25:16 +08:00
minggo 3e93a49b3c Merge pull request #511 from ciaranj/fix_tolua_bindings 
Fix tolua bindings
 2011-09-19 23:18:54 -07:00
dumganhar c93be8b828 modify <cstdio> to <stdio.h> 
delete old project files
 2011-09-20 12:39:44 +08:00
dumganhar 8cb568f7fa add some files for bada test project 2011-09-20 12:38:05 +08:00
dumganhar cac08c8f1e add tests project for bada 2011-09-20 10:29:07 +08:00
ciaranj 2662af753a Initial example working version of a lua project generator 2011-09-19 23:42:22 +01:00
dumganhar eb32cf9fe2 modify some files of bada project 2011-09-20 02:19:26 +08:00
dumganhar 81243eecdf modify libpng version to 1.4.5 
modify libjpeg txt mode to windows \r\n style
 2011-09-20 02:17:44 +08:00
dumganhar 8ad2125139 add source code of libjpeg ,libpng ,zlib for bada 2011-09-20 02:16:20 +08:00
dumganhar ca2027fbad modify bada project 2011-09-19 23:35:46 +08:00
dumganhar 54475335fb delete old bada project -- box2d and chipmunk 2011-09-19 23:35:05 +08:00
dumganhar 3bb956689b add chipmunk project for bada 2011-09-19 23:20:58 +08:00
dumganhar d96e00668b modify setting of box2d in bada project 2011-09-19 23:19:39 +08:00
dumganhar bd10463980 add box2d project files for bada 2011-09-19 23:09:07 +08:00
dumganhar edb2cbbad6 modify bada project files 2011-09-19 18:17:19 +08:00
minggo 5ff9bd0c9e remame BitMapTotalHeight to bitmapTotalHeight 2011-09-19 18:15:47 +08:00
minggo 371d4e646a Merge pull request #514 from linshun/iss724 
fixed #724, different results of CCLabelTTF on android & win32
 2011-09-19 03:13:56 -07:00
dumganhar 0e7fc78e4e commit some files of bada project 2011-09-19 18:05:40 +08:00
dumganhar c94adc58b9 changed bada projects directory, add bada macro 2011-09-19 17:53:45 +08:00
seanlin 6d8225b7bd fixed #724, different results of CCLabelTTF on android & win32 2011-09-19 16:47:39 +08:00
ciaranj d91c728a52 Updating README file as requested 2011-09-19 07:47:17 +01:00
minggo ed92de6a7c Merge pull request #513 from dumganhar/linux_port 
Linux port
 2011-09-18 23:01:54 -07:00
dumganhar 3c795073e0 Merge branch 'master' into bada 
Conflicts:
	HelloWorld/iphone/HelloWorld.xcodeproj/project.pbxproj
	cocos2dx/CCamera.cpp
	cocos2dx/cocoa/NSData.cpp
	cocos2dx/label_nodes/CCBitmapFontAtlas.cpp
	cocos2dx/platform/CCFileUtils_platform.h
	cocos2dx/platform/CCXApplication_platform.h
	cocos2dx/platform/CCXCocos2dDefine_platform.h
	cocos2dx/platform/CCXEGLView_platform.h
	cocos2dx/platform/CCXMath.h
	cocos2dx/platform/CCXUIAccelerometer_platform.h
	cocos2dx/platform/CCXUIImage_platform.h
	cocos2dx/platform/ccxCommon_platform.h
	cocos2dx/platform/config_platform.h
	cocos2dx/platform/platform.h
	cocos2dx/support/base64.cpp
	cocos2dx/tileMap_parallax_nodes/CCTMXXMLParser.cpp
	tests/AppDelegate.cpp
	tests/test.iphone/test.iphone.xcodeproj/project.pbxproj
 2011-09-19 13:42:08 +08:00
dumganhar 8bc54e0b64 remove lib/android/Debug/*.so 
remove lib/android/Release/*.so
 2011-09-19 11:03:30 +08:00
dumganhar eadaba8930 modify CCRect::CCRectMake to CCRectMake in CCTMXLayer.cpp 
modify HelloWorld project setting, use relative path
remove lib/linux/Debug/*.so and lib/linux/Release/*.so
remove some temp files
 2011-09-19 10:51:05 +08:00
ciaranj 11f03e9c8c Adding a build file that correctly generates LuaCocos2d.cpp 2011-09-18 18:29:17 +01:00
ciaranj 75edaccac9 Updating AccelerometerDelegate related classes 
The checked in .pkg files seemed to be generating lua-bindings for
cocos2d methods that don't exist.  This seems strange, so have fixed it
for now.
 2011-09-18 18:18:02 +01:00
minggo c24d1d3fd6 Merge branch 'LinuxPort' of https://github.com/laschweinski/cocos2d-x into linux_port 2011-09-16 13:53:18 +08:00
laschweinski a4bfa976b3 change the base resource path 2011-09-16 10:23:57 +08:00
laschweinski b9ce266ee3 the same as the last one 2011-09-15 18:25:06 +08:00
laschweinski d016f05f92 use relative path instead of the workspace_loc 2011-09-15 18:24:41 +08:00
minggo 55ab2aa708 Merge pull request #509 from minggo/iss719 
fixed #719: update java code to HelloLua & tests
 2011-09-15 01:24:51 -07:00
minggo ae403153c7 fixed #719: update java code to HelloLua & tests 2011-09-15 16:18:50 +08:00
minggo 4c51914cfc Merge pull request #508 from minggo/iss718 
get button value from string.xml & add copyright for java cod
 2011-09-14 23:27:54 -07:00
minggo a70995c220 fixed #717: add R.java of HelloLua 2011-09-15 14:23:18 +08:00
minggo 194f47bc54 fixed #718: get button value from string.xml & add copyright for java codes 2011-09-15 14:17:07 +08:00
minggo ea0455a0ba Merge pull request #507 from minggo/iss718 
fixed #718: fixed a typo error
 2011-09-14 23:11:14 -07:00
minggo 61f2ab3cf2 fixed #718: fixed a typo error 2011-09-15 13:49:04 +08:00
minggo aa6bfa3fdc Merge pull request #506 from Macarse/linearLayoutIssue 
Replaced LinearLayout with FrameLayout
 2011-09-14 19:41:32 -07:00
Macarse 208bce312e Replaced LinearLayout with FrameLayout 2011-09-13 20:25:07 -03:00