Commit Graph

593 Commits

Author SHA1 Message Date
vts
490182ddd0 Wall placement. Closes #786.
This was SVN commit r11760.
2012-05-05 19:22:22 +00:00
58836c624a Read formations from civ JSON files. Fixes #1234, #601.
This was SVN commit r11735.
2012-05-03 23:32:10 +00:00
d4347a8466 Add Preferred and RestrictedClasses, based on patch by Zsol. Fixes #1144.
This was SVN commit r11710.
2012-05-01 22:20:08 +00:00
d92ef0d13e Fix a small issue with tech overlays.
This was SVN commit r11706.
2012-05-01 18:56:47 +00:00
bb81a9d81b Move single techs to the bottom row.
This was SVN commit r11678.
2012-04-26 17:43:33 +00:00
fee0ec6648 Added some debug commands (quit and set-shading-color) which shoudl be useful for AI development
This was SVN commit r11671.
2012-04-25 20:56:35 +00:00
e765f6865f Add a red overlay to the paired tech on hover. Fixes #1356.
This was SVN commit r11670.
2012-04-25 17:58:16 +00:00
4f905584c9 Clarify tech pairs. Refs #1356.
This was SVN commit r11669.
2012-04-25 17:02:41 +00:00
e6cb5fade6 Shift-clicking the control group button adds to selection. Patch by mk12. Fixes #1345.
Add AI to Battle for the Tiber map.

This was SVN commit r11662.
2012-04-24 15:58:02 +00:00
vts
f72bfb1cf1 Add option to disable particles, based on patch by rogue-spectre. Fixes #1222.
This was SVN commit r11658.
2012-04-23 22:57:51 +00:00
5ceea39a59 Added technology pairs.
This was SVN commit r11609.
2012-04-21 21:40:07 +00:00
b9695db52c Don't add units to selection if the selected unit isn't owned by the player. Fixes #1256, based on patch by mk12.
Update AI API to Health changes.

This was SVN commit r11608.
2012-04-21 20:50:07 +00:00
b25d7a4bab Display all trainable/builable (by selected entities) entities.
This was SVN commit r11606.
2012-04-21 20:10:11 +00:00
6938ecf431 Allow switching to not yet buildable entities, if they are in the current selection. Use consts if we already define them.
This was SVN commit r11605.
2012-04-21 17:26:06 +00:00
774809b0a9 Allow training in all selected buildings. Fixes #1210.
This was SVN commit r11592.
2012-04-21 00:21:01 +00:00
755e407aeb Technologies. Refs #3. Full unlocking technology implementation. Only unit gathering rates can be modified currently because the patch was big enough already.
This was SVN commit r11584.
2012-04-20 17:21:04 +00:00
c8745ee41f Handle game ending in Atlas a bit more gracefully, it now continues until the user stops the simulation test. Fixes #641.
This was SVN commit r11575.
2012-04-20 01:41:54 +00:00
82263fd3d3 Shift-N adds that groups units to selection. Fixes #1262.
This was SVN commit r11569.
2012-04-19 09:00:51 +00:00
c56f96040e Implement healing. Fixes #999.
This was SVN commit r11536.
2012-04-17 20:22:13 +00:00
9c4a7b8086 Clean up gui code.
This was SVN commit r11514.
2012-04-15 16:27:44 +00:00
2c3801743a Hide the barter buy button when it is the same as selected sell button
This was SVN commit r11505.
2012-04-15 03:44:57 +00:00
71a57ed3a7 Allow gathering regardless of resource owner
This was SVN commit r11478.
2012-04-10 21:09:21 +00:00
b3e519c278 Remove sheets.
This was SVN commit r11466.
2012-04-09 23:13:45 +00:00
67bca5a6ed Use an overlay image to mark selected icons instead of using a separate image.
Remove some useless sheets.

This was SVN commit r11464.
2012-04-09 18:58:03 +00:00
a21fc77212 A minor improvement for enabling/disabling user feedback. It was set to enabled/disabled in every tick which triggered some code.
Now it's only enabled or disabled when the user clicks the button and
therefore much less events are triggered.

This was SVN commit r11463.
2012-04-09 12:30:56 +00:00
c93f17827f Make use of the grayscale opion.
Move some icon files to a more adequate location.
Closes #1214 as that was already commited and this commit fixes some
minor issues.

This was SVN commit r11459.
2012-04-08 22:56:11 +00:00
fda1d07794 Tweaking some pop costs.
This was SVN commit r11450.
2012-04-08 07:27:56 +00:00
07ea6673c3 Use grayscale option instead of grayscaled icons
This was SVN commit r11443.
2012-04-06 15:51:26 +00:00
32d6b09c3c Set goods for every selected trader. Based on patch by Spahbod, fixes #1209.
This was SVN commit r11442.
2012-04-06 15:07:04 +00:00
7ff99cc218 Prevent trade with foundations, based on patch by Spahbod, fixes #1215.
This was SVN commit r11440.
2012-04-05 22:00:15 +00:00
316584d71a Corrected in game manual about creating control groups to include 0, fixes #1279.
This was SVN commit r11414.
2012-04-01 14:00:15 +00:00
8d3434722d New loading screen tips for Roman Army Camp, Palisade walls, and Persian Architecture.
This was SVN commit r11392.
2012-03-22 07:57:53 +00:00
0d385f4112 Make selected stances and formations more obvious. Patch from leper, fixes #1190.
This was SVN commit r11386.
2012-03-21 16:45:02 +00:00
a957455647 Shift-click ungarrisons all units of a type. Patch from leper, fixes #1206.
This was SVN commit r11385.
2012-03-21 15:18:31 +00:00
5f06766ead Replace isUnit, isAnimal, ... with calls to hasClass using patch from leper. Fixes #1201.
This was SVN commit r11365.
2012-03-18 21:16:30 +00:00
4eec2bf5d2 Fixes some bugs related to deleting saved games (in particular, load/delete was broken if the file was deleted externally while the game was running).
Adds saved game directory to the hotload watch list.
Logs error instead of crashing when saved game is not found.
Changes Atlas double-click selection to only pick units from the same
player.

This was SVN commit r11332.
2012-03-14 00:23:28 +00:00
f1ba777a76 Ides of March
This was SVN commit r11328.
2012-03-13 22:54:15 +00:00
0c49ac92fe Ides of March
This was SVN commit r11326.
2012-03-13 20:52:42 +00:00
ae1d57a4c7 Made Oasis X the default map.
This was SVN commit r11312.
2012-03-10 20:13:25 +00:00
894dc30c69 Trade. Closes #30.
This was SVN commit r11279.
2012-03-08 20:42:28 +00:00
f3a52dd440 Fixes incorrect and inconsistent tests for undefined.
Removes unused buggy GUI script.
Corrects some inconsistent formatting.

This was SVN commit r11241.
2012-03-04 22:59:14 +00:00
d60df4b127 Adds saved game deletion. Refs #1090
Documents a few things related to saved games.

This was SVN commit r11233.
2012-03-04 05:27:17 +00:00
0f0eef7ed4 Consistent whitespace
This was SVN commit r11221.
2012-03-02 18:03:19 +00:00
acf63afeaa Fix some whitespace, and spelling, and capitalisation, and unnecessary array wrapping.
This was SVN commit r11218.
2012-03-01 23:16:01 +00:00
edbbe38ee1 Fixes idle champion units not being found. Fixes #1188.
Adds trade class to merchant ship (for use in "find idle workers").
Explicitly adds females, traders/merchant ships, fishing boats, and
healers to "find idle workers".
Fixes typos in fire ship template.

This was SVN commit r11211.
2012-03-01 05:41:18 +00:00
7a75e068e7 Swaps the game's double- and triple-click selections, by popular demand (double-click now selects similar units, triple-click selects exact matches by rank)
This was SVN commit r11178.
2012-02-27 05:46:02 +00:00
0051a5e4cf Fixes encoding of intro.txt to UTF-8 without BOM, based on patch by bird. Fixes #1181.
This was SVN commit r11169.
2012-02-26 04:46:59 +00:00
42a407ee23 Fixing typos and updating tooltips to be somewhat more consistent.
This was SVN commit r11096.
2012-02-18 20:54:03 +00:00
5ad1664ed6 This was SVN commit r11032. 2012-02-06 16:10:52 +00:00
cdcd259dd9 Tweaking foliage colors.
Tweaked outpost/scout towers tips.

Touched up Gambia River and Punjab.

This was SVN commit r10958.
2012-01-23 13:23:51 +00:00
23959ec119 Made the menu background scroll slightly faster.
This was SVN commit r10938.
2012-01-20 23:21:27 +00:00
6d3b9c5cf0 This was SVN commit r10911. 2012-01-15 16:14:35 +00:00
2b59c16d16 Updated grass terrains.
Tweaked maps.

New "outposts" tip.

This was SVN commit r10900.
2012-01-12 10:34:58 +00:00
c2c4e23f27 Updated hotkey list in the in-game manual
This was SVN commit r10874.
2012-01-05 13:57:58 +00:00
1730dd6d8d Add military only drag select (Alt modifier) by gerbilOFdoom. Closes #277
This was SVN commit r10873.
2012-01-05 13:31:54 +00:00
ccb51cebb7 # Happy new year
This was SVN commit r10841.
2012-01-01 00:00:03 +00:00
8256d00c3c This was SVN commit r10793. 2011-12-22 17:55:00 +00:00
3bd371ae64 Persian menu-background, updated structure for background functions.
This was SVN commit r10792.
2011-12-22 17:54:33 +00:00
6399ec0cd2 # Partial support for saved games with AI.
Support cancelling loads while inside a loader callback.
Fix use of ArchiveReader/Writer since their API changed.
Improve error-detection in deserializer to avoid crashes.
Report deserializer errors to users.
Expand load-error message box to fit message about invalid saved games.

This was SVN commit r10787.
2011-12-22 14:04:32 +00:00
5f0d5e4137 Tidy some whitespace
This was SVN commit r10786.
2011-12-22 13:50:11 +00:00
6e974e3a78 Haxamanis
This was SVN commit r10777.
2011-12-20 21:40:03 +00:00
42f0aec84a Allows setting rally points on resources and buildings. closes #745
This was SVN commit r10744.
2011-12-16 16:08:26 +00:00
vts
db864f10c3 Rendering marker lines between buildings and rally points
Added command button to focus on rally point
(implements #524)

This was SVN commit r10704.
2011-12-10 07:07:04 +00:00
ae2725bcc1 Default maps for alpha 8 release
This was SVN commit r10682.
2011-12-07 14:27:41 +00:00
6a2cf46a1b Updates player assignment colors in game setup.
This was SVN commit r10660.
2011-12-02 22:26:53 +00:00
6599200a9e # Added control group and idle unit hotkey's to the in-game manual
This was SVN commit r10652.
2011-12-01 23:39:46 +00:00
0afe4b1da8 Fixed some spacing in game setup screen. Found out that StoneScrollBars are broken (work, but don't display actual scrollbar) - using wheatScrollBars for now
This was SVN commit r10613.
2011-11-27 01:57:35 +00:00
dfdeb4ec4c Make Victory / Defeat message more dramatic
This was SVN commit r10601.
2011-11-25 21:04:06 +00:00
69d5b07bb4 Rearrange buttons in ingame menu
This was SVN commit r10597.
2011-11-25 16:04:30 +00:00
vts
85186c98b2 Better selection boxes. Closes #914, #295, #810.
This was SVN commit r10593.
2011-11-25 06:36:13 +00:00
8cbab40137 Barter. Closes #23.
This was SVN commit r10588.
2011-11-24 15:43:32 +00:00
3a678a0c7c Fix time elapsed counter briefly showing old value when toggled on
This was SVN commit r10527.
2011-11-13 13:23:54 +00:00
ff064aca95 Adds useful stats to training and construction tooltips, based on patch from pejuko. Fixes #872.
This was SVN commit r10518.
2011-11-12 22:23:08 +00:00
cf7aab4425 Avoid errors on loading screen when there are no saved games
This was SVN commit r10455.
2011-10-30 00:37:00 +00:00
7064565ff6 # Allow saving and loading single-player games.
Support writing zip files based on in-memory data.
Fix menu sliding animations to be framerate independent.

This was SVN commit r10454.
2011-10-30 00:07:28 +00:00
b454ccca79 Fix GUI issues when reconnecting to multiplayer games
This was SVN commit r10452.
2011-10-29 14:53:13 +00:00
a3c03815c0 Experimental quicksave/quickload feature
This was SVN commit r10427.
2011-10-24 14:55:45 +00:00
79faed2ee2 Added 'Naval Maps' scenario filter
This was SVN commit r10424.
2011-10-23 22:42:50 +00:00
3efb3949d3 Clean up unused argument
This was SVN commit r10422.
2011-10-23 21:00:59 +00:00
d9820fb0cb Add optional time elapsed counter to session screen.
This was SVN commit r10402.
2011-10-13 23:20:34 +00:00
4200e33e5e Update button text color on game disconnected screen
This was SVN commit r10316.
2011-09-24 23:00:27 +00:00
6287158c17 Widen history section tooltips
This was SVN commit r10292.
2011-09-17 15:49:57 +00:00
b885498477 Fixes text alignment and inconsistencies in game setup UI.
This was SVN commit r10290.
2011-09-16 23:42:37 +00:00
b6882ca146 Fix default network map js
This was SVN commit r10289.
2011-09-16 21:40:42 +00:00
b1d98cff04 Fixes in-game music playing (assume filename always contains ogg extension). Fixes #956.
This was SVN commit r10285.
2011-09-15 05:19:36 +00:00
45aedb2874 Should fix the music errors in Atlas (related to #956) thanks to Ben's suggestion. I think this should be handled at a lower level, but this should do for now.
This was SVN commit r10281.
2011-09-14 12:46:34 +00:00
aba6a7f118 Reorder dialog buttons for consistency
This was SVN commit r10279.
2011-09-14 00:43:19 +00:00
d4ffe7c887 Adds Alpha number and name to main menu. Fixes #955.
Inverts (i)nfo button sprites.
Shrinks tooltip box so it doesn't obstruct the background.

This was SVN commit r10278.
2011-09-13 23:58:16 +00:00
b65b7d95e7 Make the progress bar finish early so that the user can actually see it finish. Display percent progress rather than details.
This was SVN commit r10272.
2011-09-13 12:24:13 +00:00
95d36130e4 Gave more room to chat portion of game setup screen. If we need more room for player slots later, we can always take some from the chat space.
This was SVN commit r10268.
2011-09-13 02:02:36 +00:00
c362ce0565 Convert spaces to tabs in main menu files
This was SVN commit r10267.
2011-09-13 01:28:49 +00:00
7e6098a19f Remove exit button from corner of main menu screen
This was SVN commit r10264.
2011-09-13 01:06:29 +00:00
97e4f0fd5d Update alpha version label, change default single player map, update scripts music system
This was SVN commit r10263.
2011-09-13 00:45:33 +00:00
b1247e77cd fix start/stop music in settings, double ingame menu speed
This was SVN commit r10256.
2011-09-12 02:21:20 +00:00
b50fa144f3 The underlying sound system needs some work, so just get scripts sound working better.
This was SVN commit r10255.
2011-09-11 22:42:40 +00:00
be69735582 Trying to clean up music in the scripts. It is still broken.
This was SVN commit r10249.
2011-09-11 03:30:41 +00:00
579f1acb6f A couple of new loading screen "tips."
This was SVN commit r10246.
2011-09-10 22:08:44 +00:00
db137737ba Because we don't randomly change to new tracks and some of the existing ambient ones are too annoying if played constantly, we'll just set a default for now.
This was SVN commit r10239.
2011-09-10 01:49:30 +00:00
d5c664e36e # In-game manual updated to mention AI, map filters, and random maps.
This was SVN commit r10229.
2011-09-08 17:21:52 +00:00
10b94a6741 Until we deal with networked mode, return to main menu after match. Removed some console.write statements.
This was SVN commit r10220.
2011-09-08 04:18:12 +00:00