Commit Graph

12232 Commits

Author SHA1 Message Date
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
OmriLahav f22e47a743 This was SVN commit r13984. 2013-10-11 11:01:06 +00:00
historic_bruno 644135b9f3 Fixes variable name conflict in session UI, patch by Itms, fixes #2199
This was SVN commit r13982.
2013-10-11 00:22:27 +00:00
historic_bruno f5eeed9cf7 Clears selections when loading saved game, patch by RefinedCode (fixes buggy selection behavior when using quicksave/quickload), fixes #2178
This was SVN commit r13981.
2013-10-10 23:58:29 +00:00
historic_bruno a00e57df72 Fixes hypothetical mem leak in network code (and an error in Cppcheck), patch by Riemer, fixes #2122
This was SVN commit r13980.
2013-10-10 23:46:42 +00:00
alpha123 f6c9db33d6 Focus on the building a hero is garrisoned in when the hero button is double-clicked. Patch by mimo. Fixes #2131
This was SVN commit r13978.
2013-10-10 21:23:19 +00:00
Mythos_Ruler c7e3c1499f Fixed typo.
This was SVN commit r13977.
2013-10-09 20:07:36 +00:00
Mythos_Ruler cd5a2aa527 Ptolemy IV.
Ptolemaic heroes added to Ptolemaic Fortress.

Seleucid Romanized Infantry Champion.

This was SVN commit r13976.
2013-10-09 13:42:34 +00:00
sanderd17 5c3ff86219 add different skirmish structures + skirmish demo map containing all skirmish templates so far
This was SVN commit r13975.
2013-10-08 18:02:35 +00:00
sanderd17 f3d83e0616 add skirmish defense tower and houses
This was SVN commit r13974.
2013-10-08 09:13:55 +00:00
historic_bruno f3d088dd5c Fixes JS debugger, fixes VS 2013 build error, re-fixes #2127, #2175
This was SVN commit r13973.
2013-10-07 22:55:30 +00:00
RedFox 8464777759 Fixed premake4 build incorrectly ignoring vs2010 action.
fixes #2191

This was SVN commit r13972.
2013-10-07 22:45:08 +00:00
RedFox a97cd73cf8 Adds EnableSSE2 for Visual Studio builds on windows.
Adds optional "--with-c++11" flag for GCC/ICC builds. For possible
future C++11 migration.
refs #2191

This was SVN commit r13971.
2013-10-07 22:39:13 +00:00
RedFox 055ea57468 ref #2191
Adds VS2012 support for premake4. Also adds
update-workspace-with-atlas.bat for VS2012 builds that need to compile
AtlasUI.dll, too.

This was SVN commit r13970.
2013-10-07 22:10:16 +00:00
Mythos_Ruler 79af6fb17f Newly updated Ptolemaic champion cavalry.
This was SVN commit r13969.
2013-10-07 20:47:06 +00:00
historic_bruno b9268fbdcd Fixes error logging in the JS debugger, based on patch by RefinedCode. Fixes #2175
This was SVN commit r13967.
2013-10-07 02:10:41 +00:00
historic_bruno d3e0fb4f84 Fixes crannóc spelling, thanks to GunChleoc
This was SVN commit r13966.
2013-10-07 00:46:58 +00:00
historic_bruno 1408a0be83 This was SVN commit r13965. 2013-10-06 23:29:03 +00:00
historic_bruno 74216a5825 Reverts field limits from f4abcd2ef9 until we can fix AI and UI problems, refs #2187
This was SVN commit r13964.
2013-10-06 23:25:55 +00:00