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

15543 Commits

Author SHA1 Message Date
Ricardo Quesada 226054e810 Merge pull request #5067 from ricardoquesada/compile_error_fix 
ooops
 2014-01-14 18:55:34 -08:00
Ricardo Quesada f0537f17da ooops 2014-01-14 18:55:14 -08:00
James Chen f1672ad120 Merge pull request #5066 from CocosRobot/updategeneratedsubmodule_1389753556 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-14 18:51:16 -08:00
CocosRobot 3b208337fe [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-15 02:39:20 +00:00
Ricardo Quesada cc2adad9ab Merge pull request #5065 from ricardoquesada/develop 
Ignore getFullPathCache() in FileUtils
 2014-01-14 18:31:55 -08:00
Ricardo Quesada b3f306e742 Ignore getFullPathCache() in FileUtils 2014-01-14 18:30:51 -08:00
Ricardo Quesada 71fccd5c78 Merge pull request #5064 from CocosRobot/updategeneratedsubmodule_1389749831 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-14 17:40:48 -08:00
CocosRobot 82797d8434 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-15 01:37:15 +00:00
Ricardo Quesada 2efeb32352 Merge pull request #5063 from ricardoquesada/performance_test_fixes 
Performance Test fixes
 2014-01-14 17:24:49 -08:00
Ricardo Quesada c267c479db Performance Test fixes 
* SpritePerfTest: 3 new tests added
* SpritePerfTest: random() always use the same seed
* SpritePerfTest: Fixed tests 8 and 9 on retina display machines
* Console: Added 3 new commands: 'config', 'fileutils dump', 'textures'
 2014-01-14 17:22:45 -08:00
Ricardo Quesada 8554eaa46c Merge pull request #5062 from darkdukey/fixVBOFull 
Fix vbo full
 2014-01-14 17:13:04 -08:00
Nite Luo fd04e17808 add a new line 2014-01-14 17:11:32 -08:00
Nite Luo edc7547f70 add test instructions 2014-01-14 17:06:22 -08:00
Nite Luo 5f661babd2 Add VBO full test 2014-01-14 17:03:54 -08:00
Nite Luo a18788ff0a Fix artifects when VBO is full 2014-01-14 16:45:40 -08:00
James Chen 428afae8e9 Update CHANGELOG [ci skip] 2014-01-14 21:52:04 +08:00
James Chen d306d5fe58 Update AUTHORS [ci skip] 2014-01-14 21:51:13 +08:00
James Chen b9dfad3df3 Merge pull request #5039 from martell/win64 
closed #3700: Added x64 support for Windows - CCExtensions
 2014-01-14 05:49:42 -08:00
James Chen cd1c408e6b Merge pull request #5054 from dumganhar/iss3698-retina-mac 
closed #3698: Wrong display when dragging window through retina and non-retina screen.
 2014-01-13 23:02:49 -08:00
James Chen 11d290ab13 Update AUTHORS [ci skip] 2014-01-14 14:54:19 +08:00
James Chen 815cea3d7b Merge pull request #5044 from Pisces000221/patch-1 
Corrected a few mistakes in project-creator README
 2014-01-13 22:52:34 -08:00
James Chen 8993289f07 Merge pull request #5053 from Dhilan007/develop_crash 
fix compiling error cause by clash with the existing macro definition on window platform.
 2014-01-13 22:45:49 -08:00
James Chen 7e1fd18f76 FLT_MIN —> FTL_EPSILON. 2014-01-14 14:38:34 +08:00
Dhilan007 92d345156b un-define clash with the existing macro definition in platform/win32/CCStdC.h 2014-01-14 14:20:22 +08:00
James Chen 83a42dc760 closed #3698: Wrong display when dragging window through retina and non-retina screen. 2014-01-14 13:59:00 +08:00
Dhilan007 a1d8e8bdb1 fix compiling error cause by macro define on window platform. 2014-01-14 12:28:24 +08:00
Ricardo Quesada 38b8299ad2 Merge pull request #5052 from CocosRobot/updategeneratedsubmodule_1389654457 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-13 15:34:01 -08:00
CocosRobot c49aa1f125 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-13 23:07:44 +00:00
Ricardo Quesada 1bd4f75fa3 Merge pull request #5051 from ricardoquesada/copyright 
Adds missing copyright headers in some files
 2014-01-13 14:48:45 -08:00
Ricardo Quesada 6eed3a2b27 Adds missing copyright headers in some files 2014-01-13 14:48:12 -08:00
Ricardo Quesada a94a68771c Merge pull request #5049 from ricardoquesada/node_camera_fixes 
Camera and Node fixes
 2014-01-13 12:54:33 -08:00
Ricardo Quesada f2c3d2f3ae Camera and Node fixes 
OrbitCamera: added getters (public). Setters moved from `protected` to `public
	: Improved API. Instead of using "out" parameters for getters, it returns a `kmVec3`
 	: Setters receives `kmVec3` as well. Old API is still supported

Node: `setAdditionalTransform` doesn't get `dirty` on the next frame.
	Instead, once the additional transform is set, in order to remove it the user needs to pass
	the identity matrix
 2014-01-13 12:52:07 -08:00
Ricardo Quesada be39eee5ea Merge pull request #5048 from darkdukey/improveProjectCreator 
Improve project creator
 2014-01-13 12:00:24 -08:00
Nite Luo 37522c61c3 Make the ui look a bit better 2014-01-13 11:54:33 -08:00
Nite Luo 2e127f819b Add Polish the labels for project creator ui 2014-01-13 11:37:44 -08:00
BoydTang 565288f587 - fix long string will be cut off by function “cc_utf8_to_utf16” ( “cc_utf8_strlen” returns long ) 2014-01-13 22:54:26 +08:00
Dhilan007 fd481d64a0 1.update lua binding configuration for label. 
2.recover old method[createWithTTF]
 2014-01-13 16:32:35 +08:00
James Chen cc55be4f1a Merge pull request #5045 from Dhilan007/develop_crash 
closed #3676: fix compiling error when CC_ENABLE_CHIPMUNK_INTEGRATION and CC_ENABLE_BOX2D_INTEGRATION are zero.
 2014-01-12 23:36:25 -08:00
Dhilan007 d7593fd0f0 fix wrong judgments of conditional compilation. 2014-01-13 11:24:49 +08:00
Dhilan007 fd11791389 add a blank line at the file end. 2014-01-13 10:37:31 +08:00
Dhilan007 34a79a02e7 fix compiling error when CC_ENABLE_CHIPMUNK_INTEGRATION and CC_ENABLE_BOX2D_INTEGRATION are zero. 2014-01-13 10:32:34 +08:00
James Chen 831e8e60b0 Merge pull request #5042 from Dhilan007/develop_crash 
fix compiling error on win after adding `fd_set` in CCConsole.h.
 2014-01-12 18:14:37 -08:00
James Chen 5dedd085c8 Merge pull request #5032 from heliclei/develop 
rename ghprb.py to pull-request-builder.py
 2014-01-12 17:43:40 -08:00
Pisces000221 09f23c1bcb Corrected a few mistakes in project-creator README 2014-01-12 14:38:09 +08:00
Dhilan007 d11bfeb8d4 fix compiling error on win 2014-01-12 11:02:48 +08:00
Dhilan007 b2038d14d6 update lua binding configuration for label. 2014-01-11 22:55:23 +08:00
Dhilan007 69c004108b issue#3630:Adjust some method for more easily create and change type. 2014-01-11 22:33:07 +08:00
martell 23cf748534 Added x64 support for Windows - CCExtensions 2014-01-11 12:31:04 +00:00
Ricardo Quesada 71ad9d7dd4 Merge pull request #5038 from CocosRobot/updategeneratedsubmodule_1389415140 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-10 20:39:23 -08:00
CocosRobot b10783972f [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-11 04:39:03 +00:00