Commit Graph

997 Commits

Author SHA1 Message Date
864aa95fea Fix various compiler warnings 2022-07-05 09:29:15 -04:00
f5be1d9706 Fix missing override annotations 2022-07-05 09:28:41 -04:00
8d31c27d11 Fix unused element and unhandled switch case warnings 2022-07-05 09:19:32 -04:00
ee5e7fd48c Various fixes to make the project build in Xcode 12 on Catalina
This now requires Boost to be installed by MacPorts. However, we could add the standard Homebrew path to the include path as well to support both.

This also requires SFML and its dependencies to be installed in /Library/Frameworks; it's unclear whether this is reasonable.

Code signing is completely disabled, and Zlib is now loaded as a tbd instead of a dylib. This will probably break for some older computers, but hopefully they can just use the Xcode 4 project instead.

Boost is forcing -mt suffixes on all its libraries. Whatever. We'll just roll with that.
This makes the script work both with and without the suffixes.

Using parentheses instead of braces silences the stupid narrowing warning, so yay.
2022-07-05 00:17:52 -04:00
x-qq
55a105a0f6 make the game buildable on linux (#283)
- Scons -> python3
- include issues
2022-03-13 15:38:22 -04:00
af8f30aaf2 Fix duplicate function definitions 2022-03-13 11:14:08 -04:00
f14c99f14b Split out cContainer, cLed, and cLedGroup into their own files 2020-12-21 17:16:15 -05:00
81c2a084e3 Allow automatically calculating both the width and height of a text label
This fixes welcome dialog links triggering when you hit OK in the right place
2020-12-19 18:10:25 -05:00
99ac7531a8 Links in the welcome dialog are now clickable 2020-12-19 17:51:56 -05:00
27f687806f Implement automatic height calculation for text labels 2020-12-19 17:36:03 -05:00
259e4ac125 Adjust the hilited string rendering to be less reliant on mysterious magic numbers
It still adds a mysterious offset to all text, but the returned rectns are now perfectly aligned to redraw the hilited string.
2020-12-19 17:32:46 -05:00
d7ddaa7cd8 Fix broken colour= in DialogXML and add special link colour 2020-02-26 01:47:32 -05:00
7f12c6eea4 Support underlined text in DialogXML 2020-02-26 01:20:11 -05:00
093be0d99a Merge the two scenario selection dialogs
Now both preset and custom scenarios are joined using the "Start Scenario" button.
Preset scenarios still get special treatment.
2020-02-25 21:08:29 -05:00
49d88c76e2 Add page definition facility to the DialogXML <stack> widget
- New <page> element in <stack>
- Visibility of elements is now remembered when switching pages
- Unstoring a <pict> on a stack page no longer resets default values
- Documentation updated for new features
2020-02-25 21:05:59 -05:00
f0f789913f parseChildControl now returns the control's ID if successful 2020-02-24 00:13:37 -05:00
8f81a3504d Deduplicate child element parsing in DialogXML 2020-02-24 00:07:45 -05:00
3ba6266cd4 Fix editors launching in the top left corner of the screen 2020-02-23 23:29:44 -05:00
19250e9b94 Remove an obsolete variable 2020-02-23 23:25:23 -05:00
c8549ca680 DialogXML: Support <key> in <text> with optional ref= 2020-02-23 23:02:16 -05:00
5b5bda1435 Fix DialogXML crash when parsing <stack> 2020-02-23 22:21:03 -05:00
c65bac2a8f Implement relative positioning system for DialogXML
This allows widgets to be positioned relative to other widgets.

Two dialogs have been converted to use relative positioning.

Also fix some issues with calculating the dialog rect.
2020-02-23 22:00:01 -05:00
9f60f7e378 Implement <key> tag in DialogXML which substitutes a buttons key shortcut into its label 2020-02-21 22:25:48 -05:00
7b93726383 Replace 4-character constants with enums
This covers only the places where they were used to indicate
a preset selection in constructors.

The usage in qdpict where they're actually passed to the Resource Manager,
as well as the 4-character constants representing file types and creator
codes, are still present.
2020-02-21 00:16:58 -05:00
3d7f8f1d2a style fixup 2020-02-20 23:41:55 -05:00
12bde373b1 Refactor dialog parsing to reduce code duplication
- Refactor dialog format parameter management to use a single protected control function
- Format parameters "frame" and "frame style" merged
- Colour is now a first-class format parameter (though it still has a separate setter)
2020-02-20 23:41:40 -05:00
3c748ca071 Fix node step-thru mode remaining active if debug mode disabled 2020-02-19 23:35:50 -05:00
50a5d00360 Merge pull request #260 from x-qq/fix_shop_icons_not_clickable 2020-02-11 08:55:27 -05:00
x-qq
b4bb2dce13 restore click_shop_rect until a better functionality is available 2020-02-11 15:49:49 +02:00
x-qq
d314432664 fix uninitialized debug flags in universe 2020-02-11 15:34:29 +02:00
x-qq
158de40ce3 Fix unclickable shop info icons 2020-02-11 11:35:14 +02:00
feb1045feb Merge pull request #259 from x-qq/fix_incorrect_damage_values_in_transcript 2020-02-10 22:56:59 -05:00
e7a264bb90 Remove non-empty exception specifications, which have been deprecated for nearly ten years now 2020-02-10 22:36:36 -05:00
xq
1d23a55131 Cleanup variable usage that used to be bool 2020-02-11 04:33:34 +02:00
xq
4711871a1c Adjust damage_pc to report damage values as well 2020-02-11 04:24:17 +02:00
xq
9b3db0a5ab Fix incorrect damage values in transcript 2020-02-11 04:06:07 +02:00
43b4379772 Fix Edit Custom Sheets option not working in an unpacked scenario 2020-02-10 08:35:59 -05:00
6c6b24b297 A little graphics reshuffling
- Pointing arrows moved from terscreen to invenbtns
- Target mark moved from trim to invenbtns
- Road pieces moved from trim to fields
- Diagonal pointing arrows added
- trim is now a monochrome image
2020-02-09 23:12:35 -05:00
53925c9d3c For now, revert to the deprecated SFML scroll event 2020-02-09 19:56:15 -05:00
760a172526 Some style tweaks 2020-02-09 18:24:09 -05:00
deac7b0cb6 Merge pull request #251 from x-qq/fix_scrollbar_segfaults
fix for scrollbar segfaults

* fixes #206
* fixes broken mousewheel scrolling of the scenedit palette
* removed boost threads dependency
* added foundation for further refactoring of the drawing and event handling code: interfaces and drawable manager with layering
* removed a bunch of unneeded redraw calls
* removed some repeated recalculation of effectively constant values (boe.actions)
* removed recalculation of effectively constant scrollbar and button positions (boe.graphics)

Closes #251
2020-02-09 15:55:51 -05:00
335fb87e51 Store custom graphics classifications as symbols instead of integers 2020-02-09 12:10:52 -05:00
b8492a29b0 Extract shopping/talking colours to global constants
Adapted from patch by @clort81
2020-02-07 20:39:13 -05:00
2a34447ab5 Merge pull request #252 from x-qq/fix_211 2020-02-05 23:54:56 -05:00
bcf3208eed Merge pull request #253 from x-qq/fix_barrier_animation 2020-02-05 23:50:55 -05:00
805b35ec90 Fix Classify Custom Graphics wrongly claiming you don't have any 2020-02-05 23:48:36 -05:00
xq
60eece4b60 Fis Escape button not closing the minimap
fixes #211
2020-02-06 06:46:46 +02:00
xq
43d274f532 fixed barrier animation 2020-02-06 06:34:33 +02:00
0bf41cb172 Centre dialogs above their parent window 2020-02-05 22:46:17 -05:00
357cd2e165 Fix 3-choice dialogs using "Stay" instead of "Leave" for the cancel button 2020-02-04 22:26:06 -05:00