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

Mono Color

• 23a20dd736 Clear scripting map overlay when closing project Marcus Huderle 2020-05-13 16:16:51 -05:00
• f172be5500 Update CHANGELOG.md huderlem 2020-05-13 16:01:44 -05:00
• a860f3f110 Support importing FRLG Advance Map metatilesets GriffinR 2020-05-13 15:37:25 -04:00
• bae692699f Update CHANGELOG.md huderlem 2020-05-12 17:34:28 -05:00
• 53ba6f5ab9 Warn when closing with unsaved encounter changes GriffinR 2020-05-11 10:45:11 -04:00
• fcb320bd79 fix crash when attempting to close project that is never opened garakmon 2020-05-11 17:12:37 -04:00
• a47ed7b402 Update INSTALL.md huderlem 2020-05-10 09:59:43 -05:00
• 1cc786547c Update CHANGELOG.md huderlem 2020-05-10 09:54:24 -05:00
• 73b5e2b272 Merge pull request #217 from huderlem/scripting huderlem 2020-05-10 09:50:40 -05:00
• 2161312122 Add optional args to dictate map refresh and commit Marcus Huderle 2020-05-09 11:31:14 -05:00
• 8013921d43 Remove test script Marcus Huderle 2020-05-08 11:42:36 -05:00
• e0afb24002 Merge remote-tracking branch 'origin/master' into scripting Marcus Huderle 2020-05-08 11:35:58 -05:00
• 37c849f9b5 allow current widget to dictate size of stacked widget for metatile/collision and events pages garakmon 2020-04-30 19:44:54 -04:00
• ac92534576 Disallow drawing heal locations GriffinR 2020-04-29 12:38:30 -04:00
• 399474c1f2 Fix heal loc duplicates, rename flyableMaps GriffinR 2020-04-29 12:34:49 -04:00
• f139365faf Add log() to api Marcus Huderle 2020-05-08 11:29:39 -05:00
• 998ea1fcc8 Add custom_scripts project config, and cleanup scripts when switching projects Marcus Huderle 2020-05-08 11:26:23 -05:00
• b8d0268d5d Move script api into separate file Marcus Huderle 2020-05-08 09:59:01 -05:00
• 3c1549cc93 Add setTimeout to script api, and properly refresh scene when overlay is changed Marcus Huderle 2020-05-08 09:46:26 -05:00
• 71242e5714 Add ability to set keyboard shortcuts for custom actions Marcus Huderle 2020-05-08 08:49:29 -05:00
• 7072c001af Implement api for checkboxes Marcus Huderle 2020-05-07 20:13:56 -05:00
• bf64764103 Implement the rest of the palette api Marcus Huderle 2020-05-07 20:00:14 -05:00
• 09a892f525 Add ability to register custom actions Marcus Huderle 2020-05-03 11:28:02 -05:00
• 434bafe0b2 Call on_block_changed from more places Marcus Huderle 2020-05-03 10:48:48 -05:00
• 0ef3c6a898 Add palette preview scripting commands Marcus Huderle 2020-05-03 10:31:44 -05:00
• 8697adf186 Add true tileset scripting functions Marcus Huderle 2020-05-03 10:00:56 -05:00
• 567a45b7e4 Implement some overlay functions and on_map_opened callback Marcus Huderle 2020-05-02 16:25:35 -05:00
• 95012838fd Implement more map api functions Marcus Huderle 2020-04-30 18:30:24 -05:00
• d685718f8d Implement three map scripting functions Marcus Huderle 2020-04-29 20:41:19 -05:00
• 267cd5e2cb Implement proof of concept for scripting capabilities Marcus Huderle 2020-04-26 19:38:20 -05:00
• 37ab54019b Release 4.0.0 4.0.0 Marcus Huderle 2020-04-28 20:07:55 -05:00
• dd359d03f8 Update CHANGELOG.md huderlem 2020-04-28 19:50:15 -05:00
• 16b451ab19 Extend min/max connection offsets to player's view Marcus Huderle 2020-04-28 19:37:38 -05:00
• 5aea9e7dd0 Update CHANGELOG.md huderlem 2020-04-28 19:23:04 -05:00
• f6cdd700b8 Merge pull request #195 from garakmon/merge-tabs huderlem 2020-04-28 19:11:40 -05:00
• 438a36f29a Remove spacing between top tab bar and main contain frames Marcus Huderle 2020-04-28 19:09:42 -05:00
• 6a27536cbb Automatically select the newly-created event via the Pencil tool Marcus Huderle 2020-04-26 19:47:57 -05:00
• 333fe69dd8 keep selected tool when switching tabs garakmon 2020-04-26 18:55:18 -04:00
• f57ef7a819 change main tab for every click garakmon 2020-04-21 16:15:36 -04:00
• 9e883a8a2f remember edit mode in map tab garakmon 2020-04-21 15:12:20 -04:00
• 7e039121bb fix mainwindow ui conflicts garakmon 2020-04-21 14:08:44 -04:00
• ccccb7cec0 fix bug with adding new widget to event frame outside of a paint event garak 2020-01-02 14:59:31 -05:00
• b5adbe782d extend most toolbuttons for use in event editing garak 2019-11-02 14:40:43 -04:00
• bf58549666 update midnight theme disabled widgets, disable some ui in event tab garak 2019-11-01 23:08:45 -04:00
• fa42beac1d update ui so that map and events tabs share widgets garak 2019-11-01 21:19:39 -04:00
• c0674d9676 Merge pull request #200 from garakmon/closeproject huderlem 2020-04-25 16:28:02 -05:00
• d2ed1701bf Update INSTALL.md huderlem 2020-04-25 16:27:12 -05:00
• a3d10ef306 Set border visibility after redo/undo GriffinR 2020-04-25 15:02:22 -04:00
• b9522c24f5 Centralize file-changed logic in the callback. Ignore watched files for 5 seconds, when saving them. On Windows, there is a fuzzy delay between the time a file is written and when the signal fires in Qt, and we can't rely on blocking signals or temporarily removing the watched filepaths. It also fires three or four duplicate times for a single file. Marcus Huderle 2020-04-25 16:11:14 -05:00
• 5b26ba678b Remove qstringhash implementation needed by older versions of Qt Marcus Huderle 2020-04-24 19:21:09 -05:00
• 52596ea38c Merge pull request #209 from GriffinRichards/fix-ttype garak 2020-04-21 19:05:54 -04:00
• d1853a576b Use first trainer type constant for new objects GriffinR 2020-04-21 19:03:00 -04:00
• dba9d866d8 Merge pull request #208 from GriffinRichards/fix-frlg garak 2020-04-21 16:32:22 -04:00
• 1bd1db2a7d Re-enable RSE-specific events when switching projects GriffinR 2020-04-21 16:31:24 -04:00
• b849ace6e2 fix mainwindow.ui action tag garakmon 2020-04-21 16:22:09 -04:00
• 03082e5920 Merge branch 'master' into closeproject garak 2020-04-20 22:05:28 -04:00
• 4d2fa5ee38 show file changed warning once at a time garakmon 2020-04-20 22:02:14 -04:00
• 401d2e4884 let user change some config settings garakmon 2020-04-20 21:54:16 -04:00
• f07422585b Fix typo Marcus Huderle 2020-04-18 14:06:30 -05:00
• bb6dbedabf Add ability to export map stitch images. Marcus Huderle 2020-04-18 13:07:41 -05:00
• 800d584eb5 update icon garakmon 2020-04-20 20:18:24 -04:00
• 141f0fa773 Fix adding new mapsec regression GriffinR 2020-04-20 16:31:58 -04:00
• 1b3d4a44e0 Forbid . and - in new tileset names GriffinR 2020-04-20 16:48:19 -04:00
• 4a23c90695 Merge pull request #205 from garakmon/encord garak 2020-04-20 14:27:47 -04:00
• 05fe994e32 update changelog garakmon 2020-04-20 14:26:16 -04:00
• df8dac965f move fileWatcher signals to project class, block when saving garakmon 2020-04-11 20:39:50 -04:00
• 96a870552e monitor files for changes garakmon 2020-04-08 00:42:38 -04:00
• 6026266afd add File>Reload Project garakmon 2020-04-07 20:25:09 -04:00
• ca5a0247f7 delete project with editor garakmon 2020-04-07 17:45:56 -04:00
• 0e9deff4bc clear config data between loads garakmon 2020-04-07 14:44:14 -04:00
• c0bffa0107 add some destructors, prevent value set on combobox update garakmon 2020-04-07 14:20:31 -04:00
• 91f8db10a5 Merge pull request #192 from GriffinRichards/pokefirered garak 2020-04-20 14:05:27 -04:00
• e5122ef94f use ordered map for wild encounter json garakmon 2020-04-20 10:18:03 -04:00
• 0c92dc05da Save metatile attributes label in new order for FRLG GriffinR 2020-04-20 13:28:56 -04:00
• d91107a07d Read callback_label for FRLG GriffinR 2020-04-19 18:23:37 -04:00
• f2ae83b33e Use metatile attributes path from header GriffinR 2020-04-19 18:11:45 -04:00
• 5f16ae7dd0 Use value() instead of at() for defaults GriffinR 2020-04-19 10:16:49 -04:00
• 8c428c578b Merge branch 'master' into pokefirered GriffinR 2020-04-19 09:48:21 -04:00
• 799e5537f9 add tsl::ordered_map for json objects, update project code to save json files with new ordered object garakmon 2020-03-05 22:46:25 -05:00
• 12614a174a modify Json::dump to preserve our format garakmon 2020-03-05 16:38:45 -05:00
• 7bef1eb1e1 convert to use QVector garakmon 2020-03-05 11:40:07 -05:00
• 8cb2e6e2ba add json library, begin modifications garakmon 2020-03-05 11:23:17 -05:00
• ef5ba968b1 do not allow selection of invalid metatiles garakmon 2020-04-09 15:12:52 -04:00
• 3a52c8680c Merge pull request #201 from garakmon/tabbing garak 2020-04-08 22:13:03 -04:00
• d3c212edb3 allow TAB key to navigate through encounter table widget garakmon 2020-04-08 22:12:20 -04:00
• 129db88453 Minor cleanup GriffinR 2020-04-06 12:09:45 -04:00
• c9b6f87e06 Apply undo/redo to border drawing GriffinR 2020-04-05 11:56:13 -04:00
• d5908c0045 Draw border up to players view GriffinR 2020-04-05 00:03:36 -04:00
• d4cf3edfc7 Use default tileset for invalid tilesets, fix segfault caused by loadMapLayout GriffinR 2020-04-04 14:14:16 -04:00
• e4a41cf201 Align border blocks GriffinR 2020-04-03 16:29:40 -04:00
• c28730e834 Fix crash with open windows when switching projects GriffinR 2020-03-31 12:41:15 -04:00
• e9210f96aa Merge branch 'master' into pokefirered GriffinR 2020-03-29 13:15:23 -04:00
• 76a8c0dc44 Read trainer type constants GriffinR 2020-03-27 10:51:57 -04:00
• 1a2e7623ef Prefer oamtable name for sprite dimensions GriffinR 2020-03-27 09:22:54 -04:00
• 0fb483b5d3 Editable trainer type, minor fixes GriffinR 2020-03-26 15:11:42 -04:00
• 8e26f4c3f5 Enable readInitialFacingDirections for pokefirered GriffinR 2020-03-26 14:59:33 -04:00
• 9924a36950 Set floor minimum GriffinR 2020-03-24 00:33:10 -04:00
• 3ff5483267 Correctly initialize palette for palette editor GriffinR 2020-03-23 05:14:38 -04:00
• 8137abd656 Disable respawn editing for pokeemerald/pokeruby GriffinR 2020-03-20 13:52:30 -04:00
• 20b112de52 Support editing heal location respawns GriffinR 2020-03-20 13:41:40 -04:00