Ricardo Quesada
|
25213c81f6
|
linux cmake improvements
Added cocos/CMakeLists.txt
which controls all the rest of the Cmake files
|
2014-05-01 13:01:51 -07:00 |
Ricardo Quesada
|
94b3fa50f6
|
Merge pull request #6538 from ricardoquesada/tmx_fixed
fixes tmx maps
|
2014-05-01 11:51:44 -07:00 |
Ricardo Quesada
|
1cfd133555
|
fixes tmx maps
|
2014-05-01 11:51:11 -07:00 |
James Chen
|
19c1dcb1da
|
Merge pull request #6534 from CocosRobot/update_lua_bindings_1398911075
[AUTO]: updating luabinding automatically
|
2014-05-01 12:36:29 +08:00 |
CocosRobot
|
7cb5f4c418
|
[AUTO]: updating luabinding automatically
|
2014-05-01 02:25:38 +00:00 |
Ricardo Quesada
|
096d479a7a
|
Merge pull request #6533 from ricardoquesada/fixes_builder
Fixes builder
|
2014-04-30 19:21:52 -07:00 |
Ricardo Quesada
|
9bd6ace582
|
compiles on iOS
|
2014-04-30 19:21:10 -07:00 |
Ricardo Quesada
|
b8eba4e1c1
|
oops
|
2014-04-30 19:13:58 -07:00 |
Ricardo Quesada
|
7b2e558bb0
|
Merge pull request #6531 from ricardoquesada/fix_builder_squash
Fixes linux build
|
2014-04-30 19:10:12 -07:00 |
Ricardo Quesada
|
40fe815ab9
|
Squashed commit of the following:
commit c16dcfaaea0922039aad05bce1f4efed18e04871
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:05:18 2014 -0700
more linux fixes
commit 1553795976c9090a1b46deb53d12910fe0676008
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:04:04 2014 -0700
more linux fixes
commit 1e43a8cabff33cbf25aa5eb5412f53a878222d83
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:02:07 2014 -0700
fixes linux isuses
commit 723a445dd6411f91846da2b801248ad8298174f1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:58:50 2014 -0700
more linux fixes
commit 533c8025e794fc76cef02f396b3a93b3d7f4cfc8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:57:33 2014 -0700
more linux fixes
commit 4ba1e84959670bcbf044f18d1c0d4b3cb3be4090
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:53:43 2014 -0700
more linux fixes
commit 1f8e011f306a47ed4134224e5e349929201f0539
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:49:28 2014 -0700
more linux fixes
commit 3e2033100822ff6d532a1b4f012337491dc11920
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:47:43 2014 -0700
more linux fixes
commit 2e708863c75fd032f1b2396dfdf1d31f7a62b713
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:46:00 2014 -0700
more linux fixes
commit 861b5b92a6efd4de7b926c20d636ce9d749b293f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:43:15 2014 -0700
more linux fixes
commit 2a43365a0c1755e9b9cada53301be1a20adb31cf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:36:06 2014 -0700
more fixes for linux
commit 7d332bf911892f87c7824d2a5da7bf73ce7ec411
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:35:29 2014 -0700
more fixes for linux
commit f1becc17d3316dfe3678c23c9dcedb7a447d9235
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:34:44 2014 -0700
more fixes for linux
commit d2e5959bb0dde921dd5e73be1d8acc3b3f50e51d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:33:45 2014 -0700
fixes for linux
commit ad9b633c352107cf0e8b060a0e23d6e6a3f5e80f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:16:48 2014 -0700
compiles on Windows
commit 4425ee8e5de8f42a2d6050e4470109600dce8b5d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:07:20 2014 -0700
fix builder
|
2014-04-30 19:09:13 -07:00 |
James Chen
|
35505aa63f
|
Merge pull request #6528 from CocosRobot/update_lua_bindings_1398905829
[AUTO]: updating luabinding automatically
|
2014-05-01 09:33:33 +08:00 |
James Chen
|
25e15b6fec
|
Merge pull request #6526 from CocosRobot/update_cocosfiles_1398905726
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-01 09:32:46 +08:00 |
CocosRobot
|
94e01a2e81
|
[AUTO]: updating luabinding automatically
|
2014-05-01 00:58:35 +00:00 |
Ricardo Quesada
|
0bf58d4a2e
|
Merge pull request #6527 from ricardoquesada/properties
you should be 10
|
2014-04-30 17:56:39 -07:00 |
Ricardo Quesada
|
598bb91133
|
you should be 10
|
2014-04-30 17:56:14 -07:00 |
CocosRobot
|
2247086111
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-01 00:55:27 +00:00 |
Ricardo Quesada
|
8b1c5769b7
|
Merge pull request #6517 from ricardoquesada/improved_directory_structure
Improved directory structure
|
2014-04-30 17:53:52 -07:00 |
Ricardo Quesada
|
53b293e85f
|
Merge branch 'v3' into improved_directory_structure
|
2014-04-30 17:52:52 -07:00 |
Ricardo Quesada
|
164abdbbe1
|
Merge pull request #6525 from ricardoquesada/compiles_win
Compiles on Windows
|
2014-04-30 17:46:04 -07:00 |
Ricardo Quesada
|
98f26b4987
|
Compiles on Windows
|
2014-04-30 17:44:41 -07:00 |
Ricardo Quesada
|
1caca8670f
|
project.properties in .gitignore
|
2014-04-30 13:19:39 -07:00 |
Ricardo Quesada
|
c590bbe547
|
target is android-10
|
2014-04-30 13:18:57 -07:00 |
Ricardo Quesada
|
23ece1a91d
|
restores project.properties to 10
|
2014-04-30 13:16:50 -07:00 |
Ricardo Quesada
|
b5f513ce16
|
Merge branch 'v3' into improved_directory_structure
|
2014-04-30 13:15:10 -07:00 |
Ricardo Quesada
|
b549e6b4f9
|
Merge pull request #6524 from dabingnn/v3_refactor_inverse_conjugate_etc
V3 refactor inverse conjugate etc
|
2014-04-30 13:14:12 -07:00 |
Ricardo Quesada
|
528cdf461c
|
Merge pull request #6523 from dabingnn/v3_refactor_normalize
V3 refactor normalize
|
2014-04-30 12:58:04 -07:00 |
Huabing.Xu
|
183dd1ec64
|
inverse and conjugate, negate for matrix
|
2014-05-01 01:59:36 +08:00 |
Huabing.Xu
|
8fe4c472fd
|
inverse and conjugate for quaternion
|
2014-05-01 01:32:16 +08:00 |
Huabing.Xu
|
16105df503
|
getNormalize->getNormalized
|
2014-05-01 01:10:18 +08:00 |
Huabing.Xu
|
c722b74e36
|
Merge branch 'v3' into v3_refactor_normalize
|
2014-04-30 20:08:37 +08:00 |
Huabing.Xu
|
84515b521d
|
refactor normalize in Quaternion
|
2014-04-30 20:06:49 +08:00 |
Huabing.Xu
|
441279c7ab
|
refactor normalize in Vector4
|
2014-04-30 19:59:06 +08:00 |
Huabing.Xu
|
3ccb6dcbed
|
refactor normalize in Vector3
|
2014-04-30 19:50:36 +08:00 |
Huabing.Xu
|
7bc9b96d1a
|
remove some cumbersome struct keyword
|
2014-04-30 18:37:30 +08:00 |
Huabing.Xu
|
ea4fee2c31
|
refactor normalize in Vector2
|
2014-04-30 18:07:05 +08:00 |
minggo
|
2cbbaed5b3
|
Merge pull request #6512 from dabingnn/v3_renderTextureBug
V3 render texture bug
|
2014-04-30 17:52:14 +08:00 |
minggo
|
e4e3773d2d
|
[ci skip]
|
2014-04-30 17:14:04 +08:00 |
minggo
|
0dff539a18
|
Merge pull request #6521 from boyu0/particle_yCoordFlipped_bug
Fix ParticleSystem yCoordFlipped bug.
|
2014-04-30 17:03:01 +08:00 |
James Chen
|
03d10e8926
|
Merge pull request #6520 from boyu0/set_value_asbool_return_false_default
Change Value::asBool() return false by default.
|
2014-04-30 16:43:52 +08:00 |
boyu0
|
489adaf315
|
fix indent
|
2014-04-30 16:33:35 +08:00 |
minggo
|
1c6c099a83
|
Merge pull request #6519 from natural-law/v3
Fix the error in cocos2d-console when rename files on windows.
|
2014-04-30 16:27:53 +08:00 |
boyu0
|
c1d60f4b33
|
Fix ParticleSystem yCoordFlipped bug.
|
2014-04-30 16:18:39 +08:00 |
boyu0
|
0699aa94fe
|
Change Value::asBool() return false by default.
|
2014-04-30 15:07:26 +08:00 |
zhangbin
|
64f30980b4
|
closed #4990, Fix the error in cocos2d-console when rename files on windows.
|
2014-04-30 11:25:47 +08:00 |
minggo
|
8283ab9435
|
Merge pull request #6518 from super626/newmath
wrong rotation
|
2014-04-30 09:44:10 +08:00 |
yangxiao
|
11dc9367ff
|
wrong rotation
|
2014-04-29 18:19:30 -07:00 |
yangxiao
|
3237d7b23d
|
Revert "wrong rotation"
This reverts commit 3c9560017e .
|
2014-04-29 18:14:41 -07:00 |
Ricardo Quesada
|
1954edc655
|
Adds Apache2 license to GamePlay3d files
|
2014-04-29 17:50:12 -07:00 |
Ricardo Quesada
|
8bb8416c26
|
Improved directory structure
|
2014-04-29 17:37:36 -07:00 |
yangxiao
|
3c9560017e
|
wrong rotation
|
2014-04-29 17:27:32 -07:00 |