c5929ca7d5
make tooltip agree with buildrestrictions
...
This was SVN commit r15553.
2014-07-24 20:59:25 +00:00
a574ca2e8f
Petra: improve use of garrisoning for defense + some cleanings
...
This was SVN commit r15552.
2014-07-23 17:57:32 +00:00
2eb12c13ec
give war ships at dock for carthage, for better balance of naval maps
...
This was SVN commit r15551.
2014-07-23 17:18:22 +00:00
a5ebd8dafd
Load trigger scripts in serialization test mode.
...
This was SVN commit r15549.
2014-07-22 23:30:27 +00:00
bfe1e9f182
fix #2603
...
This was SVN commit r15548.
2014-07-22 21:23:25 +00:00
b41289807a
fix a rare JS warning
...
This was SVN commit r15546.
2014-07-22 18:20:47 +00:00
68121f387c
Don't cache (and serialise) all technology templates multiple times. It's still cached once in the TechnologyTemplateManager.
...
This was SVN commit r15545.
2014-07-22 16:18:37 +00:00
9d505f2fd1
fixes petra javascript warnings
...
This was SVN commit r15543.
2014-07-21 16:19:59 +00:00
3782857333
Petra: small fixes + reformat debug outputs
...
This was SVN commit r15540.
2014-07-19 16:17:09 +00:00
1d35d22a7b
let the AI know when a building is decaying
...
This was SVN commit r15539.
2014-07-17 19:56:54 +00:00
98281689f2
Petra: fix a rare bug where the AI would never attack + some attack tunings
...
This was SVN commit r15537.
2014-07-17 17:04:13 +00:00
de9ae66326
Petra: improve support for wonder games
...
This was SVN commit r15535.
2014-07-15 19:07:11 +00:00
17634d7507
Move the minimap to only use the shader pipeline. Should make it OpenGL ES compatible (untested).
...
This was SVN commit r15533.
2014-07-14 17:15:22 +00:00
7b15b526ac
Fixes tests.
...
Changes direct access of EndGameManager.gameType to getter function, by
convention
This was SVN commit r15525.
2014-07-13 19:45:44 +00:00
83d37f7857
Re-allow placing skirmish entities in Atlas. Refs #1696
...
This was SVN commit r15521.
2014-07-13 09:35:00 +00:00
7531a417e5
Fix re-garrisoning on visible garrison points after killing the units on that spot. Issue found by Stan.
...
This was SVN commit r15520.
2014-07-12 21:38:10 +00:00
eebc2f07bb
Move some trees to accessible locations. Issue found by willsmith182.
...
This was SVN commit r15519.
2014-07-12 20:08:43 +00:00
42591ef4cb
Fix previous commit, refs #1257
...
This was SVN commit r15512.
2014-07-11 18:29:18 +00:00
f5cc99f78b
Fix OOS problems caused by an unwanted modification of the simulation state by the GUI.
...
Refs #1257
This was SVN commit r15511.
2014-07-11 18:11:32 +00:00
a4e3422a22
Fix the hero flickering overlay after healing. Fixes #2666 . Patch by Adrian
...
This was SVN commit r15510.
2014-07-11 17:48:01 +00:00
9d335f2e22
Fix typos found by FalseVision
...
This was SVN commit r15507.
2014-07-10 19:17:45 +00:00
255ab52725
fix previous commit
...
This was SVN commit r15506.
2014-07-10 06:30:08 +00:00
e2d893103b
make the AI aware of the game type and start interfacing with wonder victory condition + some fixes
...
This was SVN commit r15505.
2014-07-09 21:41:14 +00:00
77e9e58a32
Petra: fixes + changes on the attack management
...
This was SVN commit r15503.
2014-07-08 19:01:27 +00:00
7e81f4f52a
Update the "number of builders" tooltip to be slightly more helpful.
...
This was SVN commit r15502.
2014-07-08 18:48:08 +00:00
3ba325f9e8
Remove the HQDOF since it did not really work properly and we already have DOF. Fixes #2111
...
This was SVN commit r15501.
2014-07-08 18:23:53 +00:00
56bcbd59a0
Fix allied garrison issue.
...
This was SVN commit r15500.
2014-07-07 09:28:34 +00:00
27c700ce3a
Petra: various small tunings or fixes
...
This was SVN commit r15499.
2014-07-06 17:31:02 +00:00
62c1ac310d
It would appear like I inadvertently committed a version of the water with some debug information in that made it look black.
...
This was SVN commit r15497.
2014-07-06 15:22:44 +00:00
334ba4b740
SpiderMonkey now supports default parameters!
...
I've just modified those places with TODO comments, but there are most
likely others that could benefit of the feature to make the code a bit
cleaner and easier to understand.
Thanks to Fabio for pointing it out.
Refs #1886
This was SVN commit r15496.
2014-07-05 13:58:51 +00:00
5571f7a7f9
Fix "Wind Angle" parameter not working properly. Add a precomputed "wind strength" variable so that waves look smaller behind islands. Some tweaks. Refs #48 as usual.
...
This was SVN commit r15492.
2014-07-05 10:20:30 +00:00
aa99f98fce
Fix rmgen for my changes, I had missed that, thanks mimo.
...
This was SVN commit r15491.
2014-07-04 18:24:39 +00:00
4852fad86a
Petra: adapt the AI to gaia now able to launch attacks (with triggers) + cleaning of unused functions
...
This was SVN commit r15490.
2014-07-04 16:12:09 +00:00
991d5bbd63
Fix random maps for my water changes. Fix the replay mode after I had broken it. Fix an occasional crash (that might have crashed Atlas, need someone to check).
...
Improve debugging slightly in case of framebuffer errors. Fix a few
style issues.
This was SVN commit r15486.
2014-07-04 09:03:21 +00:00
326290463e
Further WIP water improvements. Add 3 different textures for different looks. Update some oasis maps for that. Streamline water settings (some removed, some added). Update Atlas for those (needs to be tested). Fix an issue with HQ water effects.
...
Please report any issue and/or crash. Those will get fixed in commits to
come. Refs #48 .
This was SVN commit r15484.
2014-07-03 20:07:15 +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
89c6487ffe
Forgot to remove my fake radiosity changes.
...
This was SVN commit r15476.
2014-07-01 16:53:13 +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
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
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
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
3b35afeeee
typo
...
This was SVN commit r15446.
2014-06-25 15:19:31 +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
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
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
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
ec7a452d4e
Convert multiplayer connection dialog to only use 'modern' styles and make it larger for languge-friendliness and consistancy.
...
This was SVN commit r15399.
2014-06-19 19:22:31 +00:00
bee865416b
Fixes small issues in 81d1f5f71f.
...
This was SVN commit r15398.
2014-06-19 18:50:41 +00:00
b8078deea8
Splitted the PO and POT files
...
Fixes #2494
This was SVN commit r15397.
2014-06-19 18:45:11 +00:00
e529e551d9
fix typo
...
This was SVN commit r15395.
2014-06-19 14:48:48 +00:00
81d1f5f71f
Clean up notifications. Merge the timed and untimed text notifications, allow passing a list of players to all notifications, make modification types moddable. Refs #52
...
This was SVN commit r15394.
2014-06-19 14:37:08 +00:00
6d5039791f
Fix barter panel. Reported by Gameboy
...
This was SVN commit r15393.
2014-06-19 12:34:52 +00:00
12c7fe2bc7
fix a bug in petra attack preparation
...
This was SVN commit r15392.
2014-06-18 20:22:18 +00:00
c9f2ac4b12
Fix giving foundations a population bonus after a tech research. Reported by bouke
...
This was SVN commit r15391.
2014-06-18 15:58:04 +00:00
a76364f825
fix previous commit
...
This was SVN commit r15390.
2014-06-18 15:42:19 +00:00
7baaf382ed
Organise the session helper functions a bit per topic
...
This was SVN commit r15389.
2014-06-18 15:27:28 +00:00
1307a9038a
Split the selection panels in session.xml into multiple xml files
...
This was SVN commit r15388.
2014-06-18 13:03:59 +00:00
7266ea681b
Allow mixing the buttons for the right pane, so make it possible to have a structure that can pack and produce units. Refs #1919
...
This was SVN commit r15387.
2014-06-18 11:23:22 +00:00
054706a114
Allow showing the productionqueue for multiple selected buildings at once
...
This was SVN commit r15386.
2014-06-18 10:46:41 +00:00
94b49a01a9
Adapt the relaxNG files to new gui changes
...
This was SVN commit r15382.
2014-06-17 18:45:40 +00:00
02fd235bbd
Make hotkeys and top panel fully moddable by splitting up the xml file. Allow entire directories to be loaded via an 'include' to provide extra moddability (modders don't have to edit any files, they can just add new ones).
...
This was SVN commit r15380.
2014-06-17 13:03:55 +00:00
8c547a3fad
Fixes a few other invalid XML files reported by the validator script, refs #245
...
This was SVN commit r15379.
2014-06-17 03:53:13 +00:00
aa04b6d782
Fixes invalid actors reported by XML validator script. Some were only technically invalid but others were broken. Refs #245
...
This was SVN commit r15378.
2014-06-17 03:49:37 +00:00
2c9939ac74
Adds Relax NG Compact syntax grammars for most of the XML formats in the engine.
...
Adds converted Relax NG XML grammars for each (Note: don't edit these
directly, modify the compact syntax .rnc files instead, then use a
conversion tool http://relaxng.org/#conversion to generate the .rng
files).
Adds Perl script to validate the XML files using the new grammars
This was SVN commit r15377.
2014-06-17 03:31:40 +00:00
d11e48cd85
Petra: bugfixes + improved attack/defense behaviour
...
This was SVN commit r15376.
2014-06-16 22:03:30 +00:00
013ab4bda7
Make the barter panel uniform with the others, clean up more gui code.
...
This was SVN commit r15375.
2014-06-16 18:34:27 +00:00
ce3b11a3fe
fix the fix of setHeldPosition in b17ffaeb7e
...
This was SVN commit r15374.
2014-06-15 17:27:03 +00:00
bec1e1edfd
fix b17ffaeb7e + fixes from FalseVision on setHeldPosition
...
This was SVN commit r15371.
2014-06-15 16:41:01 +00:00
74e5c8ae26
fix e2b493bb67
...
This was SVN commit r15370.
2014-06-15 16:13:12 +00:00
86aa30e0d9
Remove useless line in UnitAI, found by FalseVision
...
This was SVN commit r15368.
2014-06-15 14:38:25 +00:00
1e38fa7b58
UnitAI fix by FalseVision
...
This was SVN commit r15367.
2014-06-15 14:23:49 +00:00
ef7e19c13e
reset petra debug left in previous commit
...
This was SVN commit r15365.
2014-06-15 12:59:19 +00:00
b17ffaeb7e
Petra: make better use of garrisoning when attacked
...
This was SVN commit r15364.
2014-06-15 12:57:12 +00:00
9a743d65fe
Fix to unitAI by FalseVision + fix a mistake of my own
...
This was SVN commit r15363.
2014-06-15 12:43:52 +00:00
89f33e7579
Fix group number rendering
...
This was SVN commit r15362.
2014-06-15 12:08:58 +00:00
e042fa8768
Make trigger points templates
...
This was SVN commit r15361.
2014-06-15 11:25:25 +00:00
beaf3139c0
Move position calculation of buttons to something cleaner.
...
This was SVN commit r15360.
2014-06-15 09:56:54 +00:00
5064f2728f
Fix tech pairing visuals + hiding
...
This was SVN commit r15359.
2014-06-15 07:56:40 +00:00
f460057700
Fix error for entities that require a technology to be trainable.
...
This was SVN commit r15357.
2014-06-14 22:28:06 +00:00
2766ae7eb5
Marker objects for Atlas
...
This was SVN commit r15356.
2014-06-14 18:44:18 +00:00
e152223a53
fix fix
...
This was SVN commit r15355.
2014-06-14 18:21:48 +00:00
b93877571f
Add missing quotation mark to quote.
...
This was SVN commit r15354.
2014-06-14 17:20:09 +00:00
86ca3b2142
Small cleanup: i, numbButtons and numberOfItems all contain the same value anyway
...
This was SVN commit r15352.
2014-06-14 15:57:42 +00:00
7f172037ac
Clean up a big part of unit_commands.js, and bring most data to a separate JS object (instead of having deep nests of switches and if-else structures)
...
This was SVN commit r15351.
2014-06-14 15:35:13 +00:00
5903935e4a
let the AIs know when a training has started
...
This was SVN commit r15350.
2014-06-14 14:34:37 +00:00
4e6a21e9da
fix promotion of autogarrisoned units (forgot in previous tag)
...
This was SVN commit r15349.
2014-06-14 14:26:51 +00:00
e2b493bb67
fix double-click on a garrisoned hero button should select its holder, even if from autogarrison
...
This was SVN commit r15348.
2014-06-14 14:21:30 +00:00
7cf927baec
fix typo from 2b8758745f
...
This was SVN commit r15347.
2014-06-14 14:14:33 +00:00
8d164ca5d1
Add civ requirement to tech that was missed in the previous commit. Refs #2580 .
...
This was SVN commit r15346.
2014-06-13 21:02:32 +00:00
121f14d521
Add civ requirements to civ specific techs. Patch by s0600204. Refs #2580 .
...
This was SVN commit r15345.
2014-06-13 16:16:31 +00:00
1142fc55ca
Clean up Commands.js a bit.
...
This was SVN commit r15344.
2014-06-13 16:16:25 +00:00
58e628338c
Also check if a technology was already researched when checking requirements. Fixes #2580 .
...
This was SVN commit r15343.
2014-06-13 16:16:10 +00:00
9990d4c885
Actually call the function instead of testing if it exists. Patch by falsevision. Fixes #2626 .
...
This was SVN commit r15342.
2014-06-13 12:54:57 +00:00
55247e926a
Remove legacy trading pane
...
This was SVN commit r15341.
2014-06-13 12:06:57 +00:00
2b8758745f
put the unit commands in a JS object
...
This was SVN commit r15340.
2014-06-13 11:35:16 +00:00
2b408e766b
Fix problem with setting up trade routes
...
This was SVN commit r15339.
2014-06-13 08:01:06 +00:00
350d4a6b7e
add rally points for the AIs
...
This was SVN commit r15338.
2014-06-12 18:41:13 +00:00
e3f3051b2a
Petra: code cleaning and minor improvments
...
This was SVN commit r15337.
2014-06-12 16:47:43 +00:00
2e00628562
Take the action definitions out of input.js, and in a separate JS object that can be edited by other scripts. This makes it possible to easier add new actions by editing this new script, or (in mods) even by editing the object in other scripts.
...
This was SVN commit r15336.
2014-06-12 13:47:37 +00:00
2e4441b528
Minor typos in text strings
...
This was SVN commit r15335.
2014-06-12 13:24:36 +00:00
89f5e7b260
Improve gui moddability by allowing to load an entire directory of scripts at once, and being able to split up big gui XML files. Fixes #2622
...
This was SVN commit r15330.
2014-06-11 17:14:35 +00:00
791eba9451
Fix Splash damage calculation. Patch by falsevision. Fixes #2623
...
This was SVN commit r15329.
2014-06-11 14:02:02 +00:00
b289303c25
Fix setting rallypoint via the minimap + fix out-of-world problem when the targeted entity for a rallypoint disappeared
...
This was SVN commit r15328.
2014-06-11 13:36:12 +00:00
49194819f6
Schwarzwald random map. Script by niektb, with random terrain generation from FeXoR.
...
This was SVN commit r15327.
2014-06-10 19:59:17 +00:00
6d0df59697
Fix theatrons
...
This was SVN commit r15326.
2014-06-10 14:27:43 +00:00
8551a799d0
Petra: prevent gatherers to stay blocked when UnitAI make them return resource in an inaccessible dropsite, see #2563
...
This was SVN commit r15325.
2014-06-10 13:45:23 +00:00
57a7bbcb90
fix javascript warning
...
This was SVN commit r15324.
2014-06-10 13:34:49 +00:00
