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

1536 Commits

Author SHA1 Message Date
Martin Konopka 2c80b6ae3a Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] 2015-03-15 00:10:08 +01:00
Martin Konopka cd12d08a52 Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] 2015-03-14 19:33:15 +01:00
Nite Luo cfa1f0c84f Merge pull request #10843 from konopka/fix_compiler_reorder_warnings 
Get rid of compiler warnings: field '_xxx' will be initialized after field '_yyy'...
 2015-03-13 21:12:35 -07:00
Nite Luo 3194da4e7d Merge pull request #10720 from darkdukey/hide_cursor 
Hide cursor
 2015-03-13 10:48:15 -07:00
Huabing.Xu 67fef0eb5e Merge pull request #10856 from super626/v3 
modify dds to png
 2015-03-13 17:00:26 +08:00
songchengjiang 7e5af41817 replace mp_fire_02_2x2.dds with mp_fire_02_2x2.png 2015-03-13 16:34:21 +08:00
Huabing.Xu 639ed335b3 Merge pull request #10839 from pipu/node_load_callback 
To add the function node load callback called during create node from csb file.
 2015-03-13 15:06:14 +08:00
songchengjiang 7026b89b02 fix the bug of moveTo 2015-03-13 11:35:58 +08:00
Martin Konopka 350b81501d Get rid of warnings: field '_xxx' will be initialized after field '_yyy' [-Wreorder] 
Initialization follows the order of declaration, not the order of the initialization list.
 2015-03-12 23:47:58 +01:00
pipu 56c3d1c6f6 To add the function node load callback called during create node from csb file. 2015-03-12 17:36:39 +08:00
Dale Stammen afd0fbab10 added missing /bigobj to c++ compiler command line options 2015-03-09 10:16:42 -07:00
Dale Stammen a828f73ccb updated expiration date of project certificates 2015-03-09 08:31:06 -07:00
yangxiao 8137b01f23 merge cocos 2015-03-06 18:31:57 +08:00
songchengjiang 444dbfdf9e replace .mesh with .c3b 
modify ParticleUniverse file structure
 2015-03-05 14:54:32 +08:00
yangxiao faf299c5a1 make path shorter 2015-03-05 13:24:06 +08:00
Nite Luo 95bd326829 Replace std::to_string 2015-03-04 01:42:24 -08:00
yangxiao 573fdafbd8 android work 2015-03-04 14:25:46 +08:00
andyque 942ceccd99 fix android and win32 compile error 2015-03-04 14:12:11 +08:00
yangxiao 68eaadaffb merge cocos 2015-03-04 09:57:42 +08:00
Nite Luo e23eeafa4d Create test case for show/hide mouse 2015-03-03 14:52:55 -08:00
Dale Stammen e93fe1b13b Merge branch 'v3' into v3-wp8-fix 2015-03-03 08:40:07 -08:00
minggo 13e4525772 Merge pull request #10659 from super626/v3 
Remove expolosion particle
 2015-03-03 23:03:02 +08:00
yangxiao 36723fcb68 reset submodule 2015-03-03 18:34:51 +08:00
yangxiao 901cfd627b Merge branch 'particle_merge' of https://github.com/super626/cocos2d-x into particle_merge 2015-03-03 17:59:25 +08:00
songchengjiang d25c025cbe replace star.pu with lineStreak.pu 2015-03-03 17:53:19 +08:00
yangxiao 9e06a4b848 Merge branch 'particle_merge' of https://github.com/super626/cocos2d-x into particle_merge 2015-03-03 17:47:22 +08:00
yangxiao 3db3d9ae11 merge cocos 2015-03-03 17:23:33 +08:00
songchengjiang 9bdcdec60a add test demo 
use particleSystemScaleVelocity
 2015-03-03 15:10:42 +08:00
songchengjiang a9eb4dc7f9 support read material files on linux 
modify the name of getAliveParticleCnt function
 2015-03-02 16:28:38 +08:00
songchengjiang a71aed6cc8 mix particle with sprite3D 2015-03-02 13:51:43 +08:00
songchengjiang 5c460ebb2d add/update particle files 2015-03-02 13:07:32 +08:00
yangxiao 924a3cdff0 create particle with pu and material 2015-02-28 14:26:33 +08:00
yangxiao d5bde9e536 add missing material 2015-02-28 12:57:15 +08:00
yangxiao 218de84cc5 remove expolosion particle 2015-02-28 11:31:15 +08:00
Dale Stammen fb25ce9d1b disabled LTCG to speed up release builds 2015-02-27 11:10:33 -08:00
Dale Stammen f68a966485 disabled Check SDL to allow CC_DEPRECATED to work as warning and not error 2015-02-27 11:07:51 -08:00
Dale Stammen b5e936c657 disabled LTCG to speed up release builds 2015-02-27 10:43:13 -08:00
Dale Stammen 5e6865ce53 added missing CC_PLATFORM_WINRT 2015-02-27 10:38:18 -08:00
Dale Stammen 2eb919bb7a disabled Check SDL to allow CC_DEPRECATED to work as warning and not error 2015-02-27 10:36:48 -08:00
minggo b973d08b6e Merge pull request #10608 from super626/v3 
Add project function to camera and fix cocos ui bug
 2015-02-27 11:47:55 +08:00
yangxiao 437a59fb9a modify project & unproject api 2015-02-27 10:01:57 +08:00
minggo 95a9e7de04 Merge pull request #10539 from krishnanm86/knarasimhan_sourcerefactor_branch 
Source refactor. Abstracted common functionalities from 4 onTouches meth...
 2015-02-26 20:35:15 +08:00
yangxiao f13237c013 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-02-26 17:27:42 +08:00
yangxiao 9a64eb18dd add project function 2015-02-26 15:20:20 +08:00
Krishna 2018943d6d Removed template argument from ontouchescommon 2015-02-26 07:05:44 +01:00
Nite Luo dbba9e36a1 Merge pull request #10431 from vovkasm/dev/fix-win32-resource-search-path 
Fix win32 resource search path to be relative to the executable.
 2015-02-25 20:24:07 -08:00
Ray 0f8f0322c8 fix ccs-res 2015-02-26 10:10:32 +08:00
Ray 83a7b8012c 3DParticle Reader and tests 2015-02-26 09:19:14 +08:00
Krishna 75d5e26340 Bug Fix. INcluding the required template type for the function declaration 2015-02-25 12:19:19 +01:00
Krishna 2d80518873 Introduced function declarators that were missing 2015-02-25 10:23:35 +01:00