Commit Graph - 2048 - Gitea: Git with a cup of tea

Impaczus/2048

Fork 0

Commit Graph

Select branches

Hide Pull Requests

gh-pages

master

#1

#100

#102

#102

#103

#103

#104

#104

#110

#110

#111

#111

#112

#115

#118

#118

#119

#119

#123

#123

#124

#124

#125

#125

#127

#127

#128

#13

#130

#130

#131

#131

#132

#132

#134

#134

#135

#135

#136

#136

#137

#137

#138

#138

#140

#141

#141

#142

#142

#143

#143

#145

#145

#147

#147

#148

#148

#149

#15

#150

#150

#151

#151

#152

#152

#154

#155

#155

#156

#156

#157

#157

#158

#159

#16

#160

#160

#161

#161

#163

#163

#164

#164

#165

#165

#166

#166

#167

#167

#169

#169

#17

#17

#170

#170

#171

#171

#173

#173

#174

#174

#175

#175

#176

#176

#177

#177

#178

#178

#179

#179

#181

#181

#182

#182

#183

#183

#184

#184

#186

#186

#187

#187

#188

#19

#19

#192

#192

#193

#193

#2

#20

#202

#202

#205

#205

#206

#206

#207

#207

#208

#208

#21

#21

#210

#210

#212

#212

#213

#213

#215

#215

#217

#217

#218

#218

#219

#22

#222

#222

#223

#223

#227

#227

#228

#228

#23

#23

#231

#231

#232

#232

#233

#234

#235

#235

#236

#237

#237

#238

#238

#239

#240

#241

#241

#242

#242

#246

#246

#248

#248

#250

#250

#252

#252

#254

#254

#255

#255

#257

#257

#258

#259

#259

#26

#26

#260

#260

#261

#261

#264

#264

#265

#265

#269

#269

#27

#27

#270

#270

#271

#271

#272

#272

#273

#273

#275

#275

#276

#277

#277

#278

#279

#28

#280

#280

#281

#281

#282

#282

#283

#283

#284

#284

#285

#285

#286

#286

#287

#287

#288

#289

#289

#29

#290

#290

#291

#291

#292

#292

#3

#3

#302

#302

#31

#31

#32

#325

#325

#326

#326

#328

#329

#329

#33

#330

#330

#332

#332

#335

#335

#336

#336

#339

#339

#344

#344

#345

#345

#346

#346

#35

#35

#351

#351

#355

#355

#359

#359

#360

#360

#361

#361

#362

#362

#363

#363

#365

#365

#367

#367

#368

#368

#369

#369

#37

#37

#370

#370

#371

#371

#372

#373

#373

#374

#374

#375

#377

#377

#378

#378

#381

#382

#382

#385

#385

#386

#386

#387

#387

#388

#388

#389

#389

#390

#390

#392

#392

#393

#393

#394

#394

#395

#395

#396

#396

#397

#397

#398

#398

#399

#399

#4

#4

#40

#40

#400

#400

#402

#402

#403

#405

#405

#407

#407

#409

#409

#41

#41

#410

#410

#411

#411

#412

#412

#413

#413

#414

#414

#415

#415

#416

#416

#417

#418

#418

#419

#419

#42

#420

#420

#423

#423

#424

#424

#425

#425

#426

#426

#427

#427

#428

#428

#429

#429

#43

#430

#431

#431

#432

#432

#433

#433

#434

#434

#435

#435

#436

#436

#437

#437

#438

#438

#439

#439

#44

#440

#440

#441

#442

#443

#443

#444

#446

#446

#447

#447

#448

#449

#449

#45

#45

#451

#451

#452

#452

#453

#453

#454

#454

#456

#456

#457

#457

#458

#458

#459

#459

#46

#46

#460

#460

#461

#462

#462

#463

#465

#465

#466

#466

#467

#467

#468

#468

#469

#470

#470

#473

#473

#477

#479

#479

#48

#481

#481

#483

#484

#484

#485

#485

#486

#486

#487

#488

#489

#49

#49

#490

#491

#492

#492

#493

#494

#495

#496

#497

#498

#499

#50

#500

#501

#502

#504

#505

#505

#506

#506

#511

#511

#512

#513

#515

#516

#517

#518

#519

#520

#522

#523

#523

#524

#524

#525

#526

#526

#527

#528

#528

#529

#529

#530

#531

#531

#534

#535

#535

#538

#538

#541

#544

#547

#548

#549

#549

#55

#55

#550

#551

#554

#554

#555

#556

#556

#557

#557

#558

#559

#56

#561

#562

#562

#563

#564

#565

#566

#567

#567

#568

#569

#57

#570

#571

#572

#573

#574

#574

#575

#575

#576

#577

#578

#579

#58

#580

#581

#582

#583

#583

#584

#585

#585

#586

#587

#587

#589

#589

#59

#59

#590

#590

#591

#591

#592

#592

#593

#594

#595

#596

#597

#598

#599

#599

#600

#601

#601

#603

#604

#605

#605

#606

#606

#607

#608

#609

#61

#61

#610

#611

#612

#612

#613

#613

#614

#615

#616

#616

#618

#619

#619

#62

#62

#621

#621

#63

#63

#65

#65

#66

#68

#68

#70

#70

#73

#75

#75

#76

#76

#78

#78

#80

#80

#81

#81

#82

#84

#84

#85

#87

#87

#88

#88

#90

#90

#91

#91

#92

#92

#93

#93

#94

#95

#95

#96

#99

#99

af683a7856 clear game state on game over Gabriele Cirulli 2014-03-22 18:33:24 +01:00
fa49d3bc5a Merge branch 'master' into gh-pages Gabriele Cirulli 2014-03-22 17:41:12 +01:00
bf1ba513c1 update css Gabriele Cirulli 2014-03-22 17:40:57 +01:00
156ef6e50d Merge pull request #96 from jimminning/patch-3 Gabriele Cirulli 2014-03-22 17:39:02 +01:00
fe04a69ba4 update appcache Gabriele Cirulli 2014-03-22 17:33:34 +01:00
a0ca822b4f Merge branch 'master' into gh-pages Gabriele Cirulli 2014-03-22 17:32:17 +01:00
3cfdcca0d2 increase margin above game field Gabriele Cirulli 2014-03-22 17:31:55 +01:00
f3c41d72b7 Merge branch 'master' into gh-pages Gabriele Cirulli 2014-03-22 17:28:48 +01:00
e729f7457f bring container margin top into variable and reduce it on mobile Gabriele Cirulli 2014-03-22 17:28:14 +01:00
5afb368c15 merge new game button Gabriele Cirulli 2014-03-22 17:11:51 +01:00
17fe360df1 Merge branch 'master' of https://github.com/gabrielecirulli/2048 Gabriele Cirulli 2014-03-22 17:09:08 +01:00
8ad8318c7c align assignments Gabriele Cirulli 2014-03-22 17:06:37 +01:00
88e084a0d7 remove irrelevant size property on serialized game Gabriele Cirulli 2014-03-22 17:06:32 +01:00
4fa41a045b reintroduce "to" in intro Gabriele Cirulli 2014-03-22 17:01:36 +01:00
560859fcd9 restyle new game button to put it on the right side of the introduction Gabriele Cirulli 2014-03-22 17:00:50 +01:00
4ad15d4cbd add R key to restart game Gabriele Cirulli 2014-03-22 16:35:47 +01:00
a6531b08bd add getter comments Gabriele Cirulli 2014-03-22 16:29:23 +01:00
c48b92689d refactor grid, gamemanager, tile Gabriele Cirulli 2014-03-22 16:24:11 +01:00
4d294cf9b9 remove space to restart game, refactor code slightly Gabriele Cirulli 2014-03-22 16:11:19 +01:00
08c50df938 rename LocalScoreManager to LocalStorageManager Gabriele Cirulli 2014-03-22 15:38:52 +01:00
bd7f8963d0 Merge branch 'resume-game' of github.com:mfrederiksen/2048 into mfrederiksen-resume-game Gabriele Cirulli 2014-03-22 15:35:51 +01:00
17f0f57b98 Update main.scss Jim Minning 2014-03-22 07:28:51 -04:00
6c12037b2a Update README.md Gabriele Cirulli 2014-03-21 15:33:51 +01:00
03052c9a27 Merge pull request #85 from MaciejCzyzewski/patch-2 Gabriele Cirulli 2014-03-21 15:33:08 +01:00
6c8d94c0cf set black translucent bar on the web app Gabriele Cirulli 2014-03-21 13:04:29 +01:00
82e55988b4 improve appcache Gabriele Cirulli 2014-03-20 23:10:22 +01:00
864a6c9a6a Merge branch 'master' into gh-pages Gabriele Cirulli 2014-03-20 22:59:33 +01:00
a875a3ab96 match and replace the "Updated" comment Gabriele Cirulli 2014-03-20 22:59:00 +01:00
fb2e012f06 Merge branch 'master' into gh-pages Gabriele Cirulli 2014-03-20 22:40:37 +01:00
9ca6e3c788 Update README.md, centered screenshot! Maciej A. Czyzewski 2014-03-20 22:01:34 +01:00
6a4b3ec322 add basic rake file with appcache:update task Gabriele Cirulli 2014-03-20 19:57:48 +01:00
856e168c32 Merge pull request #82 from TheSavior/appcache Gabriele Cirulli 2014-03-20 19:41:07 +01:00
95ca668676 Update README.md Gabriele Cirulli 2014-03-19 19:17:32 +01:00
40fc9014eb credit elektryk Gabriele Cirulli 2014-03-19 15:11:20 +01:00
36222ca5fb Merge branch 'master' into gh-pages Gabriele Cirulli 2014-03-19 14:49:03 +01:00
b6e48e2f24 update scss Gabriele Cirulli 2014-03-19 14:45:54 +01:00
2056ed480d Merge branch 'WP_touch_events' of github.com:elektryk/2048 into elektryk-WP_touch_events Gabriele Cirulli 2014-03-19 14:42:12 +01:00
02a24c0610 Added persistence of game state to localstorage after each move Added rebuilding of game state from localstoage on page load Added New Game button to allow game restarts now that refreshes resume the game Mark Frederiksen 2014-03-18 14:48:55 -04:00
941e6eea99 Merge pull request #58 from imcotton/tweet-links Gabriele Cirulli 2014-03-15 00:26:37 +01:00
f57c8b052b shorten links while tweeting, plus to ensure original counts Cotton Hou 2014-03-15 06:39:45 +08:00
af61d052cb remove twitter uri Gabriele Cirulli 2014-03-14 23:09:25 +01:00
907aff4266 remove git.io uri Gabriele Cirulli 2014-03-14 23:07:57 +01:00
001a5b9ea2 merge threshold change Gabriele Cirulli 2014-03-14 18:32:22 +01:00
01264c3252 set mobile threshold slightly wider than the board size Gabriele Cirulli 2014-03-14 18:31:04 +01:00
90f9541b1d Merge pull request #56 from imcotton/tweet-links Gabriele Cirulli 2014-03-14 18:25:36 +01:00
887c6b4cfe shorten links while tweeting, ref #34 Cotton Hou 2014-03-15 01:13:21 +08:00
c6d4e4f29f merge super tiles Gabriele Cirulli 2014-03-14 13:59:04 +01:00
f732d4f547 remove debug logging Gabriele Cirulli 2014-03-14 13:56:38 +01:00
db0dc7eae1 rename keep playing to keep going Gabriele Cirulli 2014-03-14 13:50:57 +01:00
f663e17a4b add styling for super tiles Gabriele Cirulli 2014-03-14 13:50:49 +01:00
10c72a76b3 rename tile-gold to tile-super Gabriele Cirulli 2014-03-14 13:35:42 +01:00
5392893cd6 rename GameOver to GameTerminated to avoid ambiguity Gabriele Cirulli 2014-03-14 13:34:05 +01:00
cfbf74905f refactor code Gabriele Cirulli 2014-03-14 13:27:57 +01:00
a831baed58 merge infinite game Gabriele Cirulli 2014-03-14 13:22:29 +01:00
2bf48efe68 change local storage support check Gabriele Cirulli 2014-03-14 12:33:32 +01:00
15057fd625 Merge pull request #50 from codeKonami/master Gabriele Cirulli 2014-03-14 12:29:05 +01:00
b7f09a4c23 Merge branch 'master' into gh-pages Gabriele Cirulli 2014-03-14 11:48:52 +01:00
8772e1aee9 fix fill mode helper Gabriele Cirulli 2014-03-14 11:47:54 +01:00
9274840ced adding a test to verify the localStorage is supported fixing a bug on private browsing on safari codeKonami 2014-03-14 14:25:26 +13:00
702dd1aa39 Merge branch 'master' into gh-pages Gabriele Cirulli 2014-03-14 00:05:53 +01:00
f943d2a745 Merge pull request #42 from david-risney/fix-try-again-bug Gabriele Cirulli 2014-03-14 00:03:59 +01:00
91f0d161a0 merge transforms Gabriele Cirulli 2014-03-13 23:45:45 +01:00
7c6fd1b2a4 Merge pull request #28 from gabrielecirulli/use-transforms Gabriele Cirulli 2014-03-13 23:14:06 +01:00
74494bb5f5 modify the game to allow using transforms Gabriele Cirulli 2014-03-13 23:11:02 +01:00
92399414eb Merge pull request #48 from iharosi/master Gabriele Cirulli 2014-03-13 23:04:20 +01:00
ca5762310a Merge branch 'master' into use-transforms Gabriele Cirulli 2014-03-13 22:53:06 +01:00
7f1a82e41e minimal-ui added to allow fullscreen on iOS 7.1 Gergely Iharosi 2014-03-13 22:52:25 +01:00
7f187251a8 Windows Phone touch events Marcin Gajda 2014-03-13 20:27:09 +01:00
84fb0327d4 Merge branch 'master' into gh-pages Gabriele Cirulli 2014-03-13 17:10:43 +01:00
d7ef12e41c change site note Gabriele Cirulli 2014-03-13 17:10:14 +01:00
425076c759 add official site note Gabriele Cirulli 2014-03-13 16:51:55 +01:00
c329f35796 Update refs Laurent Margirier 2014-03-13 10:40:59 +01:00
bd62716d60 add touchend event (see PR #32) Laurent Margirier 2014-03-13 10:17:57 +01:00
e7be14d65a compile main.css Laurent Margirier 2014-03-12 13:37:08 +01:00
9626e2b060 Endless Game. Allow user to continue the game. Laurent Margirier 2014-03-12 12:27:27 +01:00
472e30cd35 Ensure the Try Again button actually disappears when selected in Internet Explorer Dave Risney 2014-03-11 22:59:47 -07:00
8b1f3a4f71 Merge branch 'master' into gh-pages Gabriele Cirulli 2014-03-12 21:58:27 +01:00
da75b7a44e Merge pull request #32 from coding46/patch-1 Gabriele Cirulli 2014-03-12 21:56:13 +01:00
1fa911145a remove space between buttons Gabriele Cirulli 2014-03-12 19:05:30 +01:00
d7932b9ddb update button id Gabriele Cirulli 2014-03-12 18:57:20 +01:00
bd8516ac7d Merge pull request #29 from TimPetricola/fix-readme Gabriele Cirulli 2014-03-12 18:04:16 +01:00
fc6206ab39 [BUGFIX] Add touch event handler for retry button G. Bodenschatz 2014-03-12 18:03:11 +01:00
53dd0a79d9 fix paypal image name Gabriele Cirulli 2014-03-12 17:58:23 +01:00
66b623dc1f add paypal donate button Gabriele Cirulli 2014-03-12 17:56:43 +01:00
ffcb772937 Fix README Tim Petricola 2014-03-12 10:56:54 -04:00
886712cc8e add basic css transform positions Gabriele Cirulli 2014-03-12 15:40:49 +01:00
9f1c974499 Merge branch 'master' into gh-pages Gabriele Cirulli 2014-03-12 13:41:16 +01:00
7723697873 Merge pull request #20 from leereilly/ios-launch-icon Gabriele Cirulli 2014-03-12 13:39:04 +01:00
602c1015dd Merge branch 'master' into gh-pages Gabriele Cirulli 2014-03-12 13:37:23 +01:00
7b4c2c171f compile main.css Laurent Margirier 2014-03-12 13:37:08 +01:00
608ca2844b improve code structure in localscoremanager Gabriele Cirulli 2014-03-12 13:35:42 +01:00
52979f1297 Merge branch 'master' into gh-pages Gabriele Cirulli 2014-03-12 13:33:24 +01:00
88278792be small change in scoremanager Gabriele Cirulli 2014-03-12 13:30:50 +01:00
a862d44849 add screnshot section Gabriele Cirulli 2014-03-12 13:15:38 +01:00
0c771c88f0 add mentions to readme Gabriele Cirulli 2014-03-12 13:15:10 +01:00
e61ef18824 Endless Game. Allow user to continue the game. Laurent Margirier 2014-03-12 12:27:27 +01:00
119d8ecdd0 restore ga in gh-pages Gabriele Cirulli 2014-03-12 13:05:55 +01:00
d16f57574f Merge branch 'master' into gh-pages Gabriele Cirulli 2014-03-12 13:05:18 +01:00
d9fef6095f remove analytics from master branch Gabriele Cirulli 2014-03-12 13:04:16 +01:00
03ec53ea25 fix conflict Gabriele Cirulli 2014-03-12 13:03:37 +01:00

1 2 3 4 5 ...