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
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
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
ciaranj
2662af753a
Initial example working version of a lua project generator
2011-09-19 23:42:22 +01: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
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
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