Commit Graph

1652 Commits

Author SHA1 Message Date
6866ff7a98 Fix out-of-bounds traits error on Anama trait
(thanks to Ir the Great for this patch)
2017-12-16 14:40:18 -05:00
51c6bdd5ea Minor scons improvements and fix an error in MinGW build 2017-09-16 22:36:43 -04:00
39f11dddb5 Fix scons+cl build 2017-09-16 13:12:36 -04:00
437b7127d8 Update NSI installer script to include the new-format scenarios,
instead of the old-format scenarios
2017-09-16 13:04:59 -04:00
db6132bb03 Fix MSVC warning in catch.hpp 2017-09-16 12:56:56 -04:00
0a98e62f14 Fix MSVC debug build 2017-09-16 12:54:04 -04:00
e53056a132 Fix a couple of MSVC compiler warnings 2017-09-16 12:46:42 -04:00
9127e4a03f Enable building tests in MSVC 2013 2017-09-16 12:46:31 -04:00
477f6618fd fixup 3582a05 for non-Windows 2017-09-04 23:41:40 -04:00
3582a055e2 Fix Windows build 2017-09-04 23:32:50 -04:00
beadb49217 Fix scons build
Tested on Mac only, but probably also works on Windows/Linux
2017-09-04 20:45:45 -04:00
4c135e57fa Fix scenario editor build 2017-09-04 20:42:37 -04:00
3828b03645 Implement UI scaling option
There are still a few minor visual glitches, but it works pretty well
2017-09-04 15:27:00 -04:00
bdb3cb3df6 Fix an issue with the help buttons for talking and shops not producing anything if you'd seen them once before 2017-09-04 14:37:26 -04:00
9c69e006d8 Refactor rendering to use an SFML view for placing the main UI within the overall interface 2017-09-04 14:36:55 -04:00
e781653483 Xcode: cleanup the schemes and enable running "All" 2017-08-31 22:25:36 -04:00
1bfaab8afc fixup scons script 2017-08-31 22:06:43 -04:00
C.W. Betts
3c57e51d47 OS X: Use fileSystemRepresentation when using low-level file paths:
This should cause less breakage on APFS.
2017-08-31 21:52:59 -04:00
C.W. Betts
1b210d4358 OS X: Fix a few memory leaks. 2017-08-31 21:50:48 -04:00
8b727a4ba5 Merge pull request #58 from MaddTheSane/ostypeOpen 2017-08-30 00:16:35 -04:00
9d86053817 Fix up MSVC project file for the major reorganization 2017-08-30 00:09:01 -04:00
7e7f3d2b81 Merge mac into windows 2017-08-27 23:37:37 -04:00
a31797582a Some fixups, mainly to support MinGW builds 2017-08-27 23:29:00 -04:00
C.W. Betts
44b586fe90 As a general rule, use fileSystemRepresentation if passing NSStrings to lower-level open commands.
This will be especially true for APFS volumes.
2017-07-02 15:30:54 -06:00
C.W. Betts
56a1f766e2 Allow selecting files via their OSTypes. 2017-07-02 15:29:24 -06:00
40e60effb1 Merge pull request #57 from MaddTheSane/moreOSXIconSize
Add 512 and Retina 256 to the Mac icons.
2017-06-30 20:11:06 -04:00
C.W. Betts
2f2e244188 Add 512 and Retina 256 to the Mac icons. 2017-06-30 10:46:29 -06:00
7987680bf4 Simplify some stuff with references 2017-04-15 02:04:11 -04:00
1f9615d185 Add an info structure for eItemType enum 2017-04-15 02:03:42 -04:00
c2ce2a2cd1 Split up the graphtool files 2017-04-14 15:43:07 -04:00
e57441f6a0 Consolidate active quest data into a single map 2017-04-14 11:38:06 -04:00
5b5b2af46f Remove custom erase_if function in favor of std::remove_if
It was originally added before I understood the correct way to use remove_if

As a side-effect, remove bad status now also removes forcecage and charm.
2017-04-14 11:37:27 -04:00
936a848166 Move terrain blockage check into cTerrain class 2017-04-14 01:12:56 -04:00
4baac518e9 Move stream operator declarations into the same file as their types 2017-04-14 01:07:21 -04:00
e98f9381fe Move special node category into the node properties struct 2017-04-14 00:50:38 -04:00
791c2a27d4 Update style guide on header order 2017-04-14 00:28:12 -04:00
d5a02fa4cb Ignore any unpacked scenarios in the rsrc subtree 2017-04-14 00:27:20 -04:00
82abdab695 Major code reorganization
This commit only updates the XCode project for the changes.
A later commit each will update it for scons and MSVC.

A few actual changes are mixed in:
- Add a prefix header for a handful of common definitions
- Moved current_cursor into the Cursor class as a static member
- Removed the make_cursor_sword and make_cursor_watch functions
- Include tests in the All target
- Remove redundant -l flags for Common and Common-Party (since they're included in the Link phases anyway)
2017-04-14 00:24:29 -04:00
b624841bea Windows/ScenEd: Enable undo/redo as appropriate 2017-04-12 02:03:47 -04:00
73f49725b4 Fix error in redo code 2017-04-12 02:03:38 -04:00
c9e265ca62 Windows: Change several menu mnemonics and fix create town menuitem not working 2017-04-12 00:51:21 -04:00
7b08835bf9 Fix crash if a display message node referenced only empty strings 2017-04-12 00:50:15 -04:00
766853d7a4 Fix unit tests 2017-04-11 20:42:25 -04:00
945a7a9e5a Fix boats/horses not appearing 2017-04-11 20:03:54 -04:00
d85321747d Fix issues with items not appearing 2017-04-11 19:55:37 -04:00
32402e77b5 Simplify town entry code with references 2017-04-11 19:25:51 -04:00
ce8ed29c67 Some indentation fixes 2017-04-11 18:57:25 -04:00
7d686042f4 Scenario Editor: Remove Edit Boats/Horses option from menu since it no longer functions 2017-04-11 18:43:09 -04:00
10832a3ed4 PC Editor: Fix item menus for scenarios with less than 400 or more than 403 items.
- On Mac, Items 2 - 4 would give you the wrong item.
- On both Windows and Macs, items at the end of the list might be missing altogether.
2017-04-11 18:36:39 -04:00
d588efd11b PC Editor: Fix items not loading 2017-04-11 18:00:41 -04:00