Ricardo Quesada
|
ef700f2e3a
|
Fixes android build issues
also restores file for VS
|
2014-05-16 18:16:20 -07:00 |
Ricardo Quesada
|
4ad0980a19
|
Merge pull request #6784 from ricardoquesada/wp8_fixes_squash
Fixes for WP8
|
2014-05-16 17:40:16 -07:00 |
Ricardo Quesada
|
a1243ca9ed
|
Squashed commit of the following:
commit 8342086a358287a77d6f6bf8dd6e2ae0a488aef7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 17:37:58 2014 -0700
little fixes in project
commit 832397c96cc63523a2ad0490ac9d8ad3e3bf7d5d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 17:33:11 2014 -0700
CopyTemplates working
commit 8c1555cb0369bf123f84733839ef30c30f70f4ff
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 17:22:05 2014 -0700
Re-adds CopyTemplate to VS solution
commit fef2ad65596fd0ff60846e3a0b09dfea82c692a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 16:40:22 2014 -0700
Updated shaders
and project fixes
|
2014-05-16 17:38:52 -07:00 |
Ricardo Quesada
|
d19de29bec
|
Merge pull request #6783 from CocosRobot/update_cocosfiles_1400276389
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-16 14:45:50 -07:00 |
CocosRobot
|
b36d503812
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-16 21:39:50 +00:00 |
Ricardo Quesada
|
688025017c
|
Merge pull request #6782 from ricardoquesada/files_squash
Directory structure: fixes
|
2014-05-16 14:38:01 -07:00 |
Ricardo Quesada
|
0f67247325
|
Squashed commit of the following:
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 14:33:49 2014 -0700
Yeah... everything compiles on win32 and wp8
commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:58:38 2014 -0700
CCIME moved to base
and compiles on Android
commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:02:57 2014 -0700
compiles Ok for Windows Phone 8
commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 12:25:31 2014 -0700
fixes for Windows Phone 8
commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 11:15:13 2014 -0700
Compiles on Win32
commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 10:08:31 2014 -0700
Compiles on linux!
commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 09:30:42 2014 -0700
moves cocos/2d/platform -> cocos/platform
commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 08:24:41 2014 -0700
Merge remote-tracking branch 'cocos2d/v3' into files
commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu May 15 19:36:23 2014 -0700
files in the correct directory
|
2014-05-16 14:36:00 -07:00 |
Ricardo Quesada
|
6837cea2e6
|
Merge pull request #6781 from dabingnn/v3_work
V3 work
|
2014-05-16 11:04:49 -07:00 |
Huabing.Xu
|
38b4e7ad2c
|
fix memory leak for GLProgramState create logic
|
2014-05-16 11:02:23 -07:00 |
James Chen
|
511295e88a
|
Merge pull request #6779 from jonseg/cpp-template-error
Vector2 replaced by Vec2 in cpp-template
|
2014-05-16 22:23:33 +08:00 |
Jon Segador
|
64fa90ff0f
|
Vector2 replaced by Vec2
|
2014-05-16 16:21:36 +02:00 |
minggo
|
ef3263e80d
|
[ci skip]
|
2014-05-16 22:09:30 +08:00 |
minggo
|
67a1027a34
|
[ci skip]
|
2014-05-16 22:05:26 +08:00 |
minggo
|
d67a27808f
|
Merge pull request #6774 from Mazyod/v3-mac-secure-input
V3 mac secure input
|
2014-05-16 22:03:34 +08:00 |
minggo
|
e3f2c3985d
|
Merge pull request #6777 from boyu0/physics_rollback_for_lua
Roll back lua PhysicsTest.
|
2014-05-16 21:55:52 +08:00 |
minggo
|
540418840b
|
Merge pull request #6737 from seobyeongky/dispatcher_bug_fix
EventDispatcher bug fix
|
2014-05-16 18:35:51 +08:00 |
minggo
|
bf2250a67a
|
Merge pull request #6738 from cocoscodeide/v3
update template project lua
|
2014-05-16 18:10:10 +08:00 |
bofeng-song
|
6dd7f2d630
|
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3
|
2014-05-16 17:19:36 +08:00 |
boyu0
|
74335a92f7
|
Roll back lua PhysicsTest.
|
2014-05-16 17:19:02 +08:00 |
minggo
|
64002e5a2a
|
[ci skip]
|
2014-05-16 17:14:33 +08:00 |
minggo
|
39c76d8a9e
|
[ci skip]
|
2014-05-16 17:13:17 +08:00 |
James Chen
|
cd402ea6c7
|
Merge pull request #6776 from CocosRobot/update_cocosfiles_1400229820
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-16 17:11:40 +08:00 |
minggo
|
eb38809630
|
Merge pull request #6756 from zifter/FixTwiceCallingOnExit
Fix twice calling on exit
|
2014-05-16 17:10:42 +08:00 |
cocoscodeide
|
b520c8faa5
|
Merge pull request #15 from chuanweizhang2013/v3luaruntime
fixed repo
|
2014-05-16 17:09:54 +08:00 |
cw
|
aa2aa4bcdf
|
fixed repo
|
2014-05-16 17:08:33 +08:00 |
bofeng-song
|
662d8454f7
|
remove inner function from header file
|
2014-05-16 16:46:35 +08:00 |
CocosRobot
|
c2ace4c56e
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-16 08:43:41 +00:00 |
minggo
|
ff7f832033
|
Merge pull request #6772 from natural-law/v3
Update the reference of submodule plugin-x.
|
2014-05-16 16:37:07 +08:00 |
minggo
|
3caae63a03
|
Merge pull request #6775 from xhcnb/native-lib
[ci skip] update Cocos2dxHelper and AndroidManifest.xml template
|
2014-05-16 16:35:52 +08:00 |
bofeng-song
|
5cf961912b
|
fix potential problem
|
2014-05-16 16:24:26 +08:00 |
bofeng-song
|
8a407cd0ba
|
show uploading file in play scene
|
2014-05-16 15:59:09 +08:00 |
Jason Xu
|
67a558c83d
|
for 93562d6aa6
update Cocos2dxHelper and AndroidManifest.xml template.
|
2014-05-16 15:55:00 +08:00 |
Mazyad Alabduljaleel
|
cbe1c39fe6
|
Oops, removed CC_SYNTHESIZE_READONLY_PURE_REF, which is something I added for myself.
|
2014-05-16 11:37:37 +04:00 |
Mazyad Alabduljaleel
|
9fa30f2c61
|
Added Secure input for CCEditBox on Mac
[NEW]: Implemented NSSecureTextField when CCEditBox inputFlag is set to Password
[FIX]: Cleanup CCEditBoxMac. CCCustomNSTextField class is not needed.
|
2014-05-16 11:21:56 +04:00 |
Mazyad Alabduljaleel
|
111df3474c
|
Merge branch 'maz-changes' into v3
* maz-changes:
[NEW]: added pure reference synthesizer
|
2014-05-16 11:15:22 +04:00 |
James Chen
|
f07e7ae869
|
Update README.md: readme for download-deps.py
|
2014-05-16 15:15:06 +08:00 |
minggo
|
d3853e3f8b
|
[ci skip]
|
2014-05-16 14:11:26 +08:00 |
zhangbin
|
a0d5fdc622
|
Update the reference of submodule plugin-x.
|
2014-05-16 14:07:00 +08:00 |
minggo
|
93562d6aa6
|
Merge pull request #6771 from dumganhar/load-native-lib
[android] Adds a virtual method for loading native libraries.
|
2014-05-16 14:05:39 +08:00 |
cocoscodeide
|
f1bd396140
|
Merge pull request #13 from chuanweizhang2013/v3luaruntime
add prebuiltruntime
|
2014-05-16 12:03:57 +08:00 |
cw
|
ceeba9a081
|
mofiy size
|
2014-05-16 12:02:59 +08:00 |
cw
|
48e437801f
|
add prebuiltruntime
|
2014-05-16 11:57:03 +08:00 |
andyque
|
b434840bc9
|
issue #5183, add layout parameter type to widget for convenient access
|
2014-05-16 10:33:28 +08:00 |
andyque
|
1b3c28ea90
|
Merge branch 'v3' into refactorLayout
Conflicts:
cocos/ui/UILayout.cpp
|
2014-05-16 10:22:53 +08:00 |
James Chen
|
d6007a395c
|
Adds a virtual method for loading native libraries.
|
2014-05-16 10:20:49 +08:00 |
James Chen
|
81e1e0c23d
|
Merge pull request #6750 from shujunqiao/pull-build-merge
modify /merge to /head in pull-request-build.[ci skip]
|
2014-05-16 10:00:23 +08:00 |
Ricardo Quesada
|
0689a47c3e
|
Merge pull request #6770 from ricardoquesada/label_fixes
Does not crash on Mac if the .ttf file is not found
|
2014-05-15 17:23:24 -07:00 |
Ricardo Quesada
|
7e4597508c
|
Does not crash on Mac if the .ttf file is not found
|
2014-05-15 17:22:53 -07:00 |
Ricardo Quesada
|
0cfc7827de
|
Merge pull request #6769 from ricardoquesada/interpolate_fix
default value is 0.5 for interpolation
|
2014-05-15 16:52:47 -07:00 |
Ricardo Quesada
|
f9f0142842
|
default value is 0.5 for interpolation
|
2014-05-15 16:52:15 -07:00 |