Commit Graph

12250 Commits

Author SHA1 Message Date
Mythos_Ruler 10ddc2aed6 Fixed starting unit for Ptolemies.
Nile River skirmish map (still needs Iberian walls for 2 of the
players).

New map preview for Arabian Oasis.

Moved Civic Center back to Town Phase, but made it take twice as long to
build.

Fixed elephant template.

Fixed up Persian Highlands skirmish map based on some notes from
Alpha123.

This was SVN commit r14040.
2013-10-25 08:02:55 +00:00
OmriLahav 14166af0ac This was SVN commit r14038. 2013-10-24 09:46:26 +00:00
leper 4e86b00a05 Remove inconsistencies in the manual. Refs #2185.
Fix player name.
Make log messages when saving games use quotes around paths.

This was SVN commit r14037.
2013-10-23 22:18:40 +00:00
Yves 20ed5b118c Unify script conversions and remove JSInterface_Vector3D.
Because it was historically grown, we have some duplicated code for
converting script types to native types.
This patch removes the file JSConversions.cpp and moves some code to
ScriptConversions.cpp.
The places using JSConversions.cpp are changed to use the
ScriptInterface's conversion functions in ScriptConversions.cpp.
I also removed JSInterface_Vector3D because it had additional
requirements to the conversion code that no other code has and because
it's currently not used. I think it doesn't make sense to maintain code
just because it could possibly be used again later.

Closes #2213
Refs #1886

This was SVN commit r14036.
2013-10-20 17:13:53 +00:00
Ykkrosh a4cd90ddfc Avoid non-ASCII characters in source code, since tools don't decode them consistently.
Fixes #2198.

This was SVN commit r14035.
2013-10-20 09:27:44 +00:00
leper d6f6d2b145 Remove useless error messages.
This was SVN commit r14034.
2013-10-20 01:47:16 +00:00
Mythos_Ruler 2117f77812 Fixed some resource placement.
This was SVN commit r14033.
2013-10-20 01:18:59 +00:00
Mythos_Ruler 50a2bddf77 Fixed some goats.
This was SVN commit r14032.
2013-10-20 01:10:02 +00:00
Mythos_Ruler 34d927f25c These two skirmish maps are now complete with walls for Iberians.
This was SVN commit r14031.
2013-10-19 23:52:28 +00:00
Mythos_Ruler 15f565f316 Corinthian Isthmus and Persian Highlands skirmish maps (wip).
This was SVN commit r14030.
2013-10-19 20:54:41 +00:00
leper 742c489353 Fix typos, remove BOMs and add newlines before EOF. Refs #2185. Patch by Gallaecio.
This was SVN commit r14029.
2013-10-19 20:13:48 +00:00
leper 71a41ba401 Line endings. Refs #2185.
This was SVN commit r14028.
2013-10-19 20:07:20 +00:00
Mythos_Ruler 45d4e92782 Fixed building requirements for Town Phase.
Changed Brit Wonder to the new Stonehenge model. :)

Trying out some new hunting changes from sanderd. Might just be
temporary. Refs #2092

This was SVN commit r14027.
2013-10-19 18:20:25 +00:00
Yves b9892bc73a Remove ScriptableObject/CJSObject
Since all remaining uses of ScriptableObject/CJSObject have been
removed, the related files can now also be removed.
Closes #2212
Refs #2126
Refs #2137
Refs #1886

This was SVN commit r14026.
2013-10-19 10:14:08 +00:00
Ykkrosh 024dd82209 Fix non-PCH build
This was SVN commit r14024.
2013-10-19 01:11:20 +00:00
Ykkrosh ac335f37c8 Fix some Clang warnings about unused private members
This was SVN commit r14023.
2013-10-19 00:53:58 +00:00
leper c0b628bcac Fix some typos. Patches by Swyter (Spanish translator). Fixes #2210, #2211.
This was SVN commit r14022.
2013-10-18 20:33:08 +00:00
Ykkrosh 701508922f Use CStrIntern for font names to reduce lookup cost
This was SVN commit r14020.
2013-10-18 16:15:42 +00:00
Ykkrosh 91169c82c7 Optimise rendering of scrollable text boxes by clipping
Add optional clipping rectangle to CTextRenderer. Strings that are
printed
outside the vertical extent of the clipping rectangle will be
immediately
skipped. This greatly reduces the cost of large scrollable text boxes.

This was SVN commit r14019.
2013-10-18 16:05:02 +00:00
Ykkrosh 751558d894 Optimise text rendering by batching
When CTextRenderer is given multiple strings with no differences other
than position, render them in a single glDrawElements call to reduce
driver overhead.

Also avoid some unnecessary copies of std::wstrings.

This helps performance a bit with large GUI text boxes.

This was SVN commit r14018.
2013-10-18 16:02:48 +00:00
Ykkrosh b6c7c0d799 Optimise glyph lookup in text renderer
std::map lookup was a major cost when rendering large amounts of text.
Replace it with a more efficient 2-level array.

This was SVN commit r14017.
2013-10-18 15:56:12 +00:00
Ykkrosh 5778484a77 Refactor text renderer
Replace unifont with CFont and CFontManager, since the h_mgr interface
was
needlessly inconvenient.

Load the font textures through CTextureManager, to support dynamic
reloading (e.g. when resetting GL state - see #741).

Add CFontMetrics as a convenient wrapper for code that just wants to
measure text.

Fixes #1117.

This was SVN commit r14016.
2013-10-18 15:53:07 +00:00
Ykkrosh 8799bd98b0 Support 8bpp textures
When textures.xml specifies format="alpha", the input is expected to be
an
8-bit greyscale PNG, and the output will be an 8-bit uncompressed
alpha-only DDS.

Add format override to CTextureProperties, to select between e.g.
GL_ALPHA
and GL_LUMINANCE for 8-bit textures.

This is needed so fonts can use the new texture system.

This was SVN commit r14015.
2013-10-18 15:36:31 +00:00
leper 6a2fac7a58 Add hotkeys for JSDebugger commands. Patch by sathyam. Fixes #2208.
This was SVN commit r14014.
2013-10-18 14:41:08 +00:00
Enrique 9802adf92f celt_stonehenge with normal and spec maps. Fixes #2053
This was SVN commit r14013.
2013-10-18 14:29:10 +00:00
sanderd17 f3968c0d4c fix some flaws in the preferred classes. Patch by Jammus, Fixes #1985
This was SVN commit r14011.
2013-10-16 19:08:01 +00:00
sanderd17 e6d9094c98 Remove InitSavedGame, but keep the rallypoint problem it solved. Fixes #1762, Patch by mimo.
This was SVN commit r14010.
2013-10-16 17:58:12 +00:00
OmriLahav 6c3c6cfd3a This was SVN commit r14009. 2013-10-16 14:08:47 +00:00
Ykkrosh a2f836c393 Prevent bogus -Wmaybe-uninitialized warnings in GCC
This was SVN commit r14008.
2013-10-16 12:22:50 +00:00
Mythos_Ruler eb33d0fd61 New unit for Romans: "Italian Allied Cavalry" which can help counter archers.
Persians and Mauryans still have uber archers, but must first pay for
them by researching "Archery Tradition" at the Barracks for 200F 300W.
This technology adds +10 meters to the range of all bow-using units,
plus makes archer units train faster (but have less health).

This was SVN commit r14007.
2013-10-16 01:04:55 +00:00
Mythos_Ruler 8456d50015 Found a couple more. (removing stonewall attack restriction).
This was SVN commit r14006.
2013-10-15 22:43:59 +00:00
Mythos_Ruler 8053cbd474 Remove the attack restriction for units against stone walls. May add it back for ranged units like archers and javelinists, after some discussion. I also feel it would be kind of weird to "charge" a stone wall (except for battering rams and elephants). So, we'll have to talk about it some more. But for now, let's test this out.
This was SVN commit r14005.
2013-10-15 22:43:06 +00:00
Enrique 40db79df33 greek docks do not show warships in the foundation until construction is finished.
Different actor variations of the building can be displayed while
construction naming their variation to "scaffold"

This was SVN commit r14004.
2013-10-15 21:24:20 +00:00
sanderd17 2bbbcff811 fix tests, breaking caused by renaming files.
This was SVN commit r14003.
2013-10-15 16:10:06 +00:00
sanderd17 5f5eedc513 Rename technology related files, methods and messages so their names represent the shared data flow between technologies and auras (and maybe future components). Implement the C++ part of auras through these generalised files. Fixes #2154
This was SVN commit r14001.
2013-10-15 10:05:08 +00:00
sanderd17 a4ce8dac34 fix technologies broken by 379a7b208f
This was SVN commit r14000.
2013-10-14 20:36:57 +00:00
sanderd17 379a7b208f Implement the js side of auras. Refs #2048. Patch with the help of Alpha123. Only the temple aura is added as example, all other aura components are removed from the templates to be created from scratch again.
This was SVN commit r13998.
2013-10-14 15:51:21 +00:00
Mythos_Ruler 57d47f23c9 This was SVN commit r13997. 2013-10-13 18:11:54 +00:00
Enrique 417e2455a0 Added ptolemaic ptolemaic storehouse and Lordgood's new cart temple and ptolemaic defense tower with little fixes.
This was SVN commit r13996.
2013-10-13 15:26:43 +00:00
Ykkrosh ce5c43fe03 Fix typo
This was SVN commit r13995.
2013-10-13 11:41:30 +00:00
historic_bruno 3a28caed03 Rebuilt premake4.exe with VC++ 2008 to avoid VC++ 2012 issues targeting XP
This was SVN commit r13994.
2013-10-12 23:47:09 +00:00
Enrique 41de5440e0 Added and applied normal and spec maps for ptolemaic struct, paintings and statues, added ptolemaic temple and farmstead. Fixed ptolemaic CC footprint + little fixes
This was SVN commit r13993.
2013-10-12 21:33:21 +00:00
Mythos_Ruler 7335c32c7e Some updated sounds from LAVS.
This was SVN commit r13992.
2013-10-12 01:27:10 +00:00
leper 9b8667a9aa Really add special starting unit.
This was SVN commit r13991.
2013-10-11 23:37:04 +00:00
leper 4f03550adf Create a special starting unit entity for skimish maps.
This was SVN commit r13990.
2013-10-11 23:36:02 +00:00
leper 396bd844dd Remove duplication between getActionInfo and determineAction. Allow setting rally points if not all selected buildings can do so. Patch by mimo. Fixes #2189.
This was SVN commit r13989.
2013-10-11 22:43:22 +00:00
leper 801cac87dd Properly queue rally points when setting them via the minimap. Patch by mimo. Fixes #2203.
This was SVN commit r13988.
2013-10-11 21:50:45 +00:00
sanderd17 c5669e2c4e Add a back to work button. Patch by Itms. Fixes #799
This was SVN commit r13987.
2013-10-11 19:11:07 +00:00
Ykkrosh e2d28c8894 Add AppData file, for use by some Linux package installers.
Fixes #2202.

This was SVN commit r13986.
2013-10-11 18:55:46 +00:00
OmriLahav 7791c4c61d This was SVN commit r13985. 2013-10-11 11:01:55 +00:00