Commit Graph

13627 Commits

Author SHA1 Message Date
eb7955599a Optimise silhouette rendering.
Do some intersection tests on the CPU so that the silhouette render
passes only have to draw models/patches that might actually contribute
to silhouettes, saving the CPU and GPU cost of rendering more objects
than necessary.

This was SVN commit r15483.
2014-07-03 01:00:25 +00:00
ffd6e10edf Make CGUIManager register a callback function for hotloading instead of specifically calling it.
This was SVN commit r15482.
2014-07-02 23:44:39 +00:00
30e851ab90 Forward-declare CShaderProgramPtr, to avoid pulling in more headers than necessary and to hypothetically reduce build times by a minuscule amount.
This was SVN commit r15481.
2014-07-02 22:36:45 +00:00
404e808ed5 Add yes-no dialog and general dialog code to present choices to players. Can be used by triggers.
This was SVN commit r15480.
2014-07-02 14:48:22 +00:00
c844589f48 Add missing translate() call.
This was SVN commit r15479.
2014-07-01 21:05:33 +00:00
a5065b523d Petra: refrain AI to build/repair under enemy fire and few fixes on economy management
This was SVN commit r15478.
2014-07-01 19:48:38 +00:00
343066040f Remove inconsistent checks for pSimulation2 when saving maps and ensure that it is set.
Remove commented out code writing triggers that has nothing to do with
the actual triggers implementation.
Free memory that was allocated for error reporting when when fork()
fails.
Remove dead initialization.

This was SVN commit r15477.
2014-07-01 19:00:41 +00:00
89c6487ffe Forgot to remove my fake radiosity changes.
This was SVN commit r15476.
2014-07-01 16:53:13 +00:00
f8d53d9a1d Clean up of the last commit.
This was SVN commit r15474.
2014-07-01 16:15:03 +00:00
ab30e0d4fb Change the water texture to a new, bigger one, created in Blender (thanks to Enrique). Change settings so that they are more logical, yet allow reverting back to an even lower quality setting. Add a WIP high setting (with foam) which isn't finished yet.
Change the shader itself so that the effects look nicer and are more
consistent across settings.
Rework the water mesh generation (simpler system). Fix a few issues.

May work oddly with Atlas since I haven't been able to compile yet.

Refs #1875 (maybe fix), Fixes #2077 (I'll assume it does), Fixes #2114
(assumption again), refs #48.

This was SVN commit r15473.
2014-07-01 16:05:05 +00:00
0bde61fa5b Simplify 'survival of the fittest' map by using Gaia as attacker, and using the trigger point ownership to differentiate between different players, instead of hardcoding a list.
This was SVN commit r15471.
2014-07-01 09:29:45 +00:00
fa5b373698 Add some missing semicolons.
This was SVN commit r15470.
2014-06-30 21:38:45 +00:00
66485bcd17 Check that at least one assignment exists before tryintg to copy it.
This was SVN commit r15469.
2014-06-30 17:21:12 +00:00
00fa45161d Added "Survival of the Fittest", a demo random map with triggers. Refs #52
This was SVN commit r15468.
2014-06-30 13:59:34 +00:00
c339928c6f Disallow placing some special entities in Atlas. Fixes #1696. Patch by trompetin17
This was SVN commit r15467.
2014-06-30 10:20:20 +00:00
b4fc393f18 Change camera rotation in Atlas to be the same as in the game. Refs #1066.
This was SVN commit r15466.
2014-06-29 21:30:51 +00:00
fd91398a95 Petra: fix the fix preventing the AI to be stuck trying to produce unavailable units
This was SVN commit r15465.
2014-06-29 19:16:18 +00:00
6ed07ef4d9 Petra: hopefully improve the gatherers management + some cleanings
This was SVN commit r15464.
2014-06-28 20:02:18 +00:00
97118f39b3 remove predefined AI in some skirmish maps, so that the default is taken
This was SVN commit r15463.
2014-06-28 19:46:10 +00:00
d90020e88e This was SVN commit r15462. 2014-06-28 11:01:59 +00:00
c626cf66f9 Fix build-osx-libs properly for mavericks after learning some Bash.
Fix a long-standing typo in TerrainRenderer for water rendering that
apparently had no effect.
Don't compress the water textures to make it look better. They will be
changed anyhow.

This was SVN commit r15461.
2014-06-28 08:54:59 +00:00
789922b15a Updates LICENSE.txt files for recent changes
This was SVN commit r15459.
2014-06-28 06:21:27 +00:00
59b2493990 Missed changes from 304a7c1201
This was SVN commit r15458.
2014-06-28 05:50:32 +00:00
6bec648833 Removes bundled ENet source. NOTE: system libenet (1.3) is now required on *nix, see BuildInstructions for updates. This change requires running update-workspaces. Fixes #1568.
Updates update-workspaces.sh and build-osx-libs.sh for this change.
Updates precompiled win32 ENet to 1.3.12, built with VC++ 2010, and
moves it to libraries/win32, refs #864.

This was SVN commit r15457.
2014-06-28 05:48:51 +00:00
304a7c1201 Updates precompiled win32 libpng to 1.6.12, built with VC++ 2010, refs #864.
Removes unused ffmpeg definition from extern_libs4.lua

This was SVN commit r15456.
2014-06-28 05:34:39 +00:00
dd3fdf6800 Correct assignment dropdowns to always be adjustable by the game controller.
This was SVN commit r15454.
2014-06-28 05:02:29 +00:00
c2763dca24 This was SVN commit r15453. 2014-06-27 05:31:47 +00:00
b1307c83be fix guard command broken in recent commits
This was SVN commit r15452.
2014-06-26 21:15:16 +00:00
58932825a6 Petra: some tunings and cleanings
This was SVN commit r15451.
2014-06-26 20:50:24 +00:00
ae93c02ba8 Fixes a bug that caused script filenames to be defined as properties of the global object.
This was SVN commit r15450.
2014-06-26 17:08:46 +00:00
217a399ee3 Carthaginian ballista
This was SVN commit r15449.
2014-06-26 12:10:36 +00:00
05693744cc Hellenistic ranged siege animations commit
This was SVN commit r15448.
2014-06-26 06:37:08 +00:00
fd6b199606 Fix compiling on Mavericks. Users on older systems will need to change a few lines in either of those scripts, but it should not break their build. For now, I'm saying it Fixes #2304 .
This was SVN commit r15447.
2014-06-25 18:01:00 +00:00
3b35afeeee typo
This was SVN commit r15446.
2014-06-25 15:19:31 +00:00
b1b96a89d6 Fix culling for shadows and reflections.
Previously we had a single culling frustum based on the main camera, and
any object outside the frustum would never get rendered, even if it
should actually contribute to shadows or reflections/refractions. This
caused ugly pop-in effects in the shadows and reflections while
scrolling.

Extend the renderer to support multiple cull groups, each with a
separate frustum and with separate lists of submitted objects, so that
shadows and reflections will render the correctly culled sets of
objects.

Update the shadow map generation to compute the (hopefully) correct
bounds and matrices for this new scheme.

Include terrain patches in the shadow bounds, so hills can cast shadows
correctly.

Remove the code that tried to render objects slightly outside the camera
frustum in order to reduce the pop-in effect, since that was a
workaround for the lack of a proper fix.

Remove the model/patch filtering code, which was used to cull objects
that were in the normal camera frustum but should be excluded from
reflections/refractions, since that's redundant now too.

Inline DistanceToPlane to save a few hundred usecs per frame inside
CCmpUnitRenderer::RenderSubmit.

Fixes #504, #579.

This was SVN commit r15445.
2014-06-25 01:11:10 +00:00
bb4b911e99 Remove remaining warnings about AI naval map support. Also hide player assignment dropdowns on network clients.
This was SVN commit r15444.
2014-06-24 22:53:02 +00:00
ec5215f843 Petra: avoid doing some unused stuff
This was SVN commit r15443.
2014-06-24 20:44:37 +00:00
067a1d4829 Latin female sound files from Itms
This was SVN commit r15442.
2014-06-24 19:40:48 +00:00
06c1f9f972 Fix canyon rms when you for some reason want to start as the only player.
This was SVN commit r15441.
2014-06-24 19:12:44 +00:00
3013b35c13 Petra fixes
This was SVN commit r15440.
2014-06-24 18:31:36 +00:00
be767e7983 Fix dog bark xml files
This was SVN commit r15439.
2014-06-24 11:14:13 +00:00
5509e8e51c This shouldn't have been comitted
This was SVN commit r15438.
2014-06-24 11:09:04 +00:00
006bf42809 Fix segmentation fault in the sound destructor. Happened when the sound file doesn't exist. Errors are shown by other code.
This was SVN commit r15437.
2014-06-24 11:07:39 +00:00
7d8a4c3a88 Improve the hawk with a gliding animation and a better flapping animation.
This was SVN commit r15436.
2014-06-24 11:06:04 +00:00
4ad2677920 Adding latin voice files by Itms
This was SVN commit r15435.
2014-06-23 23:41:23 +00:00
ed1fb3058f Small audio folder restructure and further deletes
This was SVN commit r15434.
2014-06-23 23:22:53 +00:00
a6e6fd6591 Removing redundant placeholder audio
This was SVN commit r15433.
2014-06-23 22:59:43 +00:00
3746d7c3d9 Adds a playable trigger demo mission for multiplayer and TreasureCollected events.
Search treasures on small islands and on water. Collect more treasures
than your opponent to win.
I've used the Cycladic Archipelago scenario map with some minor
adjustments, mainly treasure placement and civ preselection for even
chances (both need townphase to build trading boats that can collect
floating treasures).
There's still some room for improvement to make it more fun and add
additional triggers, but I'll leave that for modders. :)

This was SVN commit r15432.
2014-06-23 20:14:43 +00:00
7e9d6f8ebe Adds translation message extraction for map specific trigger scripts.
This was SVN commit r15431.
2014-06-23 19:59:37 +00:00
692cc8240d Remove empty comment + turn delay times into 0.
This was SVN commit r15430.
2014-06-23 18:25:19 +00:00