1
0
forked from 0ad/0ad
Commit Graph

13555 Commits

Author SHA1 Message Date
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
17c473f2f3 Add a trigger to the gallic fields map + fix a typo.
This was SVN commit r15429.
2014-06-23 18:12:51 +00:00
fcc4d7433a Petra: fix a bug and some typos
This was SVN commit r15428.
2014-06-23 17:54:32 +00:00
8915037631 Turn victory conditions into trigger scripts. Gui needs to be updated to allow combining of different victory conditions + to allow different lists per map. So there are no specific missions yet.
This was SVN commit r15427.
2014-06-23 17:37:27 +00:00
b811066b85 Add ownership changed event to Triggers.
This was SVN commit r15426.
2014-06-23 16:32:44 +00:00
e33e70e626 Change trigger initialisation as it's not compatible with multiple trigger files (functions would overwrite each other)
This was SVN commit r15425.
2014-06-23 15:55:07 +00:00
49c7efad4f Add demo triggers map. Showing all triggers with a minimum amount of code.
This was SVN commit r15423.
2014-06-23 14:19:42 +00:00
f94491a1d1 Forgot to remove some debug info
This was SVN commit r15422.
2014-06-23 13:52:52 +00:00
9f47ed536d Add engine support to triggers + a component to provide an easy interface and to be extended by triggers. Thanks to SpahBod for the biggest part of the code, and Yves for the review.
This was SVN commit r15421.
2014-06-23 13:42:59 +00:00
213732d5af Updates some precompiled win32 libraries with VC++ 2010 (note: requires update-workspaces), refs #864:
Updates libiconv to v1.14.
Updates libxml2 to v2.9.1.
Updates zlib to v1.2.8.
Rebuilds FCollada.
Updates libxml2 to use same libiconv as tinygettext.
Cleans up unneeded libiconv files.

This was SVN commit r15416.
2014-06-23 01:07:16 +00:00
600e8bd226 Fixes MSVC warning about uninitialized playerId in Atlas entity pasting code (using 0 as a sensible default value), refs #96
This was SVN commit r15415.
2014-06-22 22:19:02 +00:00
09637ea0cf Fix selection issue with mace champ cav.
This was SVN commit r15414.
2014-06-22 21:45:00 +00:00
7b781f82d3 Fix capitalisation issue
This was SVN commit r15413.
2014-06-22 20:35:16 +00:00
f1e077d7e9 Fix hero overlay by requiring at least one unit to be trained
This was SVN commit r15412.
2014-06-22 20:00:34 +00:00
144cb0e44a Petra: fix trying to barter while market is still a foundation
This was SVN commit r15411.
2014-06-22 12:10:51 +00:00
0e6f6576dc Fix compilation on Mavericks when running build-osx-bundle.sh.
Fixes to build-osx-libs.sh.
Support gloox properly on OSX.
Refs #2304 (not fixed since afaik xCode still runs into some issues)

This was SVN commit r15410.
2014-06-22 08:27:58 +00:00
4e996de883 Fix UnitAI bug found by FalseVision
This was SVN commit r15409.
2014-06-21 21:03:44 +00:00
67d81996f6 petra: various (small) changes in attack and economic management + cleanings
This was SVN commit r15408.
2014-06-21 16:21:11 +00:00
8f0772034e Don't process tokens starting with a '-' into translatable strings.
This was SVN commit r15407.
2014-06-21 08:09:24 +00:00
c793da5368 Don't allow changeing disabled dropdowns using the scrollwheel. Also corrects some things in b9a4af4cc6.
This was SVN commit r15406.
2014-06-21 00:25:12 +00:00
b9a4af4cc6 Fix #2595 by validating cheats are disabled in rated games. Also forces locked teams in ranked games and adds a scrollbar to the lobby subject.
This was SVN commit r15405.
2014-06-20 23:59:04 +00:00
160a83b73f Bits of cleanup
This was SVN commit r15403.
2014-06-20 03:45:19 +00:00
1659a28aa0 Correctly remove players who cancel while rejoining. Fixes #2240
This was SVN commit r15402.
2014-06-20 03:22:40 +00:00