Commit Graph

382 Commits

Author SHA1 Message Date
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
889b0663d1 Fix some issues with incorrect range errors from the talk node editor 2016-09-29 17:12:52 -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
c2604b56a7 Fix minor graphical glitch in editor tool palette 2016-08-25 21:28:45 -04:00
469d5fb8a6 Remove residual function 2016-08-25 21:28:44 -04:00
4cbd0d3013 New toolbar buttons for placing boats and horses; replaces the edit boats/horses dialogs 2016-08-25 21:28:42 -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
c59c58e7ab Fix crash when viewing monster info from menu 2016-05-07 17:57:25 -04:00
4cd7368fbf Some fixes to scenario dirty flag 2016-05-07 12:42:47 -04:00
21f05c464f Fix tool buttons being unresponsive 2016-05-07 12:42:28 -04:00
8b792aea75 Eliminate some offscreen surfaces in the scenario editor
- This fixes an issue where parts of the UI were filled with black or random noise.
- This also creates some noticeable lag while drawing, though.
2016-04-29 13:36:31 -04:00
ca2b6c5c4f Fix crash when editing monster summoning ability 2016-04-28 19:30:10 -04:00
3166d0d002 Free editor splash image after splash screen
Since it's only used once, there's no need to keep it around.
2016-04-28 19:29:54 -04:00
fa928a122f Fix missing scenario editor menus on Windows
This also seems to fix an issue with menu accelerator keys on Windows.
2015-10-22 18:29:29 -04:00
63df1e4401 Fix Windows build 2015-10-15 15:16:05 -04:00
ba984279b0 Some item ability stuff
- Two new item abilities that increase damage as sp/hp is lost
- Two new item abilities that reduce damage as sp/hp is lost
- Support for using sp/hp as a weapon's key skill to determine hit chance
2015-10-12 14:11:27 -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
906016b98d Fix some cases of wrong cut-off point for tiny item graphics 2015-10-06 00:00:46 -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
17095e1760 Three new wallsets and one new floorset by ADoS 2015-10-05 18:27:40 -04:00
1b95f06207 Split dlogutil.hpp into separate headers for each dialog 2015-10-04 22:45:01 -04:00
cae5fc3140 Rearrange the basic_buttons array to avoid the extra indirection step
- All buttons from the array that were strictly related to UI have been removed.
- Some new buttons have been added. The duplicate Leave button has been removed.
2015-10-04 21:11:16 -04:00
a455941d92 New scroll pane control in the dialog engine
Also:
- Use a scroll pane for the credits in the about dialog, so that new credits can be added without altering other elements
- Use a scroll pane for the list of sections to be deleted in the resize outdoors dialog
- New cContainer superclass for controls that contain other controls
- Scrollbars consider their maximum as part of their state
2015-10-02 17:03:25 -04:00
f6183cad63 Separate "Splits When Hit" from "Immune to Assassinate" 2015-10-01 22:53:32 -04:00
0a97824033 Use spaces instead of 'x' for an inactive dialogue keyword 2015-10-01 21:49:40 -04:00