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
3b519b132a
fix undefined variable in petra
...
This was SVN commit r15323.
2014-06-10 13:27:49 +00:00
60212b0418
Fix Iberian monument.
...
This was SVN commit r15322.
2014-06-10 13:18:33 +00:00
7cb6768132
fix productionTime computation on AI common-api
...
This was SVN commit r15321.
2014-06-10 12:59:42 +00:00
9723f73262
Fix tests
...
This was SVN commit r15320.
2014-06-09 18:13:29 +00:00
1d7001c8cd
Fix walls + remove debug warning
...
This was SVN commit r15319.
2014-06-09 17:51:23 +00:00
2fb0262142
Futher clean up heroes tooltips + move auras to the templates. Hope they have a bigger chance of staying consistent now.
...
This was SVN commit r15318.
2014-06-09 17:35:37 +00:00
3a2670f7fa
Take aura descriptions out of tooltip, let auras be defined in the entity template rather than in JSON files, as they can't be reused anyway. Fix tooltips and auras for all heroes from athen to gaul.
...
This was SVN commit r15317.
2014-06-09 14:15:05 +00:00
d6b8f1989e
Petra: complete and improve 2c0daaf80b
...
This was SVN commit r15316.
2014-06-09 13:30:41 +00:00
1776aa4750
Continue the transition to the usage of visible classes. Fix Hero inheritance for that.
...
This was SVN commit r15315.
2014-06-09 09:32:36 +00:00
2c0daaf80b
Petra: improve choice of ships to train and some style cleaning
...
This was SVN commit r15314.
2014-06-09 07:54:59 +00:00
5f42834710
some aegis fixes, patch by falsevision, close #2617
...
This was SVN commit r15313.
2014-06-09 07:48:29 +00:00
91a511560c
remove code dupplication for dock angle computation
...
This was SVN commit r15312.
2014-06-08 16:00:00 +00:00
049caba9f9
Let the timer hold the latest turnLength instead of the Attack component. Reduces a lot of messages
...
This was SVN commit r15311.
2014-06-08 09:39:57 +00:00
40b351a99a
Fixes error in silhouettes hotkey handler
...
This was SVN commit r15308.
2014-06-08 02:04:29 +00:00
72706f708b
Some unfinished maps for others to finish if they wish.
...
Tweaked Siwa Oasis.
This was SVN commit r15307.
2014-06-07 14:39:01 +00:00
27ca5fe19d
Iberians now have the Celtic war barge.
...
This was SVN commit r15304.
2014-06-07 11:21:42 +00:00
67a4af0fe0
fix typo from a4f2c2ac90
...
This was SVN commit r15303.
2014-06-05 18:29:11 +00:00
a96953efea
remove dupplicated (and buggy) line introduced in 0fcc074a65
...
This was SVN commit r15302.
2014-06-05 17:51:06 +00:00
53ea269af0
Add the ability to specify a log level when using dlopen and change it to normal for Atlas.
...
This way we do not have two error messages when starting Atlas, but the
dynamic Atlas lib is not available.
Patch by Gallaecio. Fixes #1540 .
This was SVN commit r15301.
2014-06-05 17:07:04 +00:00
c699409246
Add translation context to stances.
...
This was SVN commit r15299.
2014-06-05 14:06:15 +00:00
55760f6413
cache the affected players in order to remove the template bonuses given by auras from the right players before adding them again.
...
This was SVN commit r15298.
2014-06-05 11:24:31 +00:00
2d1f9c33dc
Bring healable classes to the uniform class matching
...
This was SVN commit r15297.
2014-06-05 10:34:41 +00:00
638123950c
Check if the position changed before updating it for rally points set on entities. Refs #1257 .
...
This was SVN commit r15296.
2014-06-05 10:27:40 +00:00
fd615c4c54
Round some alpha values for overlays.
...
This was SVN commit r15295.
2014-06-05 10:22:16 +00:00
a4f2c2ac90
Allow for unification in identity class matching + add the opportunity to combine with AND and OR. Fixes #2612
...
This was SVN commit r15294.
2014-06-05 09:39:36 +00:00
cbfbc72d36
Other auras fix
...
This was SVN commit r15293.
2014-06-05 07:57:05 +00:00
02c68064ed
Fix syntax errors in two auras.
...
Some code style cleanup in aura related files.
This was SVN commit r15290.
2014-06-04 22:27:36 +00:00
b09a702c60
Recompute rally point lines when the rally point is set on a moving unit.
...
Does not account for setting rally points on units that can move into
the FoW/SoD.
Recalculates paths even if the rally points are not displayed.
Refactors UpdateMarkers() to remove some indentation levels.
Based on patch by Itms. Fixes #1257 .
This was SVN commit r15288.
2014-06-04 22:07:58 +00:00
6b015e935e
remove a forgotten debug warning in petra
...
This was SVN commit r15287.
2014-06-04 20:52:21 +00:00
0fcc074a65
Petra: try to improve cart shipyard placement
...
This was SVN commit r15286.
2014-06-04 20:13:15 +00:00
d883fc332d
Correct mime-types and end-of-lines for the XML files in simulation/templates
...
This was SVN commit r15285.
2014-06-04 17:21:24 +00:00
b67aca01c8
Fix color fade to not go beyond 255 and be integer.
...
This was SVN commit r15284.
2014-06-04 16:23:56 +00:00
8d2835d9e0
Fixed resource balance for players 3 and 4. (they didn't have chickens or huntable fauna before).
...
This was SVN commit r15283.
2014-06-04 15:59:43 +00:00
685d5e0197
Switch default AI to Petra and remove an old Aegis warning.
...
This was SVN commit r15282.
2014-06-04 15:29:20 +00:00
9a7984c544
Fix class checking for technologies
...
This was SVN commit r15281.
2014-06-04 12:07:35 +00:00
b6870bf415
Move the extraction of the classes from templates to the global scripts, and let the AI use it to reduce redundancy.
...
This was SVN commit r15280.
2014-06-04 08:42:48 +00:00
0900005e5b
fix #2605
...
This was SVN commit r15276.
2014-06-03 19:41:11 +00:00
86a99b745e
Petra: code rearrangement + small improvments
...
This was SVN commit r15275.
2014-06-02 20:21:28 +00:00
b4f3b503f2
code style cleanup
...
This was SVN commit r15273.
2014-06-02 15:48:37 +00:00
49ca719049
Reinitialize music when hotloading. Fixes crash when hotloading GUI files.
...
This was SVN commit r15271.
2014-06-02 15:13:16 +00:00
1882f28504
New unit renderer.
...
Instead of each CCmpVisualActor rendering itself individually, collect
all the units in a single CCmpUnitRenderer. This avoids the overhead of
doing Interpolate/RenderSubmit calls every frame for every object in the
world. It also allows more efficient culling.
CCmpUnitRenderer knows the positions of each object at the start and end
of each turn, and computes the bounding sphere of the object along that
path. That allows quick culling without recomputing the precise
interpolated transform every frame. (In the future it could be improved
much more.)
Clarify and clean up the sending of PositionChanged messages, and add
new InterpolatedPositionChanged.
Remove the forceFloating parameter from GetInterpolatedTransform, since
it doesn't fit the new design. Replace it with a (non-synchronised) flag
in CCmpPosition.
Move construction progress from CCmpVisualActor to CCmpPosition, so that
it consistently affects all position/transform computation.
Refs #2337 .
This was SVN commit r15265.
2014-06-01 18:24:50 +00:00
fe3315376c
Add BoundingSphere, SOverlaySphere.
...
BoundingSphere is similar to a bounding box, but more spherical.
SOverlaySphere is useful for visualising BoundingSphere (it's quite
inefficient and should only be used for debug functionality).
Normalise the camera frustum clipping planes, so that IsSphereVisible
gives the correct result.
This was SVN commit r15261.
2014-06-01 18:05:46 +00:00
3b0fee9073
This was SVN commit r15260.
2014-06-01 13:15:16 +00:00
ac925ed1b6
fix 8efc3b0241
...
This was SVN commit r15259.
2014-06-01 12:49:34 +00:00
8efc3b0241
code rearrangement
...
This was SVN commit r15258.
2014-06-01 09:47:12 +00:00
38130e5b94
Brit woman can build rotary mill now.
...
Spartan commando can build the Theatron now.
Sibylline Books tech from Roman Wonder to Roman Temple.
This was SVN commit r15256.
2014-06-01 04:13:19 +00:00
608ab456d5
fix tests
...
This was SVN commit r15255.
2014-05-31 14:57:14 +00:00
59c9ae670f
Stop VFS from causing a crash when the AI player isn't found. Patch by Itms. Fixes #2558
...
This was SVN commit r15254.
2014-05-31 14:55:09 +00:00
bb16a8ee98
Fix ungarrisoning via ungarrisoning pane
...
This was SVN commit r15253.
2014-05-31 14:03:00 +00:00
17d83a8b4c
Add ungarrison button to ungarrison specific entities
...
This was SVN commit r15252.
2014-05-31 13:58:16 +00:00
e2aa24fc9a
Clean up the turret interface a bit + fix serialisation for turrets
...
This was SVN commit r15250.
2014-05-31 11:35:07 +00:00
8ef7278306
Add a bonus to units on walls + disable placing units on palisades (which was enabled by accident due to inheritance)
...
This was SVN commit r15249.
2014-05-31 11:02:58 +00:00
f5c5bbe26d
some fixes for Petra AI
...
This was SVN commit r15247.
2014-05-30 15:24:19 +00:00
cfec28e553
Add the Engine code for turrets + use them to get units on walls. The scripted TurretHolder isn't included due to lack of usability for now. Refs #2577
...
This was SVN commit r15246.
2014-05-30 14:46:06 +00:00
d05bd656e7
Added Sibylline Books tech for Romans.
...
Tweaked Roman Logistics tech. Tweaked Siwa Oasis skirmish.
Balance changes: -5 attack, -4 range, -10 health for cavalry
skirmishers, after discussion with alpha123.
This was SVN commit r15245.
2014-05-30 04:18:05 +00:00
84d799ed9f
Petra: reduce the CPU time for building placement
...
This was SVN commit r15244.
2014-05-29 20:39:09 +00:00
7105dabca7
fix failing unit training in Aegis and Petra
...
This was SVN commit r15243.
2014-05-29 20:18:29 +00:00
e0218fff8d
New final fix?
...
This was SVN commit r15242.
2014-05-27 14:54:51 +00:00
7c39259ee5
Now I should get it right
...
This was SVN commit r15241.
2014-05-27 14:00:21 +00:00
5762721b09
Strange how I'm able to make that many mistakes
...
This was SVN commit r15240.
2014-05-27 13:42:04 +00:00
82db905b8e
Fix previous commit
...
This was SVN commit r15239.
2014-05-27 12:32:57 +00:00
3413dc84a1
make it possible for mods to add new unit commands
...
This was SVN commit r15238.
2014-05-27 11:17:29 +00:00
b9f3a95e17
Make UnitAI moddable by exposing the FSM spec and calculated FSM as part of the prototype
...
This was SVN commit r15237.
2014-05-27 07:24:07 +00:00
e4d3189494
Lots of GUI fixes to issues pointed out by alpha123 on IRC.
...
This was SVN commit r15235.
2014-05-27 05:34:28 +00:00
a75342e2c7
minor changes in petra: cleanings and timing optimization
...
This was SVN commit r15234.
2014-05-26 19:52:51 +00:00
b7281c629c
Rocks -> Arrows. Fixes #2565 .
...
This was SVN commit r15222.
2014-05-26 04:48:33 +00:00
bc8792ba96
Proper double-click behavior for these champion units. Fixes #2586 .
...
This was SVN commit r15221.
2014-05-26 04:41:35 +00:00
39cfb6748d
Fixes flickering in main menu backgrounds on old Intel GPUs, by manually setting the z-values for each layer, fixes #2143
...
This was SVN commit r15220.
2014-05-26 04:38:47 +00:00
4dd90a1ef3
A new skirmish map.
...
This was SVN commit r15219.
2014-05-26 04:23:10 +00:00
d7f1427c9b
Tweaked Ptolemies sandbox scenario.
...
This was SVN commit r15218.
2014-05-26 01:28:56 +00:00
7bc0f611b3
Auras for Roman heroes Marcellus and Maximus.
...
This was SVN commit r15217.
2014-05-26 01:26:53 +00:00
3d306702df
Petra: recover some cases where units are blocked because of pathfinder
...
This was SVN commit r15215.
2014-05-25 10:00:55 +00:00
5ce12c2263
Start phasing out the use of CParser in the GUI. Makes GUI parsing generally faster and stricter while adding better tests and debug information.
...
This was SVN commit r15213.
2014-05-25 03:16:52 +00:00
9c908a5f46
improve 6764b15ae2 by allowing a selected button to be selected again
...
This was SVN commit r15212.
2014-05-24 16:23:11 +00:00
6764b15ae2
ease switch to 100% trade of one resource using Shift-click
...
This was SVN commit r15211.
2014-05-24 15:37:19 +00:00
874ceb76a5
fix JS warning in Petra
...
This was SVN commit r15210.
2014-05-24 14:52:05 +00:00
8589003ac6
Let for loop return early. Small code style fix.
...
This was SVN commit r15209.
2014-05-24 10:18:15 +00:00
7f5264d3be
Fix test for unhealable and healable classes. Make healers able to heal again
...
This was SVN commit r15208.
2014-05-24 09:50:10 +00:00
1e3ba2d438
Let formations use the UnitAI.AddOrder method, instead of directly deciding if ReplaceOrder or PushOrder should be used. This replaces the expectedRoute, and might lead to units behaving more as demanded. Refs #2568
...
This was SVN commit r15207.
2014-05-24 09:40:21 +00:00
9ee17342b1
Change developer overlay to only be openable through Alt+D shortcut. Fixes #2569
...
This was SVN commit r15205.
2014-05-23 00:18:16 +00:00
84b53933ff
fix the AIs broken after b55b6a9cf1
...
This was SVN commit r15204.
2014-05-22 20:40:14 +00:00
27104a4f33
Remove MaxDistance from Roman merchant ship. See 1207b146bb.
...
This was SVN commit r15203.
2014-05-22 16:39:00 +00:00
52e807a207
Healers should not heal animals.
...
If we want war dogs to be healable we should change the class to
Domestic.
This was SVN commit r15202.
2014-05-22 16:38:57 +00:00
ea334e3716
Fix class counting
...
This was SVN commit r15201.
2014-05-22 16:20:36 +00:00
41de9f6e84
Petra fixes for maps without cc
...
This was SVN commit r15200.
2014-05-22 15:09:42 +00:00
3fc2574ecf
Disable syntagma and testudo for champion cavalry
...
This was SVN commit r15199.
2014-05-22 14:50:53 +00:00
d20e244a37
fix tests
...
This was SVN commit r15198.
2014-05-22 14:38:49 +00:00
16c5bc96dc
Add ptol and sele hero auras. Fixes #2444 . Patch by Silk.
...
This was SVN commit r15197.
2014-05-22 14:37:11 +00:00
b55b6a9cf1
Add visible class names to all common buildings
...
This was SVN commit r15196.
2014-05-22 14:31:48 +00:00
ac1a9bf8d1
Clean up class parsing + add visible classes to be displayed in the GUI without adding them separatedly to our tooltips
...
This was SVN commit r15195.
2014-05-22 10:20:02 +00:00
eaa382a60c
This was SVN commit r15194.
2014-05-22 01:38:46 +00:00
ee50168096
Removes errant text from GUI XML files, fixes some untranslated text per [wiki:Internationalization]. Refs #2507
...
This was SVN commit r15193.
2014-05-22 01:36:45 +00:00
eae7978868
Makes a word consistent with American English
...
This was SVN commit r15192.
2014-05-21 20:24:37 +00:00
3e985225fc
Remove remaining MaxDistance. See 1207b146bb
...
This was SVN commit r15191.
2014-05-21 14:20:00 +00:00
1207b146bb
Let trading range depend on obstruction. Fixes #2556
...
This was SVN commit r15190.
2014-05-21 14:03:57 +00:00
0a3eb92d62
Add slower game options. Might be usefull for slow players or development. Fixes #2499 . Patch by DanCar.
...
This was SVN commit r15189.
2014-05-21 13:46:42 +00:00
01777a7ade
fix tests
...
This was SVN commit r15188.
2014-05-21 12:28:39 +00:00
2303ad97cf
petra: test on cc existence before trying to build
...
This was SVN commit r15187.
2014-05-21 09:37:41 +00:00
e0fb1223d6
Put the colon inside the translate tag.
...
This was SVN commit r15186.
2014-05-21 03:02:54 +00:00
153b1162fb
changes for the AI to deal with maps with celts and change comment on naval maps
...
This was SVN commit r15185.
2014-05-20 21:30:48 +00:00
5dbf7ffa1e
Portraits for these two Ptol boats.
...
This was SVN commit r15184.
2014-05-20 21:09:25 +00:00
4707f11b07
Petra AI: fix a bug in naval transport and adapt strategy to initial available resources
...
This was SVN commit r15183.
2014-05-20 19:48:54 +00:00
99a7bc67ac
Fix 672f5a8b11 when sloppyness is 0
...
This was SVN commit r15182.
2014-05-20 18:45:36 +00:00
317c6057ed
Remove members from a formation when they garrison. Fixes #2545
...
This was SVN commit r15181.
2014-05-20 17:47:47 +00:00
672f5a8b11
Add sloppyness and separate icon path to formation templates (makes it possible to have multiple formation templates - like different settings for different civs - with only one icon file)
...
This was SVN commit r15180.
2014-05-20 17:18:40 +00:00
41bc9fa65e
Remove a newline in a tooltip.
...
There is no need for it.
Some translations also add the newline that, due to different words
length, appears in an unwanted place.
This was SVN commit r15178.
2014-05-20 10:41:09 +00:00
d8dbd499f8
Probably fixes uninitialized variable warning in GLSL model shader on some drivers
...
This was SVN commit r15177.
2014-05-20 03:41:46 +00:00
d0e18900ae
avoid new harmless spidermonkey warnings
...
This was SVN commit r15176.
2014-05-19 22:09:44 +00:00
15472f7797
fix Petra not gathering already dead animals and remove forgotten debug printout
...
This was SVN commit r15172.
2014-05-19 19:45:08 +00:00
dfc7567561
Fix multiple observers on multiplayer games to work more reliably. Fixes #2529
...
This was SVN commit r15171.
2014-05-19 16:02:42 +00:00
4a3df1c8c5
Add extra check so units can't attack entities out of range. Fixes #2570
...
This was SVN commit r15168.
2014-05-19 09:05:18 +00:00
196eebe803
Fix partial internationalisation of the limit changers
...
This was SVN commit r15167.
2014-05-19 08:22:20 +00:00
5ae4619b81
Internationalize the AllowedToCreate method from EntityLimits. Fixes #2546 .
...
This was SVN commit r15165.
2014-05-19 07:35:05 +00:00
81da366268
Deletes some obsolete and broken old art files, refs #2524
...
This was SVN commit r15164.
2014-05-19 01:47:22 +00:00
61b6eba4c1
Adds a config option for more detailed tooltips. Fixes #2549 .
...
This was SVN commit r15161.
2014-05-19 00:01:47 +00:00
