Commit Graph

12131 Commits

Author SHA1 Message Date
994ebd9836 Add a list of statically-constructed CStrIntern strings
Switch all the constant strings in graphics code to use the new
variables.
This avoids the cost of instantiating CStrInterns at runtime every
frame.

This was SVN commit r13906.
2013-09-29 13:19:52 +00:00
08f431fa0d Ptolemaic entity templates for Enrique.
This was SVN commit r13905.
2013-09-29 03:08:59 +00:00
4e9570cd0f Fix unnecessary CShaderConditionalDefines copy, and inline some functions
This was SVN commit r13904.
2013-09-29 02:05:02 +00:00
f075571502 Fix slightly expensive GetSystemShaderDefines()
Only recompute when any relevant parameters have changed, then return
the cached value.

This was SVN commit r13903.
2013-09-29 01:00:11 +00:00
555deea136 Fix conditional defines to not construct new CShaderDefines frequently
CShaderDefines is designed to be efficient to copy and compare, but not
to construct. Conditional defines were constructing new CShaderDefines
for many models every frame.

Precompute all the possible conditional combinations of CShaderDefines
when a material is first loaded, so they can be looked up at no cost
when rendering.

This was SVN commit r13902.
2013-09-29 00:30:58 +00:00
22f0f2b232 Set _NO_DEBUG_HEAP=1 in VS2010 projects
The debug heap has a high performance cost, even in release mode,
when running inside a debugger, which is surprising to people trying
to measure performance. It doesn't seem very useful at finding bugs
either.

Add a NoDebugHeap flag to Premake, to set that environment variable
when running in the VS2010 debugger.

This was SVN commit r13901.
2013-09-28 14:35:28 +00:00
2d1b7914a6 This was SVN commit r13900. 2013-09-28 11:58:05 +00:00
b8a5acfd9e Preview image for The Gauls demo map.
This was SVN commit r13899.
2013-09-26 18:44:45 +00:00
28ce5f3458 It might be better to issue a LOGWARNING when Spatial queries are too large. Opening the crash window seems a bit too much for something that can be recovered from.
This was SVN commit r13898.
2013-09-24 21:50:46 +00:00
e370af8d4e Fix rally point rendering on saved games. Fixes #1762. Patch by mimo
This was SVN commit r13897.
2013-09-24 20:27:18 +00:00
6880fd214f Fixed name of this map.
This was SVN commit r13896.
2013-09-24 18:41:19 +00:00
895f927ff0 Celts corral props missing fix
This was SVN commit r13895.
2013-09-24 16:26:26 +00:00
59c8e9e6dc Big gameplay experiment: Moved Civic Centers from Town Phase to City Phase to see what it does to multiplayer match ups.
New "sandbox" demo map for the Gauls.

Renamed "Night's Watch" to "Sentries."

This was SVN commit r13894.
2013-09-24 15:55:35 +00:00
cd51540725 This was SVN commit r13892. 2013-09-22 18:13:19 +00:00
2a613f8236 Removes mostly useless video memory detection, fixes another crash with Nvidia Optimus on Windows, fixes #2145, #2138
This was SVN commit r13891.
2013-09-22 18:07:33 +00:00
e488ed09f5 This was SVN commit r13890. 2013-09-22 11:30:24 +00:00
ae4ccfe050 3D farm fields for all factions.
Fixed tooltips for a bunch of units.

Increases pierce armor for elephants.

This was SVN commit r13889.
2013-09-22 08:07:29 +00:00
5287af8967 Increased SpatialQueryArray max results from 1024 to 2048. This is a temporary fix until the Search and Prune solution is implemented.
This was SVN commit r13888.
2013-09-22 04:37:46 +00:00
5afb18dda4 fix units ejecting on destroying structure
This was SVN commit r13887.
2013-09-21 19:41:13 +00:00
4f6ddfe894 fix theatron build limit
This was SVN commit r13886.
2013-09-21 19:05:59 +00:00
636f09053b celt tavern update
This was SVN commit r13885.
2013-09-21 15:24:56 +00:00
9781b67cf4 Changes the Console to expose global functions to scripts instead of properties.
Fixes #2140
Refs #1886

This was SVN commit r13884.
2013-09-21 14:48:19 +00:00
bb506fb578 Spec maps and new player color texture for Greek females.
This was SVN commit r13883.
2013-09-21 12:41:05 +00:00
21639ce5ea Normal map and Specular map for warship sails.
Fixed Cav Sword tooltip.

Updated the product logo a little bit.

This was SVN commit r13881.
2013-09-21 11:50:04 +00:00
0233bb4877 Temporary Ptolemies emblem.
This was SVN commit r13880.
2013-09-21 09:23:21 +00:00
ccc873d9d5 Tech complete sound slightly louder.
This was SVN commit r13879.
2013-09-21 09:22:31 +00:00
ec66e59150 Fixed some civ json stuff. Fixed Ptolemaic json.
This was SVN commit r13878.
2013-09-21 09:21:48 +00:00
12e2428495 Changes the Renderer to expose global functions to scripts instead of using CJSObject.
Fixes #2137
Refs #1886

This was SVN commit r13877.
2013-09-21 08:24:45 +00:00
c0b84fb41f Added build limits for Theater, Council Chamber, and Library.
Added Ptolemies civ json file. I am getting a javascript error in-game
though. Need help trouble shooting it.

This was SVN commit r13876.
2013-09-21 07:33:22 +00:00
9d2f59e80a Tweaking the Athenian field.
Tweaking 0 A.D. logo.

Fixed tooltip for Slinger.

Fixed name for Carthaginian wonder.

This was SVN commit r13874.
2013-09-21 03:58:54 +00:00
d252e245ef Optimise fixed multiplies on MSVC x86
On MSVC, casting i32 to i64 then multiplying gets compiled into a call
to __allmul, which is slow. Use the __emul intrinsic instead.

GCC 4.6+ appears optimise this case automatically and doesn't need any
special handling.

This reduces the cost of ComputeShortPath by about 50% (testing AI vs AI
on Oasis 01).

This was SVN commit r13873.
2013-09-20 20:17:54 +00:00
5a8cfb738b Commited experimental field for athenians (propped farm field)
This was SVN commit r13872.
2013-09-19 15:29:01 +00:00
4b7c1a915d Celtic corral upgraded. Added more playercolor to gaullic civic centre.
This was SVN commit r13871.
2013-09-19 13:58:48 +00:00
bfe0b79b91 Better fix of Grid memory leak, refs #1842
This was SVN commit r13869.
2013-09-18 01:21:36 +00:00
e10c4ebaae Amend 553875ea83: Forgot to include new hotkey in the config.
This was SVN commit r13868.
2013-09-17 00:31:18 +00:00
553875ea83 Allow the use of Enter in addition to the OK button in the Join Game dialog.
This was SVN commit r13867.
2013-09-17 00:30:11 +00:00
9f2a850a95 Fixes buggy operators and memory leak in Grid class, refs #1842
This was SVN commit r13866.
2013-09-17 00:28:22 +00:00
5d9b2b95b0 Ticket #2127 - Performance and style improvements in scriptinterface.
No real behavior changes, only code maintenance.

Fixed signed/unsigned mismatch in EntityMap.h

This was SVN commit r13865.
2013-09-16 19:10:06 +00:00
97912dd545 This was SVN commit r13864. 2013-09-16 16:56:26 +00:00
16b615db79 Celt walls upgraded
This was SVN commit r13863.
2013-09-16 12:25:03 +00:00
a770ad9467 small code style fixes
This was SVN commit r13862.
2013-09-16 09:14:16 +00:00
1b6a5fa802 This was SVN commit r13861. 2013-09-15 21:37:05 +00:00
2a5ec404d1 Further reverted RangeManager sorting to stable_sort, since possibly with different STL implementations, the order of entities might change and cause OOS.
Overflowing elements in SpatialQueryArray are now reported with
debug_warn, but can be ignored and the program will continue working,
but further entities will be truncated.

This was SVN commit r13860.
2013-09-15 21:11:20 +00:00
bb799bdd53 upgraded gaul defense towers and celtic storehouse
This was SVN commit r13859.
2013-09-15 21:11:14 +00:00
5fe43a0f21 removed non-used duplicated meshes
This was SVN commit r13858.
2013-09-15 19:56:13 +00:00
9eedd22b9a fix garrisoned units count for some special cases. Refs #2096. Patch by mimo
This was SVN commit r13857.
2013-09-15 16:47:40 +00:00
65bddb7fa5 Celtic docks, kennel, farmstead and temple upgrades
This was SVN commit r13856.
2013-09-15 16:09:23 +00:00
bdeb358c44 Upgraded britons market and added new gaul market
This was SVN commit r13855.
2013-09-15 14:09:25 +00:00
9694eec8b8 As per ticket #1707. Some minor improvements to spatial subdivision. Makes way for future changes in RangeManager.
Right now merely improves memory usage.

This was SVN commit r13854.
2013-09-15 14:03:53 +00:00
6644f224cd remove warn messages. Now really fixes #2102
This was SVN commit r13853.
2013-09-15 09:33:45 +00:00