Commit Graph

13006 Commits

Author SHA1 Message Date
209799aa4c fix 94c02ec33c for AI
This was SVN commit r14855.
2014-03-17 21:23:40 +00:00
5c4282a21c Fixes a small memory leak in the profiler shutdown code.
This was SVN commit r14854.
2014-03-17 21:16:38 +00:00
cde72788a2 * Add support for fallback fonts in the font builder.
* Replace DejaVu with Biolinium for the existign sans-styles.
* Add additional sans-styles using Biolinum.
* Update the GUI style definitions to use the sans-styles instead of
serif styles.
(Wait with updating custom defined fonts in strings, as it will cause a
mess with the internationalisation that's about to be included)
* Add fonts from the quite complete FreeFont family as fallback fonts.
* Render all glyphs supported by the different fonts to support as many
scripts as possible.
* Fixes #2457.
(Now hope I included all needed files)

This was SVN commit r14853.
2014-03-17 10:13:49 +00:00
c1b839c21b Military Colony's territory weight reduced.
Updated icon for Syria map. Updated nisian war horses portrait from
Pureon.

Reduced the volume of the attack notification a little.

This was SVN commit r14852.
2014-03-17 00:10:13 +00:00
84ef2c1335 A test for Latin names for animals. Won't complete this until after next alpha.
This was SVN commit r14851.
2014-03-17 00:08:24 +00:00
883f307b40 Implement a basic observer mode. Any player which joins a multiplayer game but is not assigned a player slot automatically becomes an observer. Refs #69
This was SVN commit r14849.
2014-03-16 23:29:27 +00:00
94c02ec33c Revert gather limits to be global instead of per-player. Refs #1387
This was SVN commit r14848.
2014-03-16 20:35:23 +00:00
19724f7f41 "Syria" skirmish map.
This was SVN commit r14846.
2014-03-15 23:10:06 +00:00
ffe0faeca4 Move the skybox up per Mythos' ruler recommendation. This should probably be a map setting.
This was SVN commit r14844.
2014-03-15 21:07:02 +00:00
caeaf62723 Adjust widths in the lobby to make the map size dropdown fit.
This was SVN commit r14843.
2014-03-15 20:58:59 +00:00
722ad7264d Some updated maps. Acropolis Bay especially.
This was SVN commit r14842.
2014-03-15 19:56:51 +00:00
49b0e1ce42 Eliminates some duplication in build-osx-libs.sh and sets more useful variables
This was SVN commit r14841.
2014-03-14 05:18:40 +00:00
dfa4766dab Reverts [[SVN:14831]] - wasn't a valid fix.
Patches MiniUPnPc to explicitly export symbols for GCC/Clang, fixes
build when -fvisibility=hidden is used, refs #2304.
Fixes incorrect use of CPPFLAGS in build-osx-libs.sh, it should be
CXXFLAGS. CPPFLAGS get passed to the C/C++ preprocessor, CXXFLAGS get
passed to the C++ compiler.

This was SVN commit r14840.
2014-03-14 04:17:42 +00:00
b18a899287 Added Ptolemaic healer body and head textures. Fixes #2234
This was SVN commit r14839.
2014-03-13 19:46:15 +00:00
6ab578a6eb Fix out of date comments in Tex and ITexCodec, Fixes #2458.
This was SVN commit r14838.
2014-03-13 19:00:22 +00:00
e17dd1ac12 Applying the new improvements: Gulf of Bothnia.
This was SVN commit r14837.
2014-03-13 09:45:09 +00:00
ef888367aa Cleanup tex_codec, fixes #2456, patch by IronNerd.
This was SVN commit r14836.
2014-03-13 04:16:20 +00:00
a5639631ee Texture system refactoring and cleanup, fixes #2455, patch by IronNerd.
This was SVN commit r14835.
2014-03-13 02:37:05 +00:00
a068935789 Ptolemaic dock upgrade. Fixes #2217
This was SVN commit r14834.
2014-03-12 18:38:16 +00:00
180b44e565 let the AI know that a unit has no more orders
This was SVN commit r14832.
2014-03-11 22:42:41 +00:00
6274c7ffe8 Added ptolemaic quinquereme. Fixes #2232
This was SVN commit r14830.
2014-03-10 13:37:18 +00:00
9f1bcc2475 fix AI error
This was SVN commit r14829.
2014-03-09 22:26:41 +00:00
0e0cd65134 Some GUI alignment/sizing improvements.
This was SVN commit r14828.
2014-03-09 19:24:17 +00:00
0e7c92e1e6 Fixes behaviour change in Atlas' JSON serialization after the switch to JSON Spirit (#2434).
This caused problems setting the starting camera.

Refs #2434

This was SVN commit r14827.
2014-03-09 17:55:54 +00:00
8959e63a53 Add back unintentionally removed idle workers button tooltip.
This was SVN commit r14826.
2014-03-09 02:42:42 +00:00
e6f7ef78dc Removes legacy "technologies" folder.
This was SVN commit r14824.
2014-03-09 00:10:41 +00:00
7698e75962 Pyrrhus template.
This was SVN commit r14823.
2014-03-09 00:08:25 +00:00
0603392f03 Acropolis Bay.
This was SVN commit r14822.
2014-03-09 00:08:00 +00:00
119849defc Pyrrhus hero.
Some map stuff and actor changes (remove the elephants from Pericles).

This was SVN commit r14821.
2014-03-09 00:07:28 +00:00
d214d8f61c Some map changes.
This was SVN commit r14820.
2014-03-09 00:02:33 +00:00
fb65288463 Fix hover effect not regenerating after mousedown events, minor GUI code cleanup, and fix #2414
This was SVN commit r14819.
2014-03-07 22:43:57 +00:00
c8bdd993c0 Upgrades cxxtest.
Switches to the already committed new cxxtest sources and deletes the
old sources.
Applies the changes from 6374080b60 and 4a57fed5a7 to the updated
sources.
Replaces the cxxtestgen.exe for Windows. This file was created from
cxxtest's python script using pywin32.
Modifies update-workspace.sh to force a rebuild when cxxtest options
could have been changed during the premake step.
Adds an additional option (--jenkins-tests) to
premake4.lua/update-workspaces.sh to use cxxtest's XmlPrinter which
generates output than can be used by Jenkins.

Fixes #2450

This was SVN commit r14818.
2014-03-07 20:58:17 +00:00
a9368a4463 Updated tooltip to reflect the new max gatherer limit
This was SVN commit r14816.
2014-03-07 12:09:39 +00:00
66942c74fa Be more forgiving for training spaces (which cause empty strings on splitting) and avoid using bigger fonts for non-capitalisable signs in headings
This was SVN commit r14815.
2014-03-07 11:11:45 +00:00
32cf46f01c Fix some 'undefined' problems reported by Lion.Kanzen + improve coding style.
This was SVN commit r14814.
2014-03-07 08:27:13 +00:00
29f94a759c Fix an issue with lobby registration and a minor wording tweak.
This was SVN commit r14813.
2014-03-07 01:52:06 +00:00
abbd6efef1 Updates outdated/incorrect hotkeys.
This was SVN commit r14812.
2014-03-06 23:57:02 +00:00
8a98bca9b2 Fixes the last z order (hopefully) and a style inconsistency.
This was SVN commit r14811.
2014-03-06 22:45:13 +00:00
ec26f1de83 Reduces z order to fix ai dialog.
This was SVN commit r14810.
2014-03-06 22:34:15 +00:00
8f30e722ab Some inconsequential style adjustments.
This was SVN commit r14809.
2014-03-06 02:24:06 +00:00
ef76d24e66 Fixes z order and a capitalization error.
This was SVN commit r14808.
2014-03-06 02:00:12 +00:00
5f5cfb10ee Fixes a typo and makes naming of the fading consistent with other sprites.
This was SVN commit r14807.
2014-03-05 21:24:48 +00:00
f3714a7075 Fix invalid count for entityMaps
Improve error reporting on failed deserializations
Fixes #2328

This was SVN commit r14806.
2014-03-05 14:58:17 +00:00
02024370d8 Fix a warning in Visual Studio 2010 related to some of my recent changes.
This was SVN commit r14805.
2014-03-05 01:06:13 +00:00
5582409973 Converts most parts of the game to use Pureon's new UI
This was SVN commit r14804.
2014-03-04 02:23:01 +00:00
1a2f889bb9 7cba43c9db changed the behaviour in case of undefined values which was not intended even if there's a warning now.
This should revert to correct behaviour for undefined values again (even
though this value should never be undefined).

Refs 2372

This was SVN commit r14803.
2014-03-03 23:01:49 +00:00
7cba43c9db Fixes warnings printed by the new SpiderMonkey.
Sets SelectableInGameSetup to true in all civ json files that didn't
have it set.
Having this value set to undefined (not set) was interpreted as true,
which is quite arbitrary.
With the new SpiderMonkey a warning will be printed if the value is
undefined.
This avoids ambiguity but makes the setting mandatory.

Refs #2372

This was SVN commit r14802.
2014-03-03 21:58:15 +00:00
df43e32a59 Second try fixing the eol-styles
This was SVN commit r14801.
2014-03-03 21:36:24 +00:00
234f2003a3 Fix inconsistent line endings and add svn:eol-style property
This was SVN commit r14800.
2014-03-03 21:13:36 +00:00
2d0e996725 Added modified Stanislas69 Pyrrhus helmet with textures.
Added an extra variation for brass and iron textures variations of
ptolemaic_romanized and thracian horned helmets.
Added playercolor to the thracian horned helmet crest.

This was SVN commit r14799.
2014-03-02 10:59:36 +00:00