1d61d48ec3
Enable UI scaling in the scenario and implement Linux menus
...
Patch from @x-qq
Addresses #195
Note: UI scaling for the scenario editor still needs some work,
but it's basically functional.
2020-01-28 20:13:24 -05:00
d530abe00b
Make use of the new resource manager's purgeable flag
2020-01-26 16:14:39 -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
a5a7f161c8
Remove the init thread from the scenario editor
...
The reasoning is the same as for the main game.
2020-01-19 15:39:41 -05:00
e4b98a1634
Add a hidden preference to skip the Spiderweb logo at startup
...
The same preference also skips the scenario editor startup splash
In order to enable that, the scenario editor now loads prefs.
2020-01-19 15:39:41 -05:00
6f96222c37
Remove the 30-item limit in shops
2019-12-02 01:16:34 -05:00
4ad84e6cf8
Missed some when fixing #191
2018-04-07 09:38:13 -04:00
9073063423
Merge branch 'merge_linux' of https://github.com/murlock/cboe
2018-03-03 17:52:59 -05:00
Mark Clark
e70c360e11
Minor fixes to get build working for vs2017 project;
2018-02-25 14:55:13 -05:00
8759aad90a
Move Xcode project to a separate tree parallel to src
2018-02-19 02:11:29 -05:00
c21b0b8de7
Fix #155
2018-02-18 16:26:10 -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
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
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
9d86053817
Fix up MSVC project file for the major reorganization
2017-08-30 00:09:01 -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
e98f9381fe
Move special node category into the node properties struct
2017-04-14 00:50:38 -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
4f91f6a679
Make undo system a little safer, and improve docs
2017-04-11 15:00:22 -04:00
7fc3001245
Confirm before creating a new scenario when one is being edited
2017-02-12 18:27:44 -05: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
e38053d39f
Remove some spurious scenario editor error messages
...
These errors are all no longer necessary due to the editor loading the entire scenario into memory at the same time
2017-02-12 18:19:29 -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
2b8ff52992
Don't cancel adding a special shop entry if the node hasn't been set
...
(The designer may want to add the entry and then later come back and create the node.)
2017-02-10 12:13:46 -05:00
20ff735d2f
Add a Vahnatai PC graphic by "Kelyar-Ihrno"
2017-02-08 16:58:31 -05:00
92ba1e0fb0
Fix "Center" text positioning, and replace it with context-sensitive tooltips
2017-02-07 22:24:28 -05:00
6b857e6e43
Fix some isses with editing outdoor encounters
2017-02-07 22:17:58 -05:00
bc810f9238
Fix warning message when setting a node that doesn't yet exist
2017-02-07 20:09:42 -05:00
61816b7529
Fix inability to set special nodes outdoors
2017-02-07 20:09:15 -05:00
f520e1ac0a
Fix issues with editing dialog text
...
- If there were no strings following the assigned six dialog strings, the scenario editor thought the string was out of range and tried to assign a new set
- Whenever the text is edited, make sure all six strings still exist.
2017-02-02 11:44:09 -05:00
933f7e7644
Add special spot to the list of field graphics
2017-02-02 11:35:45 -05:00
583a0ab68b
Fix graphic selection dialog for certain types
...
This prevents problems when the ID of the graphic does not correspond to
its position in the graphics selection dialog.
2017-02-02 11:34:18 -05:00
f490464249
Make scenario editor not delete all trailing empty strings when saving
2017-02-02 11:32:53 -05:00
570792420a
Add two more animated portals
...
One on grass and one on walkways
2017-02-01 14:24:06 -05:00
0e109ecd5c
Fix crash when editing dialog strings
2017-01-31 21:23:12 -05:00
e7ae0b28a2
Fix floodfill potentially spilling off the edge of the map
...
(and corrupting memory)
2017-01-31 20:12:34 -05:00
5f9b9dff93
Fix inability to erase roads in town
2017-01-31 20:12:03 -05:00
73cfe2bd24
Merge branch 'master' into linux
2017-01-30 14:02:41 -05:00
d9aebf8742
scons: Add a missing file
2017-01-28 12:49:30 -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
f6d4161fa1
Fix deleted preset fields being saved in scenarios
2017-01-22 23:03:03 -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
63345beb9b
Fix crash when deleting certain elements in town
2017-01-20 21:31:17 -05:00
c54cab93ee
Fix crash when editing special encounter strings
2017-01-20 21:31:15 -05:00
