1
1
forked from 0ad/0ad
Commit Graph

12197 Commits

Author SHA1 Message Date
26af70ec7b Fixed ptolemaic thureos mesh shape
This was SVN commit r13926.
2013-10-01 15:15:39 +00:00
9f5635085e Fix #1833: animals spin around needlessly while roaming.
Patch from mimo.

This was SVN commit r13924.
2013-09-30 23:52:22 +00:00
e449364408 Recompute system shader defines immediately when the relevant inputs change, instead of delaying until ReloadShaders.
This fixes an error with autostart and smoothlos=true, where the system
defines were being accessed before the first rendered frame.

This was SVN commit r13923.
2013-09-30 22:39:06 +00:00
8cf5f61885 Avoids ugly layering of GUI pages when entering match setup
This was SVN commit r13922.
2013-09-30 20:51:19 +00:00
cbe103bdfe ptolemaic galatian shields for basic, advanced and elite with specular maps.
This was SVN commit r13921.
2013-09-30 19:03:09 +00:00
1f032b7c59 Added Lordgood's new britons barracks and defense tower with minimal tweaking
This was SVN commit r13917.
2013-09-30 08:14:10 +00:00
e24ce51029 Adds DynamicArena allocator that grows by fixed chunk size, fixes #2142.
Changes fixed size arenas to new dynamic arenas with reasonable chunk
sizes (may require tuning), refs #1842

This was SVN commit r13916.
2013-09-30 01:22:44 +00:00
fbee618ac8 Fixes memory leak in sound manager
This was SVN commit r13915.
2013-09-30 01:09:16 +00:00
238b7f84d8 Changes the ConfigDB to expose global functions to scripts instead of properties and custom objects.
Fixes #2172
Refs #1886

This was SVN commit r13914.
2013-09-29 18:56:50 +00:00
2ea0620abb Reduce the health drain of the Nubian Archer.
Fixed the Lighthouse to not have the Library special tech.

Ptol Military Settlement has better sounds and a different portrait.

Increased defense tower limit since they now have a min distance limit.

Tweaked Ptolemies demo map.

This was SVN commit r13913.
2013-09-29 16:29:38 +00:00
022393a0c6 Spelling fixes from the translation work by Gallaecio and Loki72. Fixes #2150, #2170.
This was SVN commit r13912.
2013-09-29 16:14:40 +00:00
c2583e42da Reduce memory allocations in the renderer
Use an arena allocator in ShaderModelRenderer::Render, to reduce
the allocation cost in STL containers.

Avoid unnecessary copying of std::vectors.

This was SVN commit r13911.
2013-09-29 14:48:11 +00:00
6b0a0e83eb Fix profiler malloc count in debug mode on Windows
wdbg_heap_NumberOfAllocations doesn't work without the wdbg_heap
leak detector, which is disabled since it's slow and broken.
Use a simple hook via _CrtSetAllocHook instead to count allocations.

This was SVN commit r13910.
2013-09-29 14:43:14 +00:00
f4abcd2ef9 Gauls get: Tavern and Naked Fanatic.
Britons get: Rotary Mill.

So, now all Celts get Rotary Mill, but also a unique unit-producing
building.

Britons now have a better demo "sandbox" map.

Ptolemies now play like they are intended. Just need tons of new
artwork. ;) Try them out on the demo map: Sandbox - The Ptolemaic
Egyptians.

Some highlights: Their Nubian Archers train very fast, but have a finite
life. The Lighthouse can be built on the shoreline (but looks like a
library). Their Military Settlement works as intended (can be built in
neutral territory, but min distance of 80 meters).

Testing out: Farm field limits (+8 per Farmstead, +2 per civ center).

This was SVN commit r13909.
2013-09-29 14:37:26 +00:00
eceae8be5c Fix crash when setting rally point
This was SVN commit r13908.
2013-09-29 14:02:47 +00:00
d663dae2d8 New version of Aegis. Huge rewrite for WIP naval support (still very, very buggy at this point.) Features a few bugfixes and might be more efficient than the former version.
NEEDS TESTING.

This was SVN commit r13907.
2013-09-29 13:32:52 +00:00
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