stk-code_catmod

ilikecats/stk-code_catmod

Fork 0

Commit Graph

Select branches

Hide Pull Requests

1.4-branch

AnimateSun

GiantKartItem

LightOptimisations

RaceUI2

add-dirt-to-karts

fix_2169

master

steam-test

#12

#1213

#1213

#1214

#1214

#1217

#1217

#1218

#1219

#1219

#1222

#1222

#1226

#1231

#1231

#1233

#1235

#1236

#1238

#1240

#1240

#1241

#1241

#1243

#1245

#1245

#1246

#1247

#1247

#1248

#1248

#1249

#1249

#1250

#1250

#1252

#1254

#1255

#1256

#1257

#1259

#1260

#1260

#1261

#1261

#1264

#1264

#1265

#1265

#1267

#1267

#1269

#1269

#1271

#1271

#1279

#1281

#1286

#1292

#1292

#1299

#1299

#1303

#1309

#1317

#1325

#1330

#1330

#1336

#1337

#1337

#1338

#1343

#1349

#1352

#1353

#1354

#1368

#1368

#1371

#1377

#1377

#1384

#1387

#1391

#1391

#1398

#14

#14

#1400

#1401

#1404

#1404

#1411

#1414

#1419

#1420

#1421

#1422

#1425

#1425

#1427

#1439

#1463

#1490

#1493

#1495

#15

#1509

#1527

#1527

#1530

#1535

#1535

#1547

#1553

#1561

#1570

#1577

#1589

#1589

#1596

#1596

#1599

#16

#16

#1603

#1606

#1609

#1609

#1614

#1614

#1615

#1619

#1619

#1621

#1632

#1632

#1644

#1649

#1652

#1653

#1657

#1661

#1674

#1674

#1684

#1696

#1696

#17

#17

#1707

#1707

#1714

#1718

#1720

#1727

#1728

#1735

#1743

#1743

#1745

#1749

#1754

#1754

#1756

#1766

#1775

#1775

#1779

#1781

#1782

#1783

#1783

#1785

#1785

#1788

#18

#1833

#1847

#1849

#1850

#1850

#1854

#1858

#1862

#1871

#1877

#1878

#1878

#1881

#1881

#1882

#1889

#1895

#1896

#1899

#19

#19

#1907

#1917

#1919

#1920

#1920

#1921

#1939

#1949

#1956

#1957

#1958

#1960

#1963

#1964

#1969

#1971

#1975

#1976

#1979

#1992

#1994

#2005

#2011

#2025

#2027

#2028

#2029

#2030

#2030

#2034

#2034

#2035

#2042

#2042

#2045

#2053

#2056

#2057

#2058

#2060

#2074

#2074

#2076

#2076

#2101

#2103

#2104

#2106

#2107

#2117

#2117

#2133

#2172

#2181

#2186

#2186

#2188

#2189

#2191

#2191

#2195

#2195

#2196

#2196

#2198

#2199

#22

#2208

#2209

#2211

#2212

#2215

#2217

#2217

#2228

#2229

#2229

#2244

#2245

#2252

#2253

#2253

#2254

#2254

#2259

#2266

#2271

#2272

#2280

#2283

#2284

#2285

#2293

#2293

#23

#23

#2301

#2307

#2310

#2317

#2319

#2331

#2337

#2352

#2354

#2356

#2356

#2364

#2365

#2367

#2371

#2372

#2373

#2374

#2375

#2378

#2379

#2380

#2391

#2391

#2394

#2394

#2395

#2395

#2396

#2396

#24

#2405

#2405

#2406

#2409

#2409

#2416

#2423

#2423

#2430

#2430

#2439

#2441

#2451

#2454

#2454

#2455

#2456

#2464

#2467

#2467

#2475

#2486

#2486

#2489

#2494

#25

#2507

#2512

#2512

#2513

#2514

#2516

#2518

#2523

#2525

#2525

#2526

#2529

#2530

#2531

#2532

#2532

#2554

#2554

#2556

#2563

#2568

#2568

#2573

#2575

#2578

#2579

#2581

#2582

#2582

#2585

#2586

#2588

#2588

#2593

#26

#26

#2601

#2601

#2605

#2611

#2612

#2615

#2620

#2621

#2621

#2622

#2622

#2624

#2624

#2626

#2626

#2632

#2632

#2636

#2637

#2639

#2639

#2647

#2647

#2650

#2652

#2653

#2653

#2654

#2655

#2655

#2659

#2660

#2660

#2664

#2664

#2682

#2685

#2688

#2694

#27

#27

#2701

#2723

#2725

#2729

#2730

#2731

#2732

#2732

#2736

#2759

#2759

#2765

#2768

#2771

#2771

#2772

#2799

#2799

#2804

#2804

#2806

#2819

#2820

#2820

#2823

#2824

#2833

#2833

#2834

#2836

#2836

#2839

#2843

#2854

#2855

#2855

#2856

#2857

#2857

#2858

#2858

#2861

#2862

#2863

#2863

#2864

#2864

#2865

#2865

#2867

#2871

#2875

#2879

#2879

#2880

#2882

#2882

#2883

#2884

#2884

#2890

#2890

#2892

#2893

#2895

#2895

#2901

#2901

#2905

#2905

#2913

#2913

#2914

#2915

#2918

#2918

#2924

#2925

#2925

#2928

#2928

#2930

#2930

#2932

#2941

#2941

#2953

#2953

#2954

#2964

#2966

#2966

#2968

#2969

#3

#3

#30

#30

#3003

#3007

#3007

#3008

#3011

#3012

#3013

#3013

#3014

#3015

#3020

#3020

#3022

#3022

#3059

#3060

#3071

#3073

#3073

#3080

#3081

#3090

#31

#31

#3104

#3105

#3106

#3107

#3108

#3110

#3110

#3116

#3127

#3130

#3130

#3143

#3154

#3157

#3157

#3158

#3170

#3170

#3177

#3178

#3179

#3179

#3181

#3183

#3184

#3186

#3190

#3192

#3194

#3196

#3199

#32

#3202

#3204

#3204

#3205

#3207

#3210

#3210

#3215

#3216

#3216

#3224

#3231

#3232

#3238

#3243

#3244

#3252

#3253

#3256

#3258

#3260

#3262

#3263

#3265

#3267

#3270

#3273

#3276

#3279

#3282

#3284

#3288

#3289

#3289

#3291

#3293

#3298

#3299

#3303

#3307

#3312

#3314

#3315

#3317

#3318

#3320

#3322

#3323

#3324

#3325

#3327

#3327

#3328

#3331

#3332

#3335

#3336

#3336

#3339

#3354

#3357

#3357

#3358

#3364

#3367

#3368

#3371

#3372

#3372

#3373

#3374

#3377

#3380

#3384

#3385

#3386

#3391

#3392

#3400

#3401

#3402

#3405

#3407

#3410

#3411

#3416

#3417

#3419

#3426

#3429

#3431

#3465

#3467

#3472

#3472

#3475

#3482

#3492

#3495

#35

#35

#3515

#3517

#3519

#3520

#3522

#3523

#3529

#3533

#3538

#3552

#3568

#36

#3603

#3605

#3612

#3622

#3626

#3631

#3632

#3638

#3641

#3645

#3651

#3654

#3659

#3660

#3661

#3662

#3664

#3666

#3667

#3676

#3679

#3680

#3683

#3684

#3686

#3688

#3690

#3692

#3693

#3694

#37

#3703

#3708

#3713

#3715

#3724

#3738

#3745

#3748

#3749

#3755

#3760

#3770

#3775

#3778

#3789

#3791

#3794

#3796

#3798

#3800

#3804

#3808

#3810

#3813

#3817

#3833

#3854

#3860

#3863

#3881

#3885

#3891

#3910

#3912

#3914

#3916

#3917

#3918

#3919

#3920

#3921

#3926

#3929

#3933

#3940

#3943

#3944

#3947

#3949

#3950

#3951

#3957

#3958

#3960

#3966

#3968

#3970

#3974

#3975

#3983

#3987

#3992

#3997

#3999

#4

#4000

#4001

#4002

#4006

#4012

#4013

#4015

#4017

#4018

#4019

#4020

#4021

#4023

#4024

#4025

#4027

#4038

#4049

#4052

#4053

#4054

#4055

#4056

#4057

#4058

#4060

#4061

#4063

#4064

#4068

#4069

#4071

#4073

#4075

#4076

#4077

#4078

#4079

#4081

#4085

#4087

#4090

#4092

#4093

#4094

#4099

#41

#4100

#4102

#4108

#4111

#4113

#4114

#4115

#4119

#4121

#4124

#4130

#4135

#4136

#4137

#4138

#4139

#4140

#4143

#4146

#4155

#4156

#4158

#4159

#4160

#4161

#4162

#4163

#4164

#4165

#4168

#4169

#4170

#4171

#4174

#4177

#4180

#4181

#4182

#4185

#4186

#4190

#4192

#4193

#4195

#4196

#4197

#4198

#4199

#42

#42

#4200

#4201

#4202

#4203

#4204

#4206

#4208

#4210

#4211

#4212

#4213

#4215

#4216

#4217

#4218

#4220

#4223

#4224

#4225

#4226

#4227

#4228

#4229

#4230

#4231

#4232

#4233

#4240

#4245

#4249

#4251

#4255

#4258

#4259

#4262

#4263

#4264

#4265

#4267

#4268

#4269

#4270

#4273

#4279

#4280

#4283

#4294

#4297

#4298

#4304

#4306

#4309

#4310

#4312

#4314

#4315

#4316

#4317

#4319

#4320

#4323

#4324

#4329

#4330

#4331

#4338

#4341

#4343

#4345

#4352

#4358

#4361

#4366

#4373

#4374

#4375

#4377

#4384

#4386

#4387

#4395

#4396

#4397

#4398

#4399

#44

#4402

#4409

#4411

#4412

#4413

#4414

#4415

#4435

#4437

#4438

#4439

#4445

#4450

#4451

#4452

#4453

#4454

#4455

#4457

#4459

#4462

#4465

#4468

#4469

#4472

#4474

#4476

#4478

#4483

#4484

#4489

#4491

#4493

#4498

#4499

#4500

#4501

#4502

#4503

#4504

#4505

#4506

#4508

#4512

#4514

#4515

#4518

#4519

#4523

#4524

#4525

#4527

#4530

#4532

#4534

#4535

#4536

#4537

#4545

#4547

#4548

#4551

#4553

#4555

#4556

#4559

#4560

#4561

#4562

#4563

#4565

#4566

#4567

#4573

#4575

#4577

#4579

#4582

#4583

#4584

#4589

#4596

#46

#4606

#4613

#4616

#4617

#4618

#4619

#4620

#4624

#4626

#4627

#4628

#4630

#4631

#4632

#4641

#4642

#4643

#4644

#4649

#4650

#4652

#4655

#4656

#4657

#4661

#4663

#4664

#4666

#4673

#4676

#4678

#4679

#4680

#4681

#4686

#4688

#4689

#4691

#4692

#4693

#4696

#4699

#4706

#4707

#4712

#4713

#4719

#4720

#4721

#4722

#4723

#4725

#4728

#4730

#4731

#4732

#4733

#4736

#4738

#4740

#4741

#4743

#4748

#4755

#4756

#4757

#4759

#4761

#4762

#4763

#4766

#4771

#4773

#4774

#4775

#4783

#4789

#4794

#4799

#4802

#4804

#4807

#4810

#4812

#4832

#4840

#4845

#4849

#4850

#4854

#4860

#4861

#4862

#4864

#4865

#4871

#4875

#4879

#4882

#4886

#4887

#4892

#4894

#4896

#4897

#4906

#4909

#4910

#4918

#4929

#4961

#4962

#4966

#4968

#4973

#4978

#4980

#4981

#4983

#4983

#4985

#4987

#4988

#4989

#4990

#4991

#4992

#4993

#4994

#4998

#5

#5

#5003

#5006

#5012

#5015

#5016

#5036

#5038

#5041

#5047

#5048

#5049

#5055

#5071

#5073

#5080

#5082

#5100

#5104

#5104

#5106

#5106

#5112

#5117

#5118

#5119

#5120

#5122

#5124

#5124

#54

#54

#56

#56

0.9.1

0.9.2

0.9.3

1.0

1.1

1.2

1.3

1.3-rc1

1.4

1.4-rc1

preview

v0.1

v0.2

v0.3

v0.4

v0.5

v0.6

v0.6.1

v0.6.1a

v0.6.2

v0.6.2a

v0.7

v0.7.1

v0.7.2

v0.7.3

v0.8

v0.8.1

v0.9

969592e3fc Try to fix framerate drop after few laps Benau 2016-12-23 09:19:46 +08:00
6fb93fa208 Fix compilation on macOS 10.12 (#2701) Tobias Markus 2016-12-23 01:17:31 +01:00
8008ec851e Allow to use hardware skinning with opengl 3.1 Benau 2016-12-23 01:31:13 +08:00
28841d601d Remove old code for getting straight frame Benau 2016-12-23 00:44:26 +08:00
bfd57659eb Remove unused file Benau 2016-12-22 11:17:52 +08:00
ffa4ad84cb Merge branch 'hardware_skinning' Benau 2016-12-22 10:38:06 +08:00
53ee40af70 Update multitouch device when settings are changed Deve 2016-12-20 23:05:26 +01:00
082661db65 Add a possibility to change touch device settings in GUI Deve 2016-12-20 22:44:36 +01:00
31619aecff Merge remote-tracking branch 'origin/master' into game_protocol hiker 2016-12-20 10:31:24 +11:00
084869263d Use a sort function to sort the rewind info events and network events, so that the merge function can be used to combine them. The RewindManager is now threadsafe. hiker 2016-12-20 09:41:50 +11:00
c26f8150f4 Fix server only build Benau 2016-12-19 11:17:45 +08:00
581ca964fd Fix hats with hardware skinning Benau 2016-12-19 11:06:05 +08:00
2f07b6a8ea Merge pull request #2694 from leyyin/hardware_skinning Benau 2016-12-18 19:49:35 +08:00
d0229cd85e Separate the non-cached shader loading in ShaderFilesManager Daniel Butum 2016-12-18 13:30:49 +02:00
4f2e2331ee Correct the spelling of shader files Benau 2016-12-18 14:59:37 +08:00
4477dbb0fb Preload shaders that delay kart selection screen the most Benau 2016-12-18 14:51:27 +08:00
7ea4f30824 Make sure no duplicated shader is added somewhere else Benau 2016-12-18 13:49:58 +08:00
2a9656bfdc Allow all shader files to be loaded only once Benau 2016-12-18 10:51:05 +08:00
7894e5c864 Try to use a smarter approach Benau 2016-12-18 09:27:50 +08:00
da795b69ed Better fix for #2687 auria.mg 2016-12-17 18:49:00 -05:00
2b13a5643e Ignore the "applesmc" accelerator as input device. see #2691 auria.mg 2016-12-17 17:43:03 -05:00
f314c1ff2a Some improvements for multitouch steering GUI Deve 2016-12-17 23:28:22 +01:00
90a556fe9c Try to share shaders across different programs Benau 2016-12-17 15:59:40 +08:00
488af78fa3 Fix #2687, reset cameras properly auria.mg 2016-12-16 21:03:05 -05:00
fc9a51b7f4 Reset cameras when resetting 3 strikes battle. Fixes #2687 auria.mg 2016-12-16 20:33:30 -05:00
5f0a65a07b Fix bug where an animated texture matrix could never be reset to identity. Fixes #2692 auria.mg 2016-12-16 20:21:09 -05:00
1e372d6e77 Added separate queue for storing network events (to reduce synchronisation); replaced vector with std::list in preparation for making the RewindManager threadsafe. hiker 2016-12-17 10:32:21 +11:00
5cde8f785f Fix crash in normal race (RaceEventManager NULL). hiker 2016-12-16 23:26:34 +11:00
79e5aadd4d Avoid using software skinning on empty joint objects Benau 2016-12-16 10:04:35 +08:00
752d847b09 Add the remaining shaders for GL3 hardware skinning Benau 2016-12-15 15:55:14 +08:00
3d814d1036 Fix wrong case handling Benau 2016-12-15 13:30:26 +08:00
035271d6ec Remove GL error about draw2DLine Benau 2016-12-15 12:56:08 +08:00
2e2345289c Don't upload / bind skinning ubo if not supported Benau 2016-12-15 12:17:39 +08:00
1f23e6e783 Remove code used to duplicate VAOs for animated meshes Benau 2016-12-15 11:44:09 +08:00
6baed2b0dd Merge remote-tracking branch 'origin/master' into hardware_skinning Benau 2016-12-15 10:01:12 +08:00
a696fd6dff Add transparent skinned mesh shader Benau 2016-12-15 09:52:02 +08:00
77c14152c2 The server now uses the RewindManager to receive network events and takes the kart input from this queue of events. hiker 2016-12-15 08:12:04 +11:00
95ca3fcac1 Try to fix rare GUI crash, likely caused by pushing a screen in the network thread while the gui is being drawn. Made the messages causing this synchronous, i.e. executed by the main thread. hiker 2016-12-14 17:23:22 +11:00
85bd8c3146 Add unlit and normal map skinned mesh shader Benau 2016-12-14 16:28:37 +08:00
177c8c8f63 Merge remote-tracking branch 'origin/simplify-world' into game_protocol hiker 2016-12-13 17:17:25 +11:00
4ee6f6315f Made World::m_weather a singleton to further remove dependencies on World. hiker 2016-12-13 17:14:29 +11:00
32f2196201 Removed unnecessary #include world.hpp. hiker 2016-12-13 17:13:54 +11:00
ed7574ca85 Merge remote-tracking branch 'origin/master' into simplify-world hiker 2016-12-13 09:19:24 +11:00
4d406490e1 Made ScriptingEngine a singleton and removed it from World, which reduces more dependencies on world. hiker 2016-12-13 09:18:59 +11:00
b12453e9ca Made Physics a singleton, removing the accessor functions from World. Removes dependency on World for a few files. hiker 2016-12-13 08:31:08 +11:00
cd149ab5d7 Moved m_track out of World into a static m_track in Track. Makes world smaller and removes a few dependencies on World. hiker 2016-12-13 07:53:33 +11:00
abe4ae2d6a Fix server only stk Benau 2016-12-12 13:54:43 +08:00
c8e5238ce2 Merge remote-tracking branch 'origin/master' into hardware_skinning Benau 2016-12-12 13:45:04 +08:00
269e440d0c Avoid translating artist debug mode only fps string Benau 2016-12-12 13:43:01 +08:00
a420b09363 Disable all karts animation if UBO size not big enough Benau 2016-12-12 13:24:34 +08:00
044e8c52e1 Fix tabs added in previous commit, used spaces instead... auria.mg 2016-12-11 20:19:58 -05:00
ab7ded308a Make presentation of kart characteristics uniform and indepdendent of difficulty. Fixes #2684, fixes #2539 auria.mg 2016-12-11 20:16:44 -05:00
aaecd58fc0 Adding appveyor config file (#2652) Corentin Pazdera 2016-12-12 01:52:15 +01:00
62e1a2ddcc Add a little more BSD detection (#2685) Daniel Ölschlegel 2016-12-12 01:16:47 +01:00
244c812cf3 Add travis server only matrix configuration (#2682) Daniel Butum 2016-12-12 02:15:37 +02:00
8785ddf148 Moved force-fog settings into track. hiker 2016-12-12 08:05:07 +11:00
4327885f07 Add alpha test skinned mesh instanced shaders Benau 2016-12-12 01:00:57 +08:00
e9b68a8a1f Use a non-hardcoded values for mat4 array (max 1024) Benau 2016-12-11 15:50:53 +08:00
f6490b6fa6 Allow array to capture lambada Benau 2016-12-11 13:21:17 +08:00
ceef7495d2 Enable culling for animated mesh Benau 2016-12-11 11:01:02 +08:00
fcd1e2830e Use callback function to directly upload joints without copying Benau 2016-12-10 16:16:40 +08:00
8ca0c54bdc Merge remote-tracking branch 'origin/master' into hardware_skinning Benau 2016-12-10 10:09:30 +08:00
ae0b1136f5 better shader for underwater vegetation samuncle 2016-12-09 11:38:56 -05:00
c68492f42b Use a for loop for four bones (thanks leyyin suggestion!) Benau 2016-12-09 23:21:41 +08:00
94f6d09bf5 Allow indirect and azdo shadow rendering for skinned mesh Benau 2016-12-09 22:37:17 +08:00
f2422317ba Auto fallback to software skinning if not supported Benau 2016-12-09 20:26:26 +08:00
76e070b709 Allow GL3 to have hardware skinning Benau 2016-12-09 18:41:13 +08:00
b7e047b4c1 Avoid using else if in skinning vertex shader Benau 2016-12-09 14:16:30 +08:00
22092e6459 Moved background/clear color from world to irr_driver. hiker 2016-12-09 17:14:04 +11:00
b73d08d089 Removed unnecessary cast. hiker 2016-12-09 16:39:59 +11:00
0a2ea4bd08 Removed unused functions. hiker 2016-12-09 16:39:37 +11:00
a8d3b6b0df Fixed compiler warning. hiker 2016-12-09 09:18:56 +11:00
04d1d4817a Removed KartUpdate protocol (which breakes online play). hiker 2016-12-09 09:00:20 +11:00
4d065f67e6 Started to introduce GameProtocol (which will combine several individual protocols. hiker 2016-12-08 09:02:10 +11:00
21d9117b2d Fix matrix4 pointer in windows Benau 2016-12-08 16:12:54 +08:00
dbfaf2105b Merge remote-tracking branch 'origin/master' into nw hiker 2016-12-08 13:36:36 +11:00
fed12f774c Fixed potential deadlock, made debug output more useful. hiker 2016-12-08 09:46:44 +11:00
407ed319de Show debug info about total skinning joints being calculated Benau 2016-12-07 16:26:22 +08:00
d21e5e0f76 Make skinning offset changeable by culling Benau 2016-12-07 16:08:57 +08:00
fcebb5c2e6 Fix crash with normal map skinned mesh Benau 2016-12-07 09:29:40 +08:00
ac8d7aa8c7 Try to fix the build Benau 2016-12-07 08:18:19 +08:00
a3905a1e19 Allow tangent mesh to be converted Benau 2016-12-07 08:07:01 +08:00
66f57ada61 Fixed a crash when GLES device is re-created Deve 2016-12-07 00:07:22 +01:00
32daf4ce29 Removed unused functions. hiker 2016-12-07 09:34:33 +11:00
5fad8a135e Destroy egl context on exit Deve 2016-12-06 23:23:12 +01:00
c013fcea61 Allow to log messages to file on android Deve 2016-12-06 23:13:10 +01:00
57d9e83ed4 First version of hardware skinning Benau 2016-12-07 02:15:11 +08:00
95e627c004 Fixed pi compilation. hiker 2016-12-07 00:28:36 +11:00
63fe4373a8 Removed unnecessary #ifdef. hiker 2016-12-06 21:50:23 +11:00
8b806dd35a Fixed compiler warnings. hiker 2016-12-06 18:46:03 +11:00
1939075a1b Merge remote-tracking branch 'origin/master' into nw hiker 2016-12-06 18:32:04 +11:00
fdfb56ddf8 Fix server-only compilation. hiker 2016-12-06 18:10:31 +11:00
746bac00ce Merge remote-tracking branch 'origin/new-pi' into nw hiker 2016-12-06 09:26:07 +11:00
526b2a8f0d Added two more graph connections. hiker 2016-12-06 09:22:13 +11:00
79ad569542 Only allow LAN connections for LAN servers (previously anyone with the IP address could connect, even from the outside). Added new --public-server command line option to enable public WAN server. hiker 2016-12-06 09:10:05 +11:00
23883b83c1 Fixed a crash on startup. Deve 2016-12-04 23:23:09 +01:00
c0cd915716 Minor fixes in file manager. Deve 2016-12-04 22:22:42 +01:00
419e9e5351 Some minor modifications that make merging with master easier Deve 2016-12-04 15:11:48 +01:00
2c8b31379b Don't push color info for shadow and rsm Benau 2016-12-04 13:41:28 +08:00
ed43d16a1c Allow alpha test shader to be colorizable Benau 2016-12-04 13:21:39 +08:00

... 62 63 64 65 66 ...