542c037342
Integrate a new resource manager which should have better performance
2020-01-26 11:53:19 -05:00
29ef8b9c1e
Refactor the game event loop and add menus to the Linux build
...
Patch from @x-qq
Addresses #195
2020-01-25 17:57:32 -05:00
fa25beae6d
Apparently referencing the superclass by unqualified name is not allowed
2020-01-12 12:33:58 -05:00
e42baa0971
This should fix some ambiguities in the enum_map
2020-01-12 12:21:18 -05:00
409fe41030
Ignore numpad keys for keyToChar conversion
2020-01-12 10:58:33 -05:00
402f4eae01
Fix saving for double preferences (UIScale) on Windows/Linux
2019-12-29 13:19:42 -05:00
1bd23ace69
Better detection of doubles in Windows/Linux preferences
2019-12-29 12:48:10 -05:00
4f785e2650
Use enums for most of the rest of the game constants.
...
This adds an "enum map" type that allows safe usage of an enum to index an array.
(That is, it enforces that the index is of the enum type.)
2019-11-24 20:28:52 -05:00
Michael D. Reiley
5a142a656a
Fix save filename newline bug on Linux
2018-03-23 17:39:13 -07:00
ed402040c9
Fix the fix for Mac
2018-03-03 18:19:18 -05:00
ee0bfa835a
Fix merge errors
2018-03-03 18:05:05 -05:00
9073063423
Merge branch 'merge_linux' of https://github.com/murlock/cboe
2018-03-03 17:52:59 -05:00
8759aad90a
Move Xcode project to a separate tree parallel to src
2018-02-19 02:11:29 -05:00
Michael Bonfils
12c3ce26f8
Fix compilation of linux
2018-02-10 17:08:33 +01:00
Michael Bonfils
d940f2c39d
Merge branch 'linux' into merge_linux
2018-02-08 20:36:46 +01: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
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
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
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
73f49725b4
Fix error in redo code
2017-04-12 02:03:38 -04:00
945a7a9e5a
Fix boats/horses not appearing
2017-04-11 20:03:54 -04:00
4f91f6a679
Make undo system a little safer, and improve docs
2017-04-11 15:00:22 -04:00
absquatulate
b6b6871f86
Added X11 to scons build and implemented file save and load using zenity.
2017-04-04 19:17:31 +12:00
683ab805ec
Initial framework for scenario editor undo/redo
...
In addition to the framework, this enables undo/redo of one action - adding a new town
2017-02-12 18:27:01 -05:00
59f2a7b94e
Some code cleanup, mainly constants
...
- Strip out unused constants
- Use const instead of #define
- Remove some obsolete comments
2017-02-12 00:04:53 -05:00
86bf93c9c5
WIP
...
This doesn't currently compile due to referencing some undefined variables.
[ci skip]
2017-01-31 13:03:51 -05:00
a37db72920
Some improvements to scenario-related errors when loading games
...
- Use the same algorithm for locating scenarios as is used when selecting a scenario to enter
- Improve the error message when the party's scenario is missing - in particular, name the scenario
- Fix legacy saved games in custom scenarios being unloadable
2017-01-30 21:11:08 -05:00
ac15358c46
Rename custom cursor class to avoid conflict with X11 type
2017-01-30 15:05:38 -05:00
73cfe2bd24
Merge branch 'master' into linux
2017-01-30 14:02:41 -05:00
823e96f637
Stuff to make linux build work
2017-01-26 22:56:07 -05:00
37d2e5f06b
Additional minor fixes to Linux build
2017-01-26 17:18:01 -05:00
ultra
057aade18b
Get it building and launching something
2017-01-26 17:17:25 -05:00
ultra
ffa2d0e950
Hacked scons scripts and got it building on Ubuntu with clang.
...
Minor changes to support building on recent clang
Addition of some headers for non-compiling files
2017-01-26 17:16:38 -05:00
15637c763b
Fix showing a fixed graphic for invisible monsters in Scry Monster
...
Also fix dialogs never showing a frame around blank graphics
2017-01-22 11:10:40 -05:00
8e43ce4347
Add preview button to item/monster edit dialogs
...
This shows the monster or item info dialog as it would appear in-game
2017-01-22 11:02:26 -05:00
e30c509ff1
Fix issue with loading 0-dice monster attacks
2017-01-21 16:18:49 -05:00
380b64aa7a
Fix some issues when loading new-format scenarios
...
- Carriage returns misinterpreted as map features
- Error code returned by CopyFiles
- Confusing error message when a file is missing in the archive
2017-01-20 23:11:40 -05:00
c1bfc99164
Fix several issues with saving and loading games
...
- PC's internal reference to the party was clobbered on load
- Several dynamic structures still made assumptions about their size, causing crashes
- Issues with town maps due to treating all towns as 64x64
- Town maps were saved only if you are in town
2016-10-01 17:52:05 -04:00
9aed4b418f
Several small bugfixes
...
- Wrong image in generic lever dialog
- Crash in adventure notes dialog
- Incorrect spell costs shown on second page of spellcasting dialog
- Enable messages in "if context" node, but only for legacy scenarios
- Fix recorded dialogue not working
- Fix special items leaking between scenarios
- Fix training dialog
- Fix scenario editor sometimes crashing on scenarios that it wrote itself
2016-09-26 20:23:09 -04:00
5cce71df26
Fix several bugs introduced by refactoring
2016-09-03 12:40:48 -04:00
88d6afce27
Merge all the town classes and remove the unimplemented templated towns
...
This also adds a common superclass shared by towns and outdoor sectors, and
enables towns of arbitrary sizes.
2016-09-03 02:50:29 -04:00
5c3a96c69c
Fix several issues when loading legacy saves
2016-09-02 19:28:25 -04:00
