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

02fd5bbea6 Merge branch 'master' into refactor Diegoisawesome 2018-09-27 13:27:57 -05:00
d93d7c26fe Finish renaming ObjectPropertiesFrame Diegoisawesome 2018-09-27 11:23:40 -05:00
c3264b5202 Fix double-clicking on group crash Diegoisawesome 2018-09-27 10:47:05 -05:00
88d1ea846a Fix zoom functionality, change shortcuts Diegoisawesome 2018-09-27 01:14:07 -05:00
6102181738 Move files into src/ Marcus Huderle 2018-09-26 18:33:08 -05:00
911ba64637 Move more ui out of editor Marcus Huderle 2018-09-26 18:30:05 -05:00
ecf9e533d4 Move status bar messages out of Map class Marcus Huderle 2018-09-26 11:38:39 -05:00
06720258f9 Extract image providers Marcus Huderle 2018-09-25 18:13:33 -05:00
afc25805d3 Clean up mainwindow initialization Marcus Huderle 2018-09-24 19:46:09 -05:00
083e8e6101 Move heal location logic out of event class Marcus Huderle 2018-09-24 19:21:10 -05:00
0d33c3aa64 Move event to core/ Marcus Huderle 2018-09-24 19:12:29 -05:00
56499411b1 Move parseutil to core/, and fix include paths during build Marcus Huderle 2018-09-24 19:04:42 -05:00
473cca4eee Rename objectpropertiesframe to eventpropertiesframe and move to ui/ Marcus Huderle 2018-09-24 18:55:58 -05:00
45f5024d11 Move more custom widgets to ui/ Marcus Huderle 2018-09-24 18:49:44 -05:00
d61d33f47f Rename Connection to MapConnection and move to core Marcus Huderle 2018-09-24 11:02:50 -05:00
24e79eb94e Move History and HistoryItem to core/ Marcus Huderle 2018-09-24 10:48:36 -05:00
262c79776e Create new MetatileSelector class and integrate it. Marcus Huderle 2018-09-23 16:32:07 -05:00
113035fa93 Fix bug where selection top-left corner was not calculated correctly Marcus Huderle 2018-09-22 19:20:12 -05:00
6dc1e0eea3 Start refactoring core + ui. Create selectable pixmap item Marcus Huderle 2018-09-22 18:47:28 -05:00
823c99827d Merge remote-tracking branch 'upstream/master' garak 2018-09-21 12:45:40 -04:00
f6f4b4024a Placeholder tile for primary layer when requesting out-of-bounds tile Diegoisawesome 2018-09-21 11:00:23 -05:00
3808750c23 Merge pull request #38 from Diegoisawesome/master Marcus Huderle 2018-09-19 17:32:00 -05:00
cf89d07192 Merge branch 'master2' Diegoisawesome 2018-09-19 12:36:25 -05:00
363ea86a2a Move static tileset vars to Project Diegoisawesome 2018-09-19 12:35:45 -05:00
d0aabdbba1 Use application display name Diegoisawesome 2018-09-19 12:09:11 -05:00
a6fc81ae1a Use project values for tilesets Diegoisawesome 2018-09-18 13:18:12 -05:00
741619a934 Merge remote-tracking branch 'huderlem/master' garak 2018-09-18 13:13:19 -04:00
d66b3868ca Merge pull request #36 from Diegoisawesome/master Marcus Huderle 2018-09-18 08:36:32 -05:00
3b61b1af0b Visual tweaks Diegoisawesome 2018-09-18 00:05:29 -05:00
ef657628fa Fix segfault if metatile count != metatile attrs count Diegoisawesome 2018-09-17 14:23:25 -05:00
43eeffcf75 Fix comment Marcus Huderle 2018-09-16 11:57:16 -05:00
23f2016e26 Update tileset image palette processing, to accompany RGB-indexed images, rather than greyscale Marcus Huderle 2018-09-16 11:21:53 -05:00
b3a30c91ae Properly read dynamically-set warps that use MAP_NONE as their destination Marcus Huderle 2018-09-15 15:25:34 -05:00
80370fdd16 Merge remote-tracking branch 'huderlem/master' garak 2018-09-14 20:09:39 -04:00
a2d95bfc72 Fix more warnings Marcus Huderle 2018-09-14 18:37:44 -05:00
0b07ea63cb Fix memory leak when going back in edit/undo history Marcus Huderle 2018-09-14 18:37:41 -05:00
0b8c71119d Fix warnings Marcus Huderle 2018-09-14 18:37:36 -05:00
c612140878 Merge pull request #32 from garakmon/rebranding Marcus Huderle 2018-09-14 17:55:47 -05:00
459c5e836c Merge remote-tracking branch 'origin/master' into rebranding Marcus Huderle 2018-09-14 12:32:56 -05:00
b6da1bc233 Merge remote-tracking branch 'huderlem/master' garak 2018-09-14 11:21:11 -04:00
afb5586b36 delete line garak 2018-09-14 10:39:00 -04:00
9916295e41 Create LICENSE.md Marcus Huderle 2018-09-14 08:44:21 -05:00
5c73efc738 Merge remote-tracking branch 'huderlem/master' garak 2018-09-14 01:34:54 -04:00
6131194065 Add keyboard shortcuts for each of the editing tool buttons Marcus Huderle 2018-09-13 17:48:43 -05:00
fa2574ad48 Add cursor for 'shift' mode Marcus Huderle 2018-09-13 17:48:40 -05:00
ab0eff8c20 Shift tool, shift+click for smart paths, middle button click for fill, and toggle border/connections visibility Marcus Huderle 2018-09-13 17:48:32 -05:00
6d19da8d88 Merge pull request #25 from garakmon/cursors Marcus Huderle 2018-09-13 17:02:22 -05:00
0932ce6711 Change text to 'Cursor Icons' Marcus Huderle 2018-09-13 17:01:49 -05:00
532afc5385 Merge remote-tracking branch 'origin/master' into cursors Marcus Huderle 2018-09-13 16:54:16 -05:00
4313662200 Merge pull request #24 from garakmon/open-scripts Marcus Huderle 2018-09-13 16:41:38 -05:00
b0e7364349 pretmap -> porymap, add icon v1 garak 2018-09-12 22:10:28 -04:00
475f63d0f2 small fix garak 2018-09-12 21:10:11 -04:00
ece612a865 using different cursors is checkable and added to settings garak 2018-09-12 20:43:04 -04:00
62b9d97a31 Smart path now draws a 2x2 region, instead of 3x3 region Marcus Huderle 2018-09-12 17:44:40 -05:00
2a00e8aee9 Fix bug when saving heal locations for maps with multiple heal locations Marcus Huderle 2018-09-12 17:44:37 -05:00
23efdc2bea Support spritesheets instead of individual frames for event object pics Marcus Huderle 2018-09-12 17:44:30 -05:00
5e42b07bff Merge pull request #22 from garakmon/heal Marcus Huderle 2018-09-12 09:39:55 -05:00
e0e8dc321f Merge pull request #23 from garakmon/warp-id Marcus Huderle 2018-09-12 09:21:32 -05:00
65adc2bdd0 Use Qt built-in functionality for opening scripts with default editor Marcus Huderle 2018-09-12 09:17:50 -05:00
5b96af47db Add reticule-styled cursors Marcus Huderle 2018-09-12 08:52:24 -05:00
f5f763d32c add move drag mode with changing cursor garak 2018-09-11 20:52:57 -04:00
378d5bb660 Open Map Scripts button garak 2018-09-11 20:41:58 -04:00
d7f04568ec zero-base index warps garak 2018-09-11 20:39:41 -04:00
67f7fca399 add HealLocation fly spots garak 2018-09-11 20:37:36 -04:00
d3bfd9a7ba Merge pull request #3 from yenatch/master v1.0.3 Garak 2018-07-29 17:22:36 -04:00
6f3c5c25dd Merge pull request #61 from huderlem/master yenatch 2018-07-21 13:39:37 -04:00
95bb802ad0 Fix bug where right-click selecting from the map would cause a map commit Marcus Huderle 2018-07-19 22:49:27 -05:00
6b5ad53733 Rename Block to Metatile Marcus Huderle 2018-07-19 22:44:55 -05:00
6546bcbbd4 Fix memory leak when caching various Layout Blockdata sets Marcus Huderle 2018-07-19 22:37:24 -05:00
21af92b856 Update collision/elevation selection Marcus Huderle 2018-07-19 22:27:40 -05:00
de9bfaa9bb Add ability to select metatile chunks directly from the map area. Redraw collision tiles during undo/redo Marcus Huderle 2018-07-15 09:05:08 -05:00
019a597c28 emerald uses one more secondary tileset palette slot than ruby Marcus Huderle 2018-07-14 08:50:36 -05:00
9b44850f28 Merge pull request #58 from garakmon/master Marcus Huderle 2018-07-13 19:19:50 -07:00
8902102b2c Merge pull request #2 from yenatch/master v1.0.2 Garak 2018-07-13 21:48:50 -04:00
f86cf26d6e Merge pull request #57 from huderlem/dropdowns Marcus Huderle 2018-07-13 18:44:08 -07:00
b05c59bfd8 Better default values for newly-created events Marcus Huderle 2018-07-13 20:39:07 -05:00
fba2ade2bb Provide populated comboboxes and tooltips for (mostly) everything Marcus Huderle 2018-07-13 20:33:49 -05:00
74c2766c01 Double clicking on warp events takes you to the destination map and warp Marcus Huderle 2018-07-11 17:53:43 -05:00
dc6b82b4dc Disable combobox scroll hijacking, and only show one event by default (rather than all) Marcus Huderle 2018-07-11 13:18:50 -05:00
8930b2c01b Prepopulate more dropdowns, and support new macro formats Marcus Huderle 2018-07-11 11:23:55 -05:00
52679eb53f Merge pull request #55 from huderlem/resize yenatch 2018-07-09 22:23:01 -04:00
43119f2b43 Merge pull request #1 from yenatch/master Garak 2018-07-09 20:51:08 -04:00
c1306b4f72 Fix segfault due to dangling event object Marcus Huderle 2018-07-09 18:12:43 -05:00
64095821af Make flood fill respect whole metatile selection, including smart path. Smart path is now a checkbox Marcus Huderle 2018-07-09 17:40:37 -05:00
aafe258842 Respect map dimension changes in undo/redo history Marcus Huderle 2018-07-09 17:40:34 -05:00
37903a5acb Fix bug where map connections didn't visually update when switching back to the collision view Marcus Huderle 2018-07-09 17:40:31 -05:00
514ecb2907 Add map resizing functionality Marcus Huderle 2018-07-09 17:40:28 -05:00
eb0d238a01 Add map dimensions dialog window Marcus Huderle 2018-07-09 17:40:15 -05:00
8d2958c952 Merge pull request #54 from huderlem/tilesets yenatch 2018-07-08 19:05:53 -04:00
48a562d1eb Update map view when tilesets change Marcus Huderle 2018-07-08 11:17:43 -05:00
37529d37ec Add tileset comboboxes, and make metatile area scrollable Marcus Huderle 2018-07-08 10:29:03 -05:00
767407e1a7 Merge pull request #53 from huderlem/border yenatch 2018-07-07 19:35:50 -04:00
5bd88e6fef Add ability to change map border Marcus Huderle 2018-07-07 17:32:54 -05:00
10b6d3a0d3 Merge pull request #52 from huderlem/events yenatch 2018-07-07 15:11:38 -04:00
a9325fc790 Dynamically set event labels Marcus Huderle 2018-07-07 11:57:44 -05:00
fc0cf133b2 Bind to all event combobox value changes Marcus Huderle 2018-07-07 11:21:19 -05:00
ecce7d26f2 Add ability to add all map event types Marcus Huderle 2018-07-07 10:58:25 -05:00
76649ea867 Add menu to 'add event' button Marcus Huderle 2018-07-06 11:08:20 -05:00
f227805b7f fixing build errors garakmon 2018-06-25 10:25:39 -04:00
9c2cf84983 Merge pull request #50 from huderlem/layouts yenatch 2018-06-21 10:28:30 -04:00