Michael Bonfils
d940f2c39d
Merge branch 'linux' into merge_linux
2018-02-08 20:36:46 +01:00
513d926032
Fix "Save" menu action not working (only "Save As" worked)
...
(thanks to Ir the Great for this patch)
2017-12-16 16:36:32 -05:00
3e2bf582de
Fix priest spells menu showing mage spells instead
...
(thanks to Ir the Great for the Windows side of this patch)
2017-12-16 16:34:01 -05:00
84f44820f8
Fix out-of-bounds issue when drawing boats and horses
...
(thanks to Ir the Great for spotting this issue)
2017-12-16 14:44:07 -05:00
6866ff7a98
Fix out-of-bounds traits error on Anama trait
...
(thanks to Ir the Great for this patch)
2017-12-16 14:40:18 -05:00
e53056a132
Fix a couple of MSVC compiler warnings
2017-09-16 12:46:42 -04:00
477f6618fd
fixup 3582a05 for non-Windows
2017-09-04 23:41:40 -04: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
bdb3cb3df6
Fix an issue with the help buttons for talking and shops not producing anything if you'd seen them once before
2017-09-04 14:37:26 -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
C.W. Betts
1b210d4358
OS X: Fix a few memory leaks.
2017-08-31 21:50:48 -04:00
7e7f3d2b81
Merge mac into windows
2017-08-27 23:37:37 -04:00
7987680bf4
Simplify some stuff with references
2017-04-15 02:04:11 -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
e57441f6a0
Consolidate active quest data into a single map
2017-04-14 11:38:06 -04:00
5b5b2af46f
Remove custom erase_if function in favor of std::remove_if
...
It was originally added before I understood the correct way to use remove_if
As a side-effect, remove bad status now also removes forcecage and charm.
2017-04-14 11:37:27 -04:00
936a848166
Move terrain blockage check into cTerrain class
2017-04-14 01:12:56 -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
