760a172526
Some style tweaks
2020-02-09 18:24:09 -05:00
7e73a21f5c
Add "Add Item" and F1 menu key accelerator on Linux
...
Patch from @x-qq
Closes #195
2020-02-02 22:38:42 -05:00
bb2f7fab22
Forgot to add the "Add Item" menuitem to the Windows resource file
2020-02-02 22:35:28 -05:00
c4c201db6e
Implement the most important menu key accelerators for Linux
...
Patch from @x-qq
2020-02-02 21:40:58 -05:00
7019a79567
Mac fixup
2020-02-02 12:11:19 -05:00
755a0f9c78
Mac PC Editor: Remove I menus in favour of Party -> Add Item
...
Also rename the menus to match Mac.
2020-02-01 23:24:50 -05:00
4574c62521
Mac PC Editor: Remove items menus and instead add "Add Item" to the party menu
...
Also:
- Add ellipses to a number of menuitems
- Shorten menu names to one word
- Fix not redrawing after an item is added
2020-02-01 23:13:26 -05:00
91da0ed4d0
Update references to the online documentation
2020-02-01 22:28:25 -05:00
f9f4d5671c
Factor out the framerate limiter into a class
...
Patch from @x-qq
2020-02-01 21:03:56 -05:00
3e686cb908
Tweak text colours to be less blindingly bright and closer to the original Mac BoE
2020-02-01 19:55:30 -05:00
5675ab8c71
Add menus to Linux character editor
...
Patch from @x-qq
2020-02-01 19:55:30 -05:00
14e2597108
Expose the shared pointer instead of the raw pointer in the resource manager and rewrite the custom sheets list to use a vector instead of manual memory management
...
In particular, this should fix a segmentation fault in the sound system caused by the resource manager pulling a resource that's in use.
2020-01-26 15:10:57 -05:00
542c037342
Integrate a new resource manager which should have better performance
2020-01-26 11:53:19 -05:00
36b4f6edc1
Remove an unused variable
...
(Thanks to @x-qq for noticing it was never assigned)
2020-01-19 15:38: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
d940f2c39d
Merge branch 'linux' into merge_linux
2018-02-08 20:36:46 +01:00
beadb49217
Fix scons build
...
Tested on Mac only, but probably also works on Windows/Linux
2017-09-04 20:45:45 -04:00
C.W. Betts
1b210d4358
OS X: Fix a few memory leaks.
2017-08-31 21:50:48 -04:00
9d86053817
Fix up MSVC project file for the major reorganization
2017-08-30 00:09:01 -04:00
c2ce2a2cd1
Split up the graphtool files
2017-04-14 15:43:07 -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
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
3c6190c433
PC Editor: Fix inability to edit spells
2017-04-11 17:28:43 -04: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
73cfe2bd24
Merge branch 'master' into linux
2017-01-30 14:02:41 -05:00
389697e872
Fix inability to train in mage lore
2017-01-27 15:15:32 -05:00
ultra
dde0212dc4
renamed sounds to match filenames in source (lowercase .wav), fixed up scenario and character editors
2017-01-26 17:17:33 -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
1b64eeaecf
Fix inability to change skills in the training dialog
2016-10-15 22:16:56 -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
59b68dc78d
Remove a mostly-redundant static array
2016-09-15 22:28:44 -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
0a5a9c089d
Don't hard-code player max inventory size at all use points
2016-08-31 15:55:19 -04:00
e9bf63afc7
Move town-specific daved game data into the town record
...
Als, use bitsets for item_taken and maps.
2016-08-21 16:09:58 -04:00
9363ab2fcf
Eliminate function-scope loop index variables
...
This makes all loop index variables local to their loop and
fixes some issue arising from the loop variables being present
through the whole function, such as using the wrong index variable.
In addition, there has been some reduction of code duplication in
the scenario editor.
2016-08-21 00:46:40 -04:00
785943b9be
More usage of standard containers instead of bare arrays
2016-08-15 12:31:45 -04:00
3359a2b778
Decouple universe and party
2016-08-14 22:28:37 -04:00
Ben Scott
a44b298012
fixed some catch.hpp includes in the tests, fixed a deprecated event cast in appleevents.mm
2015-12-22 00:05:52 -05:00
63df1e4401
Fix Windows build
2015-10-15 15:16:05 -04:00
76168b2071
Nuke several globals; some were unused, others moved to universe
2015-10-06 22:17:28 -04:00
d19880a463
Stop storing preferences and legacy flags in the saved game
...
- Nuke global preference variables (they're now fetched with get_xxx_pref whenever needed)
- Nuke magic SDFs that store preferences and other info
- The only preferences now stored in the saved game are those related to difficulty
- play_sound no longer takes an option repeat parameter, but instead takes a delay which will be used if sounds are disabled
- SDF array increased to 350x50
- When saving a legacy scenario, a dialog is shown to remind you to update and to allow you to clear the legacy flag
2015-10-06 22:17:25 -04:00
7f00d0c775
Change image resource type from sf::Image to sf::Texture
...
This includes an added optimization to the resource manager - it now uses unordered (hash) maps instead of ordered (tree) maps to keep track of loaded resources and paths, for the average constant lookup time.
2015-10-05 23:57:42 -04:00
1b95f06207
Split dlogutil.hpp into separate headers for each dialog
2015-10-04 22:45:01 -04:00
967f24a83b
Fix dialog frames not using the inset style
...
The framestyle format parameter now does nothing. This is temporary.
2015-10-03 10:28:42 -04:00
a9e7988cf9
Remove custom header from saved games.
...
Saved games are now just a gzipped tarball with a different file extension.
2015-10-01 10:51:54 -04:00
088166a534
Don't set application icon on OSX since it overrides the Dock icon
2015-09-25 00:47:14 -04:00
e81b63d36f
Windows: Set a titlebar icon
2015-09-25 00:41:17 -04:00
054f32dec2
Split out icon from pcedit title graphic
2015-09-25 00:35:36 -04:00
