1
0
forked from mirrors/0ad
Commit Graph

13751 Commits

Author SHA1 Message Date
leper be2f0e69fc Make the modmod standalone.
Mount public in case we are starting Atlas and no mods are specified in
the config.
If users remove all mods and save this to the config and try to start
Atlas it will
crash, as it cannot find some needed files.

This was SVN commit r15678.
2014-08-25 16:38:54 +00:00
leper 64bfa089af Add mod selection mod.
Includes some contributions by rada and sanderd17.

This was SVN commit r15677.
2014-08-25 16:02:54 +00:00
leper 523d220ac5 Add engine support to load mods from config and restart into mods.
Restructure mod mounting code a bit to make it reusable, and use it for
replays. Fixes #2703.

This was SVN commit r15676.
2014-08-25 16:02:40 +00:00
mimo 09e6d5ae02 fix 2f1d143dc2, which fixes #2747
This was SVN commit r15674.
2014-08-24 19:56:50 +00:00
leper c5c394fd17 Fix some disabled tests.
This was SVN commit r15673.
2014-08-24 15:29:53 +00:00
leper 2b7e9728b6 Fix failure in TestNetComms::test_basic_DISABLED. Patch by Echelon9. Fixes #2426.
This was SVN commit r15672.
2014-08-24 12:02:52 +00:00
mimo 2f1d143dc2 give possibility to choose type of targets in moveAttack, fixes #2740
This was SVN commit r15671.
2014-08-24 11:51:03 +00:00
mimo ac9d4f1036 various small fixes and cleanings to Petra
This was SVN commit r15670.
2014-08-24 11:35:08 +00:00
leper 0e01f20d29 Upgrades cxxtest.
Replaces cxxtest-4.3 with cxxtest-4.4 (without .gitignore or .cvsignore
files) (see [[SVN:14817]]).
Applies the same changes as done in c8bdd993c0 to the new version.

This was SVN commit r15667.
2014-08-24 08:19:24 +00:00
leper da2050793d Fix some greek unit names. Patch by pstumpf2. Fixes #2746.
This was SVN commit r15666.
2014-08-24 07:04:39 +00:00
leper 057bef91f2 Fix undefined property warning. Fixes #2742.
This was SVN commit r15665.
2014-08-23 17:23:15 +00:00
mimo efe21b85da Garrison orders canceled in the ai were not properly canceled in the simulation. Fixes #2741 and #2743.
This was SVN commit r15664.
2014-08-23 13:40:56 +00:00
Spahbod 811e38a833 Fixes for survival of the fittest map.
This was SVN commit r15663.
2014-08-22 05:33:12 +00:00
mimo e4194af0c2 fixes some non-working techs (was in reverted 40365ee815)
This was SVN commit r15661.
2014-08-21 09:09:08 +00:00
mimo 5616221c99 improve comment, see #2737
This was SVN commit r15660.
2014-08-21 09:00:42 +00:00
mimo 6fe9af70cf remove debug output from previous commit
This was SVN commit r15659.
2014-08-19 09:41:38 +00:00
mimo 14b7472c15 petra: prevent JS errors when expected buildings do not exist (for mods)
This was SVN commit r15658.
2014-08-19 09:34:34 +00:00
LordGood 36d205035e New Iberian tower models
This was SVN commit r15657.
2014-08-18 19:30:56 +00:00
sanderd17 edcc4d3ec5 Change the vision range together with the attack range for some techs. Refs #2736. Patch by serveurix
This was SVN commit r15656.
2014-08-18 19:20:46 +00:00
wraitii d9fcebd433 Revert Surprise commits by Mythos_Ruler, 4f7549b4f8 and 40365ee815 following team decision. They will be put in a separate git branch. This is done to avoid conflict with scythetwirler's balance branch and potential other work in that area.
This was SVN commit r15655.
2014-08-18 10:35:30 +00:00
mimo f939f7953d petra: first step towards use of heroes
This was SVN commit r15654.
2014-08-18 09:44:32 +00:00
Enrique 6c8fd6b3dd Fix the rotary mill animation
This was SVN commit r15653.
2014-08-17 17:34:43 +00:00
LordGood d112902b99 fixing ngon glitch on iberian wonder
This was SVN commit r15651.
2014-08-17 13:53:01 +00:00
LordGood cb1612ad8a Iberian wonder
This was SVN commit r15650.
2014-08-17 13:19:27 +00:00
Mythos_Ruler 4f7549b4f8 fix'd attack elements in these templates
This was SVN commit r15647.
2014-08-16 02:32:58 +00:00
leper 12771edb0e Delete dynamic message subscriptions on simulation reset.
This was SVN commit r15646.
2014-08-16 01:23:50 +00:00
leper 422b9d79dc Fixes the cataphract helmet. Textures by stanislas69.
This was SVN commit r15645.
2014-08-15 23:54:09 +00:00
Mythos_Ruler 40365ee815 Surprise.
100% brand new rebalance for every unit in the game, after lengthy
discussion with Enrique.

Some updated portraits.

A couple new tips.

Stan's "cataphract" mask and helmet (the helmet needs a texture).

This was SVN commit r15644.
2014-08-15 23:10:44 +00:00
leper aa6de51793 Fix FPS, real time, and game time overlay hotkeys. Fixes 704d0f9511.
This was SVN commit r15643.
2014-08-15 22:03:12 +00:00
mimo 1a33003538 AI should not use EntityRenamed messages coming from mirages, addresses #2724
This was SVN commit r15642.
2014-08-15 16:18:57 +00:00
Enrique d5cacb027f Snow wolf. Texture edited by stanislas69
This was SVN commit r15641.
2014-08-15 12:14:45 +00:00
Enrique fef9b87381 Ptolemy I hero for ptolemaics by stanislas69
This was SVN commit r15640.
2014-08-15 12:04:52 +00:00
Enrique 302b67049c Gaul farmstead reshape (smaller) by stanislas69
This was SVN commit r15639.
2014-08-15 11:49:23 +00:00
Enrique 8c1a7d5d4c Ptolemaic blacksmith update by stanislas69
This was SVN commit r15638.
2014-08-15 11:35:07 +00:00
LordGood 4f44416bb0 New Iberian houses
This was SVN commit r15637.
2014-08-14 21:01:04 +00:00
Spahbod a4be909094 Temporary fixing the victory bug in survival of the fittest map. Refs #2721.
This was SVN commit r15636.
2014-08-14 09:50:51 +00:00
JoshuaJB b67a6f230b Fix typo from 704d0f9511.
This was SVN commit r15635.
2014-08-13 19:02:59 +00:00
JoshuaJB 704d0f9511 Add config settings for FPS, realtime, and gametime overlays.
This was SVN commit r15634.
2014-08-13 18:56:07 +00:00
LordGood c13547c9a0 Stan's rotary mill
This was SVN commit r15633.
2014-08-13 17:55:14 +00:00
wraitii a4df483f60 Forgot to make a variable unused.
This was SVN commit r15631.
2014-08-13 14:52:38 +00:00
JoshuaJB ada7691bce Add current time counter which can be triggered using Alt+T. Fixes #2718. Patch by thamlett.
This was SVN commit r15630.
2014-08-13 02:35:29 +00:00
mimo abef0673bd fixes some typos
This was SVN commit r15629.
2014-08-12 20:45:06 +00:00
wraitii 0b385384aa Fix terrain overlay rendering after water.
This was SVN commit r15628.
2014-08-12 15:58:03 +00:00
LordGood f7cab71243 Iberian barracks replacement
This was SVN commit r15627.
2014-08-12 03:42:59 +00:00
Yves 8593825eee Modifies 23c708f72a to use the NONCOPYABLE macro as suggested by leper.
This was SVN commit r15626.
2014-08-09 21:16:25 +00:00
Yves 23c708f72a Prevent copying of ScriptInterface objects.
Copying a ScriptInterface is not allowed. The destructor destroys the
JSContext and if there's a copy around that still uses it, that causes
crashes which can be quite hard to debug. This change prevents copying
by of ScriptInterface objects by making the copy constructor private,
which will reveal such errors at compile time.

This was SVN commit r15625.
2014-08-09 20:20:32 +00:00
Yves 83aa817f71 Exact stack rooting for simulation message type conversions.
Also replaces some deprecated API (jsval typedef and OBJECT_TO_JSVAL) in
that part of the code.

Refs #2415

This was SVN commit r15624.
2014-08-09 20:02:49 +00:00
Yves 8ce8e6ba9a Exact stack rooting for IGUIObject.
Refs #2415
Refs #2462

This was SVN commit r15623.
2014-08-08 13:41:47 +00:00
Yves 9872f5741f Exact stack rooting for ScriptInterface::FreezeObject.
Refs #2415

This was SVN commit r15622.
2014-08-08 11:59:49 +00:00
Spahbod 7471662ddc A small change that increases the performance of most random map generation noticeably.
This was SVN commit r15621.
2014-08-07 09:27:22 +00:00