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

62 Commits

Author SHA1 Message Date
Dale Stammen 351a898a70 removed CC_PLATFORM_WP8 2015-05-08 09:19:13 -07:00
Ricardo Quesada 51374eb822 tests compiles on xcode 6.3 
no more USING_NS in the header files.
it creates conflict with xcode 6.3
 2015-04-08 17:37:30 -07:00
WenhaiLin 0d51c13743 Make all test cases work fine with new test framework. 2015-04-03 14:31:03 +08:00
lvlong 9e3ae9bfb5 remove get window size. 2015-03-19 15:24:58 +08:00
lvlong 7f18c9809c fix :camera-culling MoveTo 2015-03-19 15:02:38 +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
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
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
Krishna Narasimhan 36be1ec24b Source refactor. Abstracted common functionalities from 4 onTouches methods in Camera3dTest 2015-02-21 11:39:26 +01:00
kompjoefriek a2ef1abef3 Fixed unwanted changes 2015-02-12 23:07:24 +01:00
Jacky ecefc53c0d fixed Camera3dTest restart bug. 2015-02-05 14:16:31 +08:00
Nite Luo 8f539a0107 Make PositionZ independent from global Z 2015-01-27 15:41:58 -08:00
Nite Luo 55b2504bfd Merge branch 'v3' into billboardTest 2015-01-26 10:53:17 -08:00
minggo 335f69d95d Merge pull request #10110 from super626/v3 
Fix Animate3D speed bug and add parameter to Ray::intersects
 2015-01-21 14:11:11 +08:00
Nite Luo 414115690e Create rotation test case for billboard 2015-01-16 00:04:26 -08:00
Nite Luo 4a440e66c9 Refactor draw command 2015-01-15 14:00:49 -08:00
songmiao 147506f662 change camera position 2015-01-15 15:53:19 +08:00
WenhaiLin 13b049a543 Fixed warns:truncation from double to float 2015-01-15 10:07:23 +08:00
minggo 1fa0fb584b Merge pull request #10004 from MSOpenTech/wp8-fix 
WP8/WinRT fixes
 2015-01-15 09:33:38 +08:00
Nite Luo 15660926d9 Fix Sprite3D not cascading 3D flag 2015-01-14 16:23:35 -08:00
Dale Stammen 32c14710e7 allow custom shaders for WinRT Universal App 2015-01-14 10:37:04 -08:00
yangxiao 42c40d895f enable disable culling using macro 2015-01-14 14:41:10 +08:00
Dale Stammen a2a257133a enabled fogtestdemo for winrt universal apps 2015-01-13 14:32:30 -08:00
Nite Luo 1c10ae43bc Merge branch 'v3' into renderFix 
Conflicts:
	tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp
	tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h
 2015-01-12 20:43:55 -08:00
Nite Luo a84f521e64 Clean up the debug functions in Billboard 2015-01-12 20:17:00 -08:00
Nite Luo 8591609128 Implement 3D drawing support for Sprite, Label, Particle, BatchNode 2015-01-12 20:06:50 -08:00
Nite Luo 7741daf091 Billboard Render correctly 2015-01-11 22:20:41 -08:00
Nite Luo 6dfc021c02 Merge renderqueue to one 2015-01-09 14:06:21 -08:00
songmiao 9de5371202 fix bug and add notes 2015-01-09 10:23:40 +08:00
Nite Luo e7480a7efb Enable tansparent queue and create camera rotation demo 2015-01-08 16:30:00 -08:00
songmiao 71820e6db1 add notes, deal with opengl shader in windows device, fix bug 2015-01-08 15:16:47 +08:00
songmiao dfa6137ce9 modify arcball and fog shader 2015-01-07 17:58:10 +08:00
songmiao d1845f89fe add fog test and arcball camera test 2015-01-07 11:47:34 +08:00
lvlong fdb498a8d2 camera test 2014-12-26 13:37:02 +08:00
lvlong db9f4a23fe feedback commit. 2014-12-22 18:13:07 +08:00
lvlong abd9a35504 CameraClippingDemo: change the sprite number. 2014-12-22 17:48:34 +08:00
lvlong f6bea9b6bb 1.add camera culling. 
2.add camera culling sample.
3.fix bug: load .obj file material.
 2014-12-18 17:18:22 +08:00
lvlong 73a2a6385a add frustum culling. 2014-12-16 16:34:35 +08:00
Ricardo Quesada 33a2d0451c Code conforms with the cocos2d-x c++ guidelines 2014-11-25 17:53:52 -08:00
yangxiao 1ed38334d9 remove unused variables 2014-10-16 17:44:04 +08:00
yangxiao f13fdb5162 adjust 2014-10-16 17:40:41 +08:00
yangxiao f5400b74a5 adjust 2014-10-16 17:38:42 +08:00
yangxiao 8e6728d8c0 change camera operation 2014-10-16 17:31:18 +08:00
Dhilan007 83150aa4d1 fix warns and memory leak 2014-10-09 17:19:43 +08:00
Ricardo Quesada 27cb6afb5e fixes warnings on Android 2014-10-08 18:55:33 -07:00
Ricardo Quesada 342d934a0e scheduler and macro fixes 
* kRepeatForever -> CC_REPEAT_FOREVER
* schedule_selector -> CC_SCHEDULE_SELECTOR
* [new] Node::schedule(const std::function<>& callback, const std::string &key)

Updates all smaples
 2014-10-03 09:38:36 -07:00
Ricardo Quesada 0ead7b6307 Squashed commit of the following: 
commit b9181ae92541d11119bedd766773ddb01f0bb486
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Sep 9 09:34:40 2014 -0700

    Compiles luasocket on Mac

commit 91fc79aa2101867fedfbcd7d846e9508009894e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Sep 9 09:12:30 2014 -0700

    disables luasockets

commit 31f2ee462708ab7b604b9399eaabd275e2da9e02
Merge: 19099fd 0abe4cb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Sep 9 08:10:48 2014 -0700

    Merge remote-tracking branch 'cocos2d/v3' into cmakefile_mac_osx

    Conflicts:
    	cocos/3d/cocos3d.h

commit 19099fd021b4ecf1f2eebd73ea14e84572d1ee33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 23:21:03 2014 -0700

    compiles on Linux

commit eec7b92817ac9208123468bb882612aad89f94bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 23:16:46 2014 -0700

    all projecs compiles with CMake

commit 40fcc8325b409a580fdbf26d2ee27aa2d1db0109
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 21:47:27 2014 -0700

    CCUserDefualt.mm better includes

commit 30709ec8243562858498cb118240bb45bf9b33b0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 21:26:36 2014 -0700

    cpp-tests compiles and works on Mac using CMake

commit 67f0fc8df887d08d3d7a27c5fdadd335d6841676
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 20:12:09 2014 -0700

    Adds missing files to CMakeLists.txt

commit 36f939ea7f157ca851aee138300c13d9888c0078
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 19:52:34 2014 -0700

    Adds more box2d missing files

commit 00f81e3b5ec97150974cc6022e86c394ff488ccb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 19:39:54 2014 -0700

    Adds missing box2d files

commit 9673227b4d7d0e6d9eced49bdd69b98cb519968a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 18:44:15 2014 -0700

    Initial CMake support for Mac
 2014-09-09 12:18:31 -07:00