Commit Graph

Select branches

Hide Pull Requests

develop

master

v1.4

v1.5

v1.6

v1.7

v1.8

v2.4

v24-custom

v3.8.1-hmi

v3.8.4

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#117

#118

#119

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#131

#132

#133

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#177

#178

#179

#18

#180

#181

#182

#183

#184

#185

#186

#187

#188

#189

#19

#190

#191

#192

#193

#194

#195

#196

#197

#198

#199

#2

#20

#200

#201

#202

#203

#204

#205

#206

#207

#208

#209

#21

#210

#211

#212

#213

#214

#215

#216

#217

#218

#219

#22

#220

#221

#222

#223

#224

#225

#226

#227

#228

#229

#23

#230

#231

#232

#233

#234

#235

#236

#237

#238

#239

#24

#240

#241

#242

#243

#244

#245

#246

#247

#248

#249

#25

#250

#251

#252

#253

#254

#255

#256

#257

#258

#259

#26

#260

#261

#262

#263

#264

#265

#266

#267

#268

#269

#27

#270

#271

#272

#273

#274

#275

#276

#277

#278

#279

#28

#280

#281

#282

#283

#284

#285

#286

#287

#288

#289

#29

#290

#291

#292

#293

#294

#295

#296

#297

#298

#299

#3

#30

#300

#301

#302

#303

#304

#305

#306

#307

#308

#309

#31

#310

#311

#312

#313

#314

#315

#316

#317

#318

#319

#32

#320

#320

#321

#322

#323

#324

#325

#326

#327

#328

#329

#33

#330

#331

#332

#333

#334

#335

#336

#337

#338

#339

#34

#340

#341

#342

#343

#344

#346

#347

#348

#349

#35

#350

#351

#352

#353

#354

#355

#356

#357

#358

#359

#36

#36

#360

#361

#362

#363

#364

#365

#366

#367

#368

#369

#37

#370

#371

#372

#373

#374

#375

#376

#377

#378

#379

#38

#380

#381

#382

#383

#384

#385

#386

#387

#388

#389

#39

#390

#391

#392

#393

#394

#395

#396

#397

#398

#399

#4

#40

#400

#401

#402

#403

#404

#405

#406

#407

#408

#409

#41

#410

#411

#412

#413

#414

#415

#416

#417

#418

#419

#42

#420

#421

#422

#423

#424

#425

#426

#427

#428

#429

#43

#430

#431

#432

#433

#434

#435

#436

#437

#438

#439

#44

#440

#441

#442

#443

#444

#445

#446

#447

#448

#449

#45

#450

#451

#452

#453

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

3.6.1

3d-1.1.2

3d-1.2.0

3d-v3.0.0

3d-v3.2.1

3d-v3.3.1

3d-v3.3.2

develop-1

develop-10

develop-11

develop-12

develop-13

develop-14

develop-15

develop-16

develop-17

develop-18

develop-19

develop-2

develop-20

develop-21

develop-22

develop-23

develop-24

develop-25

develop-26

develop-27

develop-28

develop-29

develop-3

develop-30

develop-4

develop-5

develop-6

develop-7

develop-8

develop-9

hmi-1

new-renderer-1

new-renderer-2

new-renderer-3

nex

next-10

next-4

next-5

next-6

next-7

next-8

next-9

release-3d-v1.1.1

v16-deps-1

v16-deps-2

v23-1

v23-2

v23-3

v23-4

v23-5

v23-6

v23-7

v24-1

v24-10

v24-11

v24-12

v24-13

v24-2

v24-3

v24-4

v24-5

v24-6

v24-9

v24-custom-0

v24-custom-1

v3-deps-1

v3-deps-10

v3-deps-11

v3-deps-12

v3-deps-13

v3-deps-14

v3-deps-15

v3-deps-16

v3-deps-17

v3-deps-18

v3-deps-19

v3-deps-2

v3-deps-20

v3-deps-21

v3-deps-22

v3-deps-23

v3-deps-24

v3-deps-25

v3-deps-26

v3-deps-27

v3-deps-28

v3-deps-29

v3-deps-3

v3-deps-30

v3-deps-31

v3-deps-32

v3-deps-33

v3-deps-34

v3-deps-35

v3-deps-36

v3-deps-37

v3-deps-38

v3-deps-39

v3-deps-4

v3-deps-40

v3-deps-41

v3-deps-42

v3-deps-43

v3-deps-44

v3-deps-45

v3-deps-46

v3-deps-47

v3-deps-48

v3-deps-49

v3-deps-50

v3-deps-51

v3-deps-52

v3-deps-53

v3-deps-54

v3-deps-6

v3-deps-7

v3-deps-8

v3-deps-9

v3.4.0-1

v3.4.0-2

v3.6-oh-1

v3.6.1-1

v3.6.1-2

v3.6.1-3

v3.6.1-4

v3.6.1-5

v3.6.1-6

v3.6.1-oh-1

v3.6.1-oh-2

v3.6.1-oh-3

v3.6.1-oh-4

v3.6.1-oh-5

v3.6.1-oh-6

v3.6.1-oh-7

v3.6.1-oh-8

v3.6.2-1

v3.6.2-2

v3.6.2-3

v3.6.2-4

v3.6.2-5

v3.6.2-6

v3.6.3-1

v3.7.0-1

v3.7.0-2

v3.7.0-3

v3.7.0-4

v3.7.0-5

v3.7.0-6

v3.7.0-7

v3.7.1-1

v3.7.1-2

v3.7.2-1

v3.7.3-1

v3.8.0-1

v3.8.0-10

v3.8.0-11

v3.8.0-12

v3.8.0-13

v3.8.0-14

v3.8.0-15

v3.8.0-16

v3.8.0-17

v3.8.0-18

v3.8.0-2

v3.8.0-3

v3.8.0-4

v3.8.0-5

v3.8.0-6

v3.8.0-7

v3.8.0-8

v3.8.0-9

v3.8.0-hmi-1

v3.8.0-hmi-2

v3.8.1-1

v3.8.1-10

v3.8.1-11

v3.8.1-12

v3.8.1-13

v3.8.1-14

v3.8.1-15

v3.8.1-16

v3.8.1-17

v3.8.1-18

v3.8.1-19

v3.8.1-2

v3.8.1-20

v3.8.1-21

v3.8.1-3

v3.8.1-4

v3.8.1-5

v3.8.1-6

v3.8.1-7

v3.8.1-8

v3.8.1-9

v3.8.1-hmi-1

v3.8.1-hmi-2

v3.8.1-hmi-3

v3.8.2-1

v3.8.2-10

v3.8.2-11

v3.8.2-12

v3.8.2-13

v3.8.2-14

v3.8.2-15

v3.8.2-16

v3.8.2-17

v3.8.2-18

v3.8.2-19

v3.8.2-2

v3.8.2-20

v3.8.2-21

v3.8.2-22

v3.8.2-23

v3.8.2-3

v3.8.2-4

v3.8.2-5

v3.8.2-6

v3.8.2-7

v3.8.2-8

v3.8.2-9

v3.8.4-1

v3.8.4-2

v3d-1

v3d-10

v3d-11

v3d-12

v3d-13

v3d-14

v3d-15

v3d-16

v3d-2

v3d-3

v3d-4

v3d-5

v3d-6

v3d-7

v3d-8

v3d-9

v3d-gfx-100

v3d-gfx-101

v3d-gfx-102

v3d-gfx-103

v3d-gfx-104

v3d-gfx-105

v3d-gfx-106

v3d-gfx-107

v3d-gfx-108

v3d-gfx-109

v3d-gfx-110

v3d-gfx-111

v3d-gfx-112

v3d-gfx-113

v3d-gfx-114

v3d-gfx-115

v3d-gfx-116

v3d-gfx-117

v3d-gfx-118

v3d-gfx-119

v3d-gfx-12

v3d-gfx-120

v3d-gfx-121

v3d-gfx-122

v3d-gfx-123

v3d-gfx-124

v3d-gfx-125

v3d-gfx-126

v3d-gfx-127

v3d-gfx-128

v3d-gfx-129

v3d-gfx-13

v3d-gfx-130

v3d-gfx-131

v3d-gfx-132

v3d-gfx-133

v3d-gfx-134

v3d-gfx-14

v3d-gfx-15

v3d-gfx-16

v3d-gfx-17

v3d-gfx-18

v3d-gfx-19

v3d-gfx-20

v3d-gfx-21

v3d-gfx-22

v3d-gfx-23

v3d-gfx-24

v3d-gfx-25

v3d-gfx-26

v3d-gfx-27

v3d-gfx-28

v3d-gfx-29

v3d-gfx-30

v3d-gfx-31

v3d-gfx-32

v3d-gfx-33

v3d-gfx-34

v3d-gfx-35

v3d-gfx-36

v3d-gfx-37

v3d-gfx-38

v3d-gfx-39

v3d-gfx-40

v3d-gfx-41

v3d-gfx-42

v3d-gfx-43

v3d-gfx-44

v3d-gfx-45

v3d-gfx-46

v3d-gfx-47

v3d-gfx-48

v3d-gfx-49

v3d-gfx-50

v3d-gfx-51

v3d-gfx-52

v3d-gfx-53

v3d-gfx-54

v3d-gfx-55

v3d-gfx-56

v3d-gfx-57

v3d-gfx-58

v3d-gfx-59

v3d-gfx-60

v3d-gfx-61

v3d-gfx-62

v3d-gfx-63

v3d-gfx-64

v3d-gfx-65

v3d-gfx-66

v3d-gfx-67

v3d-gfx-68

v3d-gfx-69

v3d-gfx-70

v3d-gfx-71

v3d-gfx-72

v3d-gfx-73

v3d-gfx-74

v3d-gfx-75

v3d-gfx-76

v3d-gfx-77

v3d-gfx-78

v3d-gfx-79

v3d-gfx-80

v3d-gfx-81

v3d-gfx-82

v3d-gfx-83

v3d-gfx-84

v3d-gfx-85

v3d-gfx-86

v3d-gfx-87

v3d-gfx-88

v3d-gfx-89

v3d-gfx-90

v3d-gfx-91

v3d-gfx-92

v3d-gfx-93

v3d-gfx-94

v3d-gfx-95

v3d-gfx-96

v3d-gfx-97

v3d-gfx-98

v3d-gfx-99

Mono Color

• 7483966da7 Merge pull request #27 from pandamicro/master v3-deps-30 pandamicro 2017-06-30 17:42:55 +0800
• d49a5a1ec6 Upgrade spidermonkey to v52 #27 pandamicro 2017-06-30 16:21:03 +0800
• 7fa906b85c Merge pull request #26 from dumganhar/fix/disable-async-for-ios v3-deps-29 v1.5 pandamicro 2017-05-24 11:32:41 +0800
• 14994c2752 Disable async in openssl for ios since apple forbit developers to use the API (setcontext, getcontext, makecontext). #26 James Chen 2017-05-24 11:25:23 +0800
• 29794b4bb9 Merge pull request #25 from 2youyou2/v1.5 v3-deps-28 Wang Nan 2017-05-19 11:28:09 +0800
• 717bb8c6d4 support vs2017 #25 2youyouo2 2017-05-19 11:19:33 +0800
• 2db1d8d784 Merge pull request #24 from 2youyou2/develop v3-deps-27 Wang Nan 2017-04-25 10:00:43 +0800
• 266496ae15 Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite-external into develop #24 2youyouo2 2017-04-21 10:39:33 +0800
• 1e082d6942 remove unused lib 2youyouo2 2017-04-21 10:37:38 +0800
• 2d5895cc49 Merge pull request #23 from 2youyou2/develop v3-deps-26 Wang Nan 2017-03-15 14:44:35 +0800
• b616189d2f add proj.win32 #23 2youyou2 2017-03-14 16:32:22 +0800
• 011cbe9a6d fixed android build according to 43408de 2youyouo2 2017-03-09 17:12:58 +0800
• a03c09d797 add ClearDraw 2youyouo2 2017-03-09 17:10:27 +0800
• 582e202912 add box2d 2youyouo2 2017-03-09 17:09:58 +0800
• 46ff05eb4a Merge pull request #22 from dumganhar/develop v3-deps-25 Wang Nan 2017-02-17 17:19:38 +0800
• 1475333af5 Merge branch 'v1.4' into develop #22 James Chen 2017-02-16 11:25:26 +0800
• db556ac98d Merge pull request #21 from dumganhar/develop v3-deps-24 Wang Nan 2017-02-09 13:49:34 +0800
• 6bf9840dec Adds openssl, updates curl, libwebsockets. #21 James Chen 2017-02-09 10:23:52 +0800
• b2f3f03fae Merge pull request #20 from dumganhar/mp3-ogg-decoder v3-deps-23 v1.4 Wang Nan 2017-01-20 16:34:22 +0800
• 8680e9849f Disable ASM for tremolo since it may crashes while decoding same specific ogg audio files. #20 James Chen 2017-01-20 16:28:39 +0800
• 7b7fa095d0 Merge pull request #19 from pandamicro/master v3-deps-22 pandamicro 2017-01-13 10:26:36 +0800
• 281ff7b42c Add tinydir 1.2.1 for FileUtils::listFiles #19 pandamicro 2017-01-13 10:25:30 +0800
• f1c37c489d Merge pull request #18 from pandamicro/master v3-deps-21 pandamicro 2017-01-10 11:46:24 +0800
• 261f60ca73 Update rapidjson #18 pandamicro 2017-01-10 11:42:33 +0800
• fc07c78083 Merge pull request #17 from dumganhar/mp3-ogg-decoder Wang Nan 2017-01-10 11:32:41 +0800
• 5d8111692e Adds source code of tremolo(for decoding ogg), pvmp3dec source code #17 James Chen 2017-01-09 17:39:11 +0800
• e5770511ff Merge pull request #16 from zilongshanren/fixGLFW-10.12.2 v3-deps-20 子龙山人 2016-12-30 14:45:40 +0800
• 71e428d64b update glfw #16 zilongshanren 2016-12-30 14:45:08 +0800
• d28204073f Merge pull request #15 from natural-law/master v3-deps-19 子龙山人 2016-12-26 16:30:01 +0800
• 011f0d21ba Update the version of glfw for Mac. #15 zhangbin 2016-12-26 16:26:00 +0800
• 28353a429d Merge pull request #14 from hylthink/master v3-deps-18 Wang Nan 2016-12-02 14:50:44 +0800
• 31a87cb46a AnySDK 2.2.5 support https #14 yanli.huang 2016-12-02 12:00:56 +0800
• 7ed6ad08ea Merge pull request #13 from zilongshanren/fixGLFW-macos-10-12 v3-deps-17 子龙山人 2016-11-14 01:47:00 -0800
• bcc7e77f92 update glfw #13 zilongshanren 2016-11-14 17:41:41 +0800
• d4de3fff88 Merge pull request #12 from zilongshanren/upgrade-glfw v3-deps-16 pandamicro 2016-11-01 22:44:56 +0800
• d68154e7dd update glfw for macos 10.12 #12 zilongshanren 2016-11-01 22:21:31 +0800
• 0ded35b0c4 Merge pull request #11 from pandamicro/master v3-deps-15 pandamicro 2016-10-19 18:34:17 +0800
• 3117fab222 Add webp #11 pandamicro 2016-10-19 18:28:54 +0800
• 03caae7773 Merge pull request #10 from hylthink/master v3-deps-14 Wang Nan 2016-09-20 10:37:13 +0800
• eea0b81a21 strip AnySDK 2.2.3 #10 yanli.huang 2016-09-19 18:22:48 +0800
• 618f2d6dad Merge pull request #9 from hylthink/master v3-deps-13 Wang Nan 2016-09-19 17:25:33 +0800
• b3432c4c29 update AnySDK 2.2.3 #9 yanli.huang 2016-09-19 14:23:42 +0800
• 19845a8849 Merge pull request #8 from pandamicro/master v3-deps-12 pandamicro 2016-09-08 20:56:47 +0800
• 0737f75745 Update lib chipmunk and spider monkey for armeabi #8 pandamicro 2016-09-08 20:54:24 +0800
• 52409e59c0 Merge pull request #7 from pandamicro/master v3-deps-11 pandamicro 2016-09-08 15:37:44 +0800
• d16c922475 Update android lib chipmunk and lib spidermonkey #7 pandamicro 2016-09-08 13:55:16 +0800
• 051853a542 Merge pull request #6 from pandamicro/master v3-deps-10 pandamicro 2016-09-02 11:50:13 +0800
• 7b70b5d552 Update chipmunk to 7.0.1 #6 pandamicro 2016-09-02 11:44:19 +0800
• 4189719df7 Merge pull request #5 from natural-law/update-rapidjson v3-deps-9 pandamicro 2016-08-30 10:55:03 +0800
• 4af261b96e Update rapid json to version 1.1.0 #5 zhangbin 2016-08-29 18:15:19 +0800
• 24c667c00a Merge pull request #4 from pandamicro/master v3-deps-8 pandamicro 2016-08-26 15:50:58 +0800
• f2355e970e Sync with cocos2d-x v3.13 #4 pandamicro 2016-08-26 14:38:12 +0800
• 6af24dd504 Merge pull request #3 from dabingnn/add_image_lib_ios v3-deps-7 Wang Nan 2016-07-29 09:49:15 +0800
• 057e474a62 add image lib back for ios #3 Huabing.Xu 2016-07-28 17:56:22 +0800
• d772be1ea1 Merge pull request #2 from hylthink/master v3-deps-6 Wang Nan 2016-07-21 17:48:55 +0800
• 77bef583b2 add anysdk module to Android.mk #2 yanli.huang 2016-07-21 17:34:15 +0800
• 4cb8a7b1a3 Merge pull request #1 from hylthink/master Wang Nan 2016-07-21 16:48:42 +0800
• 023085ec80 add anysdk to versions.txt #1 yanli.huang 2016-07-21 16:38:59 +0800
• 7888f00915 add anysdk library yanli.huang 2016-07-20 16:14:05 +0800
• c7e49e2c3c Upgrade websockets to 1.7.8 and enable support for IPV6. v3-deps-4 Wenhai Lin 2016-05-19 01:07:19 +0800
• 22961548a8 Fixed compile fail on win32 v3-deps-3 Wenhai Lin 2016-04-13 19:47:48 +0800
• f516631ae8 Add Google BreakPad Wenhai Lin 2016-03-30 14:33:18 +0800
• 5fa5d8d354 Upgrade websockets to 1.7.4 v3-deps-2 Wenhai Lin 2016-03-30 11:31:30 +0800
• 44028cb51b cocos 2d lite external v3-deps-1 Wenhai Lin 2016-03-29 23:27:43 +0800