61957 Commits

Author SHA1 Message Date
Ignacio R. Morelle
cae02303a9 desktop: Use Apple OS X branding instead of Mac OS X 2015-08-16 20:17:36 -03:00
Ignacio R. Morelle
ecee9bdc11 desktop: Tidy up a little again, add documentation 2015-08-16 20:17:36 -03:00
Charles Dang
565caec797 Updated codeblocks readme 2015-08-17 10:10:36 +11:00
Charles Dang
613d03cae3 Merge pull request #459 from CelticMinstrel/master
Fetch Mac OS X version instead of Darwin version
2015-08-17 05:32:21 +11:00
Charles Dang
db3f477c20 SotBE S7: changed a sighted,moveto event to plain sighted 2015-08-17 05:17:02 +11:00
Charles Dang
1fedda3b0c SotBE: fixed two inverted SUFs in sighted events
When ON_SIGHTING was changed to sighted events in 4ac0373, the
unit/second_unit filters were not switched as needed.
2015-08-17 05:14:33 +11:00
Celtic Minstrel
ce09922b1f Fetch Mac OS X version instead of Darwin version 2015-08-16 14:12:49 -04:00
Andreas Löf
4f20341add Remove dead code related to ttexture 2015-08-17 03:49:08 +12:00
Andreas Löf
4c4c469ead Add SDL2 support to the CMake.
To compile with SDL2, run with -DENABLE_SDL2=TRUE. SDL2 is disabled by default.
2015-08-17 03:40:22 +12:00
Ignacio R. Morelle
979d39277b desktop: Tidy up os_version() a bit 2015-08-16 11:53:04 -03:00
Ignacio R. Morelle
9847d0963c desktop: Try to use lsb_release to determine the OS version on Linux
The assumption here is that lsb_release in /usr/bin can be trusted. It
doesn't get any worse than desktop::open_object()'s usage of xdg-open.
2015-08-16 11:51:36 -03:00
Andreas Löf
b01466cf21 Advertise support for clipboard in the SDL2 code 2015-08-16 19:42:56 +12:00
Ignacio R. Morelle
987f0157c2 Revert recent map code changes related to map mask handling
They break some unit tests and we can't seem to decide whether the tests
are truly at fault (that is beyond the fact that they _should_ certainly
use [terrain] instead of [terrain_mask]) or whether the issue that the
author was trying to fix at the beginning was an issue in the first
place.

This reverts the following commits:

 * commit 6b78073b49bcebf00b919b89550b773119ce2f1c
 * commit 2f650419dad963f7adf562b06f6ad319cabceffb
 * commit a436c46f13564b84effd0481fc4d41c340bc9ec2
 * commit fcf8b72efd310a2f76a0bb665d55eb3081fc1d68
 * commit 079692d42457a7b9251bfe319a65d8341217d0b7
 * commit 730d83729687f7107bc68582686ccdf0720b7b42
2015-08-16 00:38:31 -03:00
Ignacio R. Morelle
7fa589c447 gui2: Fix a few wiki documentation syntax issues 2015-08-15 22:57:33 -03:00
Ignacio R. Morelle
35d3120db3 gui2/tgame_version: Minor UI string tweak 2015-08-15 22:36:55 -03:00
Ignacio R. Morelle
329a0e130a gui2/tgame_version: Replace fake checkbox widgets with Unicode
Makes it more obvious that the items in the Features pages cannot be
changed by the user.
2015-08-15 22:35:06 -03:00
Ignacio R. Morelle
305b90c9a5 gui2/tgame_version: Switch to using a horizontal listbox
This makes for somewhat simpler event handling and allows using the
keyboard to switch between tabs. It doesn't solve the layout issues with
long tab labels, though.
2015-08-15 21:41:54 -03:00
lipk
2d0482be91 Merge pull request #456 from aginor/sdl2
Fix the graphics corruption when scrolling with SDL2 enabled
2015-08-15 19:56:29 +02:00
Elvish_Hunter
c5854e0299 wmllint: replaced a regexp check with a simpler function
From my tests, it seems like performances are pretty much the same; but this function is way more readable and maintainable than a regexp.
2015-08-15 14:34:10 +02:00
Elvish_Hunter
681d033bca wmllint: removed an instance of deprecated dict.has_key() 2015-08-15 14:34:10 +02:00
Andreas Löf
1c17ecaa75 Fix the graphics corruption when scrolling with SDL2
SDL2 has issues with overlapping surfaces when blitting, it seems to trigger an internal bug in SDL2. This causes the blitted surface to be incorrectly filled, causing a graphics corruption. This introduces a workaround that does a copy of the original surface before blitting, thus avoiding the bug. This behaviour seems to only occur while scrolling so it's a reasonably rare occurence.
2015-08-15 21:10:23 +12:00
aquileia
5c1047d372 Windows installer: Don't force GPL on end users
Fix bug #21769 by changing 'I Agree' to 'Next'.
2015-08-15 11:06:38 +02:00
Martin Proud
7f57d911b8 Merge pull request #448 from CelticMinstrel/master
Reorganize XCode project
2015-08-15 00:31:19 -05:00
Charles Dang
b59fc35153 DiD S1: fixed incorrectly named key in a [kill] block 2015-08-15 13:20:16 +11:00
Charles Dang
ff6054e33c UtBS S2: fixed an incorrectly named SLF key 2015-08-15 13:09:42 +11:00
Charles Dang
89afb3d0a6 THoT S10: fixed typo in side 4 controller key 2015-08-15 12:57:49 +11:00
lipk
0d6fdfe2cc Merge pull request #452 from aginor/sdl2
Fix all compile warnings when SDL2 is enabled
2015-08-14 13:16:03 +02:00
Andreas Löf
f0eba4b312 Add a macro to clearly mark unused variables as unused and avoid compiler warnings. 2015-08-14 21:39:49 +12:00
Andreas Löf
46afc83f3a Fix all compile warnings when SDL2 is enabled 2015-08-14 20:59:20 +12:00
Ignacio R. Morelle
d3d8970601 fs: Remove legacy non-Boost implementation of the filesystem API
No-one is supposed to use it since 1.11.19 (except for OpenPandora,
but various other changes in master already forced us to drop support
for it), so it's time to enforce this decision for the sake of our
time and sanity.
2015-08-14 05:14:02 -03:00
Charles Dang
730d837296 Drop redundant border_size argument from gamemap::write
This was rendered unnecessary in in2f650419dad963f7ad as the gamemap namespace already has
border_size_ assigned to gamemap::default_border, and 6b78073b49bcebf00b removed the passing
of any other value
2015-08-14 10:11:19 +11:00
Charles Dang
e9d70dbc1e Default [object] silent= to true if no description is provided
Code snippet by shadowm
2015-08-14 10:08:46 +11:00
Charles Dang
079692d424 Clarify false default of [terrain_mask] border= as expected
The wiki states this is supposed to be false. gamemap::overlay already gives border=
a default false value, but this clarifies the value, code-wise.
2015-08-14 09:22:34 +11:00
Charles Dang
fcf8b72efd Partially revert a436c46f1356 and replace [terrain_mask] with [terrain] 2015-08-14 08:41:04 +11:00
Nils Kneuper
f7982497f0 updated Latvian credits 2015-08-13 22:48:47 +02:00
Nils Kneuper
5ad57f09a3 updated Latvian translation 2015-08-13 19:49:11 +02:00
Wedge009
929ec99d6f Merge pull request #1 from Wedge009/Wedge009-hotkey-fix
Correct handling of Ctrl+Return/Enter hot-key.
2015-08-14 00:28:55 +10:00
Wedge009
b9d3fb6df3 Correct handling of Ctrl+Return/Enter hot-key.
Added special handling for j and m characters, where their respective key codes do not match the j and m buttons on the keyboard.
This most likely means that they have come from Ctrl+Return/Enter keys, which resolves to Ctrl+j and Ctrl+m characters.

As a bonus, also corrected unexpected behaviour when attempting combinations such as Ctrl+: or Ctrl+F1. Previously they would resolve to Ctrl+` or Ctrl+@, at least in Windows.
2015-08-14 00:27:08 +10:00
Charles Dang
a436c46f13 Comment out [terrain_mask] inclusion possibly breaking feeding test 2015-08-13 15:29:35 +11:00
Charles Dang
f2334507ae Fixed Help browser not opening to correct section when accessed from editor 2015-08-13 07:14:17 +11:00
Charles Dang
c35fb63472 Rename Quit Game/Quit Editor menu items Quit to Titlescreen 2015-08-13 06:59:51 +11:00
Charles Dang
17d1212a0e General wmlindent run 2015-08-12 17:10:09 +11:00
Charles Dang
730453cf01 LoW S3: fixed pesky comment line preventing wmlindent from affecting file 2015-08-12 16:48:45 +11:00
Charles Dang
2f650419da Cleaned up old code related to border_size, usage, and map header 2015-08-12 16:32:35 +11:00
Charles Dang
6b78073b49 Don't pass border_size and usage to gamemap::read
This also fixes an issue in [terrain_mask] where masks would be incorrectly
offset due to a default border_size of 0
2015-08-12 16:32:32 +11:00
aquileia
5cf8cf2b32 vcproj: Fix File node from PR #447 2015-08-12 00:29:13 +02:00
Charles Dang
8adbae8da1 LoW: dropped commas before chapter titles 2015-08-12 07:29:42 +11:00
Charles Dang
768a418137 Deprecate ON_SIGHTING
Since sighted events now work, this macro is no longer necessary
2015-08-12 06:12:13 +11:00
Elvish_Hunter
f099638b26 wmllint: replaced backticks with repr()
Backticks as shortcut for repr() are removed from Python 3. Although all their usages were already commented out, I fixed it anyway in case the code is uncommented.
2015-08-11 19:41:37 +02:00
Elvish_Hunter
d8478cbed1 wmllint: replaced map and string.strip with list comprehension
string.strip() isn't available on Python 3, because of its redundancy with the .strip() method available on any string.
2015-08-11 19:41:37 +02:00