62009 Commits

Author SHA1 Message Date
Wedge009
eb05d043e0 Reverting some hyphenation.
celticminstrel objects to some of the hyphenation. Geven the American English origin and nature of the majority of the English-speaking Internet, I suppose it's okay to allow American-style compound words where they've already proven dominant in computing/programming/Internet contexts.
One exception here is 'hot seat', where its use has not yet been established in mainstream lanugage.
Also, the made-up phrase 'goto-mode' has had spacing introduced.
2015-09-21 04:32:07 +10:00
Wedge009
0403519491 Reverting 'x and I' to 'me and x'
celticminstrel suggests the gramatically incorrect 'me and x' form works better in an informal, spoken context so, for the most part, reverting this change.
2015-09-21 04:30:49 +10:00
Wedge009
a6fc91090e Turns out it wasn't a then/than mix-up. Still needed correcting, though. 2015-09-05 17:46:58 +10:00
Wedge009
f42e386d36 Slight re-arrangement of 'than' after discussion with vultraz and shadowm. 2015-09-05 17:31:43 +10:00
Wedge009
e1c1b5c4be 'gonna' sounds rather informal for Eryssa + 'Father' is Morvin's title, not his relationship to Abhai. 2015-09-05 15:26:24 +10:00
Wedge009
643d55e467 'x and I' vs 'me and x' 2015-09-05 15:15:14 +10:00
Wedge009
87acd93626 Added missing comma. 2015-09-05 15:05:02 +10:00
Wedge009
473548cc89 Sentence structure may be a bit confusing but it seems to follow the pattern of 'no sooner *than*'. 2015-09-05 14:57:20 +10:00
Wedge009
464646978d Correct nonsensical text. 2015-09-05 14:32:30 +10:00
Wedge009
bcece91e9a 'guys' seems excessively colloquial here. 2015-09-05 14:31:31 +10:00
Wedge009
6043550999 Remove duplicate word. 2015-09-05 14:27:21 +10:00
Wedge009
53191251fc Remove redundant wording. 2015-09-05 13:51:35 +10:00
Wedge009
e14333bad0 Correcting a typo. 2015-09-05 13:45:28 +10:00
Wedge009
c55cd29297 Added missing comma. 2015-09-05 13:41:37 +10:00
Wedge009
971243975b 'Most vile' vs 'most vilest' + other minor changes to make more sense of sentences 2015-09-05 13:27:25 +10:00
Wedge009
529bb982a7 Official name is just OS X now. 2015-09-05 11:57:22 +10:00
Wedge009
d0006da05d Remove redundant wording. 2015-09-04 23:43:52 +10:00
Wedge009
210ba16c6e Grammar correction: 'have taken' vs 'have took' 2015-09-04 22:58:51 +10:00
Wedge009
c355cd9503 Add missing 'he' to make more sense of the sentence. 2015-09-03 22:10:59 +10:00
Wedge009
45dcb68935 Grammatical correction. 2015-09-03 11:37:18 +10:00
Wedge009
0b9fbb9678 Punctuation, for clarity on who is heading to Tirigaz. 2015-09-03 10:11:42 +10:00
Wedge009
c9fbe13156 Make hyphenation consistent 2015-09-03 07:08:24 +10:00
Wedge009
496e5b5437 Repositioned 'south' to make more sense. 2015-09-02 15:23:43 +10:00
Wedge009
3a0dd3ed24 Add missing apostrophe in contraction of 'let us'. 2015-09-02 14:50:40 +10:00
Wedge009
531c1d9dbd Surely 'capital' is referring to Weldyn, not some government building within it, especially given the reference to palace grounds. 2015-08-31 21:03:21 +10:00
Wedge009
52f8080a92 Some grammatical corrections. 2015-08-31 19:36:16 +10:00
Wedge009
73b10f315a Separated 'can not' is more common where 'not' forms part of a construction with subsequent words. 2015-08-31 19:11:05 +10:00
Wedge009
2db2e81e7c In this context, referring to the city forming the Saurians' central city, capital is the correct spelling. 2015-08-30 22:17:01 +10:00
Wedge009
f3d23218a8 Separated 'can not' is more common where 'not' forms part of a construction with subsequent words. 2015-08-30 22:15:57 +10:00
Wedge009
48c2098902 maybe = perhaps vs may be = might be 2015-08-30 22:14:22 +10:00
Wedge009
f2eadeb551 Grammatical corrections in Elves' Last Stand. 2015-08-30 22:13:19 +10:00
Wedge009
a5aed635eb Add missing full stop. 2015-08-30 00:14:33 +10:00
Wedge009
f74796809a Correct its vs it's 2015-08-30 00:08:02 +10:00
Wedge009
27f6aea215 Correcting born -> borne
born -> borne
Plus unguessable isn't really a word...
2015-08-29 11:14:52 +10:00
Wedge009
9bcfb8dff5 Correct then/than mix-up. 2015-08-27 02:01:05 +10:00
Charles Dang
66b6ca39a1 Merge pull request #476 from Wedge009/Spelling_Corrections
Spelling corrections
2015-08-26 18:34:05 +11:00
Wedge009
e37ee6a192 Spelling corrections
recieve -> receive
intepolate -> interpolate
2015-08-26 17:31:03 +10:00
Wedge009
f05557a7d9 Spelling corrections
recieve -> receive
intepolate -> interpolate
2015-08-26 17:30:44 +10:00
mattsc
f8dc5d027c Merge pull request #464 from CelticMinstrel/trans
XCode: Copy translations to target if they have been built
2015-08-25 20:02:32 -07:00
gfgtdf
7cdeafd1e0 Add savegame compability for [advancement]->[advance] patch 2015-08-26 01:04:00 +02:00
Elvish_Hunter
b3a42b4c9b wmlscope: removed dependency from Pillow library
This was possible because the documentation of the PNG format is quite clear, and the code doesn't need to check JPG images.
2015-08-25 21:12:52 +02:00
gfgtdf
6270e0a620 remove outcommented code. 2015-08-25 17:05:34 +02:00
gfgtdf
9ba49ddf0e savegame compability code for era_blank change.
adds compability code for c2e1d71fc2.
2015-08-25 17:01:31 +02:00
Elvish_Hunter
def724816f wmllint: fixed an error when trying to check if a file is a savegame
The error was caused by the fact that opening a file with codecs.open() is much stricter than using open(mode=rb), and throws a UnicodeDecodeError if a file can't be read as UTF-8 - which is the case for binary files.
2015-08-25 14:07:26 +02:00
Ignacio R. Morelle
a55bc98630 Make hanging, chasm stone, and plank bridges conform to naming conventions
Namely, make the long descriptive name be displayed only in the editor,
and use the "Bridge" shorthand in-game instead.
2015-08-25 02:31:21 -03:00
Ignacio R. Morelle
1e32ae69f5 Fix hanging, chasm stone, and plank bridge elevations
The N-S hanging bridge variant does not need an elevation shift, and
all diagonal variants of the other two were missing their own.
2015-08-25 02:31:17 -03:00
Charles Dang
58b0697b00 DiD S7: apply TC to dummy images 2015-08-25 08:54:53 +11:00
Ignacio R. Morelle
d9d57cf801 Merge pull request #473 from aginor/sdl2graphics
Fix cmake on OSX and fix alpha blending issue with SDL2 while scrolling
2015-08-24 18:51:21 -03:00
Andreas Löf
75035a04f2 Fix alpha blending issue when scrolling under SDL2
SDL2 has a workaround for a broken blitting operation, and on some
hardware accelerated systems this led to an alpha blending issue where
map regions that were frequently redrawn would grow progressively
darker until the alpha blended aspects are black. This disables
alpha-blending on the copy of the scrolled map area as no further
alpha composition should be done without a complete redraw of the
affected area.
2015-08-24 22:33:24 +12:00
Andreas Löf
c42ba83b82 Fix cmake scripts for use on OSX with homebrew.
It seems that cmake won't pick up on the FindPackageHandleStandardArgs
macro on its on from homebrew so I've updated the script to include it.
2015-08-24 19:05:28 +12:00