porymap

Leahnaya/porymap

Fork 0

mirror of https://github.com/huderlem/porymap.git synced 2026-08-13 04:15:45 -05:00

Commit Graph

Select branches

Hide Pull Requests

clang-format

collab

dev

master

stamps

#101

#105

#106

#108

#111

#112

#114

#115

#116

#119

#121

#122

#124

#125

#126

#127

#129

#130

#133

#134

#135

#138

#139

#141

#144

#150

#151

#152

#153

#155

#162

#163

#166

#167

#170

#171

#172

#187

#188

#192

#193

#194

#195

#198

#200

#201

#202

#204

#205

#206

#207

#208

#209

#212

#215

#216

#217

#219

#22

#220

#223

#224

#226

#227

#23

#232

#234

#237

#238

#239

#24

#242

#243

#246

#25

#251

#253

#255

#258

#261

#265

#266

#268

#270

#271

#272

#273

#275

#276

#277

#278

#280

#282

#283

#285

#286

#287

#290

#293

#295

#296

#299

#30

#30

#300

#301

#302

#303

#304

#306

#310

#312

#313

#314

#316

#317

#318

#319

#32

#320

#321

#322

#323

#324

#325

#326

#328

#330

#331

#338

#339

#341

#342

#343

#344

#345

#346

#348

#349

#350

#351

#352

#353

#354

#356

#357

#359

#36

#360

#361

#365

#368

#370

#372

#374

#375

#376

#38

#382

#383

#384

#387

#39

#39

#390

#391

#392

#393

#394

#396

#398

#399

#40

#401

#402

#405

#408

#41

#410

#411

#412

#413

#419

#423

#424

#425

#428

#432

#435

#436

#438

#439

#440

#442

#445

#446

#447

#448

#452

#453

#455

#456

#457

#460

#463

#464

#465

#466

#468

#470

#471

#473

#474

#475

#478

#479

#48

#480

#481

#482

#485

#489

#492

#495

#496

#497

#504

#505

#506

#511

#512

#513

#514

#514

#515

#518

#520

#521

#522

#529

#53

#531

#534

#535

#536

#537

#538

#539

#54

#543

#552

#554

#559

#56

#569

#573

#574

#575

#578

#579

#580

#581

#582

#584

#588

#59

#590

#592

#593

#598

#60

#601

#602

#603

#605

#606

#607

#609

#610

#612

#612

#613

#617

#619

#621

#625

#626

#633

#636

#637

#652

#655

#66

#665

#667

#668

#669

#67

#670

#671

#673

#677

#678

#679

#681

#682

#684

#688

#689

#692

#693

#694

#696

#697

#700

#700

#703

#704

#705

#706

#709

#712

#713

#714

#715

#716

#717

#718

#719

#721

#722

#723

#724

#726

#731

#734

#74

#740

#741

#746

#748

#75

#750

#751

#754

#756

#758

#759

#759

#76

#760

#761

#763

#766

#767

#768

#769

#77

#772

#779

#78

#787

#79

#799

#799

#80

#801

#801

#802

#807

#86

#91

#93

#95

#96

#97

1.0.0

1.0.16

1.0.18

1.0.20

1.0.22

1.0.24

1.0.26

1.0.29

1.0.32

1.1.0

1.2.0

1.2.1

1.2.2

2.0.0

20181010215730-2afaeaa

20181010221045-a5e14b4

20181010222727-77b4971

20181010225700-74a1514

20181010230816-c81ecd3

20181010231541-313fa19

20181010232237-735de44

20181010233211-d248054

20181010233938-d9c9e0a

20181010234413-d9c9e0a

2de06af-mac

3.0.0

3.0.1

360ca9e-mac

4.0.0

4.1.0

4.2.0

4.3.0

4.3.1

4.4.0

4.5.0

5.0.0

5.1.0

5.1.1

5.2.0

5.3.0

5.4.0

5.4.1

52173f1-mac

522c255-mac

5a60cbd-mac

6.0.0

6.1.0

6.2.0

6.3.0

6.3.1

8defefc-mac

9d8382f-mac

ceca5d4-mac

d728c43-mac

qt-static-6.0.1-windows

qt-static-6.9.0-windows

v1.0.2

v1.0.3

7758124235 Clear existing map layouts when opening a new project Marcus Huderle 2018-12-25 13:36:39 -06:00
1de1ab94ff Emit MAP_GROUPS_COUNT macro to maps.h Marcus Huderle 2018-12-25 13:27:02 -06:00
99a21ccf29 Add porymap config file Marcus Huderle 2018-12-21 09:25:28 -06:00
dcf6b5af6b Fix bug where tilesets were not displaying their bottom row Marcus Huderle 2018-12-20 18:26:27 -06:00
220d13c335 Properly select an event after creating it Marcus Huderle 2018-12-20 17:46:43 -06:00
b2053e593f Merge remote-tracking branch 'diego/tabbed_events' Marcus Huderle 2018-12-20 17:35:59 -06:00
0c761edb88 Merge branch 'master' of https://github.com/huderlem/porymap Marcus Huderle 2018-12-20 17:35:11 -06:00
40257193a4 Don't crash on startup if recent map can't be loaded. Write logs to porymap.log file Marcus Huderle 2018-12-20 17:30:35 -06:00
9da5d84960 Fix segfault on map switch Diegoisawesome 2018-12-04 22:14:16 -06:00
2799a3b584 Make sure event of type exists first Diegoisawesome 2018-12-04 13:36:22 -06:00
e184ff2a04 Allow scrolling in event tabs Diegoisawesome 2018-12-04 13:06:18 -06:00
1907dcbe1d Remove spinbox from multiple event view Diegoisawesome 2018-12-04 12:58:49 -06:00
15e16798fc Fix double event select change Diegoisawesome 2018-11-30 00:24:56 -06:00
68905aae1c Tabbed events mostly working Diegoisawesome 2018-11-29 21:59:03 -06:00
f0b74ada93 Tabs working Diegoisawesome 2018-11-27 19:39:57 -06:00
4550f80dc4 Begin tabs properly Diegoisawesome 2018-11-13 13:32:36 -06:00
db96e33ffd Begin event view overhaul Diegoisawesome 2018-11-13 11:36:34 -06:00
92b23e515d c define ignore nonexistent values (#56) garak 2018-11-08 18:55:50 -05:00
357db9258f artifacts pls 1.0.32 garak 2018-10-11 08:39:03 -04:00
4cba5bae9c ls 1.0.29 garak 2018-10-11 08:33:26 -04:00
d728c439e2 looking for executable garak 2018-10-11 08:29:17 -04:00
ec991a8af7 backwards tick? 1.0.26 garak 2018-10-11 08:20:36 -04:00
af7c395dc6 jjjj 1.0.24 garak 2018-10-11 08:14:02 -04:00
e9857e18e4 trying again 1.0.22 garak 2018-10-11 08:06:23 -04:00
8dad9c5371 m 1.0.20 garak 2018-10-11 00:00:19 -04:00
e9574dc450 5 1.0.18 garak 2018-10-10 23:53:23 -04:00
4d353cde74 deploy pls 1.0.16 garak 2018-10-10 23:42:17 -04:00
52173f15b7 try it again garak 2018-10-10 23:38:02 -04:00
2de06af766 4 garak 2018-10-10 23:23:40 -04:00
9d8382fc0a 3 garak 2018-10-10 23:19:29 -04:00
5a60cbd3af attemp 2 garak 2018-10-10 23:12:22 -04:00
8defefc50e attempt windows release 1 garak 2018-10-10 23:08:12 -04:00
ceca5d4373 appveyor build attempt 1 garak 2018-10-10 22:56:19 -04:00
360ca9e5bb disable linux deploy garak 2018-10-10 20:47:36 -04:00
d9c9e0adbe it's porymap now smfh garak 2018-10-10 19:37:28 -04:00
d248054ee1 where is app bundle at tho? garak 2018-10-10 19:29:53 -04:00
735de44114 cmath include garak 2018-10-10 19:20:25 -04:00
761c25ee4c Don't reload metatiles from disk when importing tileset image 1.0.0 Marcus Huderle 2018-10-10 18:14:43 -05:00
313fa1904c put config release in right place, donut garak 2018-10-10 19:13:34 -04:00
62c1ed2dc7 Clarify save prompt when closing tileset editor Marcus Huderle 2018-10-10 18:07:55 -05:00
c81ecd332b this maybe for mac? garak 2018-10-10 19:06:02 -04:00
74a151404b ls to find qt garak 2018-10-10 18:54:23 -04:00
77b4971490 multiple os builds? garak 2018-10-10 18:25:12 -04:00
a5e14b40ab email and username? garak 2018-10-10 18:08:22 -04:00
e8d33c04db Merge pull request #48 from phase/master Marcus Huderle 2018-10-10 17:04:45 -05:00
2afaeaacfb test oauth key garak 2018-10-10 17:55:12 -04:00
02cb21c4be ok now? garak 2018-10-10 16:29:10 -04:00
4e2ec23ddd enable all branches hopefully garak 2018-10-10 16:25:49 -04:00
95cea81b3f again plssss garak 2018-10-10 16:18:20 -04:00
4b68a60f52 permit travis branch garak 2018-10-10 16:07:19 -04:00
7098d2859a psl garak 2018-10-10 16:02:57 -04:00
19235ff392 test deploy 2 garak 2018-10-10 15:57:21 -04:00
062c34afff test tags garak 2018-10-10 15:54:03 -04:00
6c131747e7 release upload?? garak 2018-10-10 15:44:44 -04:00
6ee09fab46 closeevent garak 2018-10-10 15:34:47 -04:00
2bccb4f5af travis pls garak 2018-10-10 15:31:22 -04:00
d8e9b28300 cxx flah garak 2018-10-10 15:26:55 -04:00
7008d2a099 explicity c++11 garak 2018-10-10 15:16:53 -04:00
338e67d0c5 clang? garak 2018-10-10 15:12:10 -04:00
42c25195e2 first travis attempt garak 2018-10-10 15:07:24 -04:00
1c3e0b96bd Fix index out of bound error with tileset editing Marcus Huderle 2018-10-09 17:31:12 -05:00
9067a077cf Tidy up tileset editor UI Diegoisawesome 2018-10-08 23:58:26 -05:00
41a0c1d2d2 Change 2x2 limit to 4x2 on tileset editor selection Diegoisawesome 2018-10-08 21:10:57 -05:00
c102a2b7d0 Scroll to selected tile and metatile Diegoisawesome 2018-10-08 14:42:51 -05:00
4c371517e6 Add installation instructions and fix compile issues Jadon Fowler 2018-10-07 20:17:20 -07:00
2d3a10fdd8 Fix bug where map border became visible after editing the border metatiles when 'show borders' is disabled Marcus Huderle 2018-10-06 17:11:40 -05:00
e42c2e1a81 Add edit-undo history to tileset metatile editing Marcus Huderle 2018-10-06 17:07:36 -05:00
888270f3ef Add right-click selection to tileset editor metatile layer item Marcus Huderle 2018-10-06 15:49:26 -05:00
bbfecba1ba Add edit-undo history for tileset palette changes Marcus Huderle 2018-10-05 18:38:11 -05:00
7a47c64509 Display RGB values in tileset palette editor Marcus Huderle 2018-10-05 17:57:55 -05:00
74ce9c9a45 Misc cleanup, and 'Sort by Name' -> 'Sort by Area' Marcus Huderle 2018-10-05 17:39:50 -05:00
cbeb79b7f9 Merge pull request #41 from Diegoisawesome/master Marcus Huderle 2018-10-05 17:41:49 -05:00
7a6354cc0a Redo metatile count fix Diegoisawesome 2018-10-05 13:26:25 -05:00
8a7a4c1e8e Change filter clearing logic Diegoisawesome 2018-10-05 11:23:40 -05:00
0e58fed23b Add map list sorting and filtering Diegoisawesome 2018-10-05 01:02:40 -05:00
54a9d8b23b Merge branch 'master' of github.com:huderlem/porymap Diegoisawesome 2018-10-04 11:03:33 -05:00
52d612c333 pull upstream changes d728c43-mac ceca5d4-mac 9d8382f-mac 8defefc-mac 5a60cbd-mac 522c255-mac 52173f1-mac 360ca9e-mac 2de06af-mac 20181010234413-d9c9e0a 20181010233938-d9c9e0a 20181010233211-d248054 20181010232237-735de44 20181010231541-313fa19 20181010230816-c81ecd3 20181010225700-74a1514 20181010222727-77b4971 20181010221045-a5e14b4 20181010215730-2afaeaa garak 2018-10-03 10:48:27 -04:00
6269d4822a Add filter to UI Diegoisawesome 2018-10-02 21:46:08 -05:00
61ec1af0fb Add tileset palette editor Marcus Huderle 2018-10-02 19:01:41 -05:00
303f31f3d4 Add ability to change tileset metatile counts Marcus Huderle 2018-10-02 19:01:37 -05:00
8db57f3e0c Cleanup tileset editor ui Marcus Huderle 2018-10-02 19:01:34 -05:00
cf150f3ce9 Ask user about unsaved changes when closing tileset editor window Marcus Huderle 2018-10-02 19:01:31 -05:00
da13b8ea5e Enable multi-tile selections in tileset editor Marcus Huderle 2018-10-02 19:01:27 -05:00
3ca284d5f3 Add ability to import new tiles Marcus Huderle 2018-10-02 19:01:24 -05:00
a77b76988b Fix small UI bugs in tileset editor Marcus Huderle 2018-10-02 19:01:21 -05:00
0c7ecebe0b Keep tileset editor in sync with currently opened map Marcus Huderle 2018-10-02 19:01:18 -05:00
8d38783833 Add ability to save tileset changes Marcus Huderle 2018-10-02 19:01:15 -05:00
428548b7e1 Add metatile attribute editing, and add tileset saving Marcus Huderle 2018-10-02 19:01:09 -05:00
322238c7b8 Add metatile layer item Marcus Huderle 2018-09-30 16:15:04 -05:00
ffd769f7ed Add palette and flip selectors to tileset editor Marcus Huderle 2018-09-30 14:54:38 -05:00
9f55dbfa23 Merge branch 'master' of github.com:huderlem/porymap Diegoisawesome 2018-09-30 13:59:27 -05:00
f767d257f0 Start work on tileset editor Diegoisawesome 2018-09-30 13:51:50 -05:00
0bc3513b15 Add tile selector to Tileset Editor window Marcus Huderle 2018-09-30 12:33:58 -05:00
990a4aafb7 Add metatile selector in tileset editor window Marcus Huderle 2018-09-29 15:24:35 -05:00
9abda07c48 Add Tileset Editor window Marcus Huderle 2018-09-29 14:13:07 -05:00
866926daa5 Merge pull request #40 from Diegoisawesome/master Marcus Huderle 2018-09-29 09:24:19 -05:00
fe12e0bde5 Scroll map list to current map Marcus Huderle 2018-09-29 09:22:50 -05:00
7e6726bef7 Round zoom number display to 1 decimal place Marcus Huderle 2018-09-29 09:13:54 -05:00
497f069d20 Restructure source tree Marcus Huderle 2018-09-29 09:10:23 -05:00
d7c98c1e3c Remove accidentally-added files Marcus Huderle 2018-09-29 08:59:47 -05:00