Commit Graph

549 Commits

Author SHA1 Message Date
c23497f326 Placing "g_GameEnded = true;" first. (Doesn't really matter, but is more clear.)
This was SVN commit r10149.
2011-08-31 03:13:33 +00:00
7d2411e6cb Convert win / loss dialogs to new style.
This was SVN commit r10148.
2011-08-31 03:09:18 +00:00
2469fdf8c6 Convert delete dialog to new style. Fixes #937
This was SVN commit r10147.
2011-08-31 02:58:57 +00:00
9a00398e24 Converted menu hotkey and ai config to new style. Added basic sliding menus. (Need to evaluate potential performance issues here.)
This was SVN commit r10146.
2011-08-31 02:41:21 +00:00
1ff6d44f9e Fixes promoted entities dropping from control groups, based on patch from gruby. Fixes #859.
This was SVN commit r10140.
2011-08-30 22:29:03 +00:00
ded514644e Commented out most of old styles.xml and changed references to new styles, outlined tabs in summary, fixed chat color in multiplayer setup
This was SVN commit r10130.
2011-08-28 21:32:35 +00:00
4185aa348a change button height from 32 to 28
This was SVN commit r10122.
2011-08-28 03:04:32 +00:00
ad6c4b6abe removed close button from ingame menu, updated button texture
This was SVN commit r10121.
2011-08-28 02:02:38 +00:00
52b73d4445 Make ingame exit button leave the current game rather than exit the entire program
This was SVN commit r10116.
2011-08-27 23:28:12 +00:00
0e81ee4f60 Made ingame resource counters use percent-based positioning. Lined up ingame bottom panel textures better. Remove old session dialog sprites.
This was SVN commit r10115.
2011-08-27 23:17:14 +00:00
e933986351 removed session dialog, updated ingame menu
This was SVN commit r10114.
2011-08-27 22:44:08 +00:00
e909567004 Convert most dialogs over to new style
This was SVN commit r10108.
2011-08-27 18:34:54 +00:00
fc958db168 moved some buttons to second tier, updated style of history section
This was SVN commit r10103.
2011-08-27 06:20:16 +00:00
8a4443e4c7 Update styles to match mockup better
This was SVN commit r10085.
2011-08-24 04:16:37 +00:00
762aad3be5 Clean up some styles
This was SVN commit r10075.
2011-08-23 03:51:04 +00:00
dc2b2aeff4 Converted some more screens over
This was SVN commit r10072.
2011-08-23 03:27:13 +00:00
1b8471da1f Changes shore definition to distance on land (all water included) for better dock placement.
Updates build passability classes.
Fixes tile expansion in CheckBuildingPlacement (don't use FromFloat).
Changes dock rotation snapping to search outward.

This was SVN commit r10007.
2011-08-14 23:36:13 +00:00
e51849b29f Fixes incorrect distance calculation.
Improves dock foundation snapping.

This was SVN commit r9991.
2011-08-10 23:57:54 +00:00
f378e2e651 Implements building restrictions (by terrain, territory, category, and distance). See #41. Fixes #804, #287.
Implements build limits. See #687.
Implements autorotation for dock placement.
Fixes unit spawning to consider terrain passability. See #893.
Adds new passability criteria based on distance from shore.
Updates build restrictions on some templates.
Changes unit spawning search to 4 tiles away from foundation.
Changes garrison/training spawn failure to nicer UI notification.

This was SVN commit r9970.
2011-08-06 08:11:05 +00:00
b08e142193 Graphics optimisations and features from eihrul.
Add shadow filtering (PCF) option.
Fix ugly shadow saturation in old lighting mode.
Fix fancy water shader.
Fix camera matrix computation.
Support scissoring of camera frustum.
Optimise vertex skinning.
Inline various matrix functions.
Support filtering of the list of submitted models before a rendering
pass, for more precise culling.
Optimise water renderer (fixes #721, based on patch by ortalo).
Use scissoring when generating reflection/refraction textures.
Skip reflection/refraction texture generation when no water is visible.
Render alpha-blended objects differently (fixes #434).
Reduce shadow swimming effects.

This was SVN commit r9814.
2011-07-12 23:48:05 +00:00
bfef903c94 Adds hotkey for finding idle warriors (comma). See #792.
Updates finding idle units to be more flexible.
Resets finding idle units when unit is deselected.
Adds Warship class to relevant templates.

This was SVN commit r9791.
2011-07-10 02:11:51 +00:00
db9e05d83e Bump version number
This was SVN commit r9780.
2011-07-07 22:21:34 +00:00
1bc2db56ea Stops unit following when other object selected. Fixes #775
This was SVN commit r9764.
2011-07-05 21:29:11 +00:00
972ca3cd22 Increases unit selection limit to 200 (equal to max population). See #789
This was SVN commit r9745.
2011-07-02 23:04:59 +00:00
4d188452f8 Adds ownership checks to UI selections.
Adds ownership and diplomacy checks to Commands.js (fixes #880).
Adds control all units setting to Player component (network synced).
Adds helpers for diplomacy checks - use these instead of directly
accessing diplomacy array.
Fixes tests according to these changes.

This was SVN commit r9726.
2011-07-02 00:06:39 +00:00
7baab8e221 Moved stances and idle worker button to more appropriate locations
This was SVN commit r9700.
2011-06-28 01:09:55 +00:00
8bdc1b0882 Enforces max population limit, cleans up population variables in Player component. See #862
Max population defaults to 200

This was SVN commit r9659.
2011-06-25 00:47:46 +00:00
92fcb737cd Attempt minor improvements to stances code (see #865).
Don't chase units that are no longer visible, beyond where they were
last seen (fixes #595).

This was SVN commit r9657.
2011-06-24 12:35:15 +00:00
889f4698f2 Moves population bonus to new line in construction tooltip (based on patch from pejuko). Fixes #873
This was SVN commit r9645.
2011-06-22 21:11:37 +00:00
71a6775b92 Stances draft, refs #865
This was SVN commit r9631.
2011-06-17 22:13:39 +00:00
28d952404e Improve selection details debug display.
This was SVN commit r9600.
2011-06-09 16:40:29 +00:00
9906a86a2e Support double-click on unit group buttons. patch by Merolum. fixes #805.
This was SVN commit r9592.
2011-06-06 19:31:34 +00:00
1bf2598429 Fixes square maps to behave like circular maps and fit within the circle. Fixes #822
This was SVN commit r9554.
2011-05-27 03:04:59 +00:00
fd65a492d9 Add button to promote selected units, for testing
This was SVN commit r9527.
2011-05-15 21:53:24 +00:00
9837e23808 Changed release name
This was SVN commit r9474.
2011-05-07 15:23:11 +00:00
1a17fde105 Change health bar tooltip from hitpoints to health
This was SVN commit r9473.
2011-05-07 02:57:23 +00:00
f6ffe7f121 Fix triple-click's accepted inter-click timing to match double-click's
This was SVN commit r9468.
2011-05-06 22:24:03 +00:00
e7e2e03bb9 Changed tooltip to read "Experience" instead of simply "XP." This is to help spell it out better for the players who may not be familiar with our internal nomenclature.
This was SVN commit r9461.
2011-05-06 18:29:01 +00:00
6f3761a73a shrink displayed rank icons to actual resolution of 16x16
This was SVN commit r9457.
2011-05-06 02:19:36 +00:00
508f56d2dd Fixes bug in triple-click unit selection for units without a SelectionGroupName defined. In this case, triple-click will behave the same as double-click.
This was SVN commit r9444.
2011-05-05 02:06:53 +00:00
26de01cdd1 Adjusts unit selection behavior to account for ranks. Triple-click now selects units regardless of their rank.
Adds modifier hotkey to select units offscreen.
Fixes #826.

This was SVN commit r9443.
2011-05-05 01:27:49 +00:00
f423e269e2 shrunk rank icons
This was SVN commit r9442.
2011-05-05 00:19:48 +00:00
141cc51573 reference new rank icons
This was SVN commit r9441.
2011-05-05 00:10:43 +00:00
3bffcff90d update experience bar tooltip text and style
This was SVN commit r9438.
2011-05-04 22:20:49 +00:00
1ba34b973f clean up
This was SVN commit r9430.
2011-05-04 19:36:29 +00:00
dd264f46cf make music civ specific
This was SVN commit r9429.
2011-05-04 19:31:01 +00:00
1a6e75de4e updated alpha version name - fixes #816
This was SVN commit r9415.
2011-05-03 20:22:42 +00:00
7499b23991 Units promotion. Closes #697.
This was SVN commit r9391.
2011-05-02 15:03:01 +00:00
bfd6614b55 # Add support for many formation shapes, based on patch from Badmadblacksad.
See #13.

This was SVN commit r9385.
2011-05-01 20:40:53 +00:00
7ed6a164ba Idle worker button now cycles through Worker, Trade, and CitizenSoldier classes in that order (then by increasing entity ID). Fixes #209.
This was SVN commit r9349.
2011-04-29 18:09:07 +00:00
cb380a9b1c Simplify profile report code. Bump version number to make it easily distinguishable.
This was SVN commit r9347.
2011-04-29 17:32:35 +00:00
fb411d3f39 Fixes slightly broken game attributes and setup.
Includes random map size and seed in reportPerformance. Fixes #793.
Fixes loading screen to use actual map names.

This was SVN commit r9336.
2011-04-28 01:21:02 +00:00
8e20c00dd3 # Add numbered unit selection groups, based on patch from Badmadblacksad.
Fixes #773.

This was SVN commit r9322.
2011-04-26 18:19:16 +00:00
04dc0c2d3c Moved "civs" json files to Public because we are releasing a few of the other civs' units as a teaser.
Lots of unit and map tweaks. Names, stats, civs, etc.

Made the civ icons at the top of the screen 96 pixels instead of 64
pixels just to see if people like them. They are easily changed back to
64 pixels if unsatisfactory.

This was SVN commit r9296.
2011-04-22 03:51:18 +00:00
1caf223410 Max selection size now 64 units (may need further adjusting)
This was SVN commit r9283.
2011-04-18 23:31:37 +00:00
2b138f47db Handle map loading errors in autostart and normal setup modes. Adds TODOs for Atlas and Replay modes. See #764.
Fixes loading screen 'title'.
Fixes broken autostart behavior for random maps and multiplayer games.

This was SVN commit r9193.
2011-04-07 02:32:16 +00:00
6d3d93c355 # Add idle worker button, based on patch from veprbl.
Fixes #744.

This was SVN commit r9140.
2011-04-01 18:00:04 +00:00
4261983c9d Fix reveal map checkbox after winning
This was SVN commit r9040.
2011-03-06 02:29:07 +00:00
ecbe92bdda automatically reveal map when a player wins
This was SVN commit r9039.
2011-03-06 01:54:38 +00:00
d62e9de7da Fix shift-click building placement
This was SVN commit r9027.
2011-03-05 14:41:44 +00:00
637412cb5a update name for alpha 4
update default single player map for alpha 4

This was SVN commit r9020.
2011-03-05 03:53:04 +00:00
1c1564daaf Make profiler JSON output much more concise.
Right-align values in in-game profile viewer.
Add alternating row shading in profile viewer, to make it easier to
read.

This was SVN commit r9004.
2011-03-03 01:09:19 +00:00
63f958878d Fix GUI errors and glitches when placing buildings and not moving the mouse.
This was SVN commit r8977.
2011-02-24 02:12:47 +00:00
f3372bf11d Add some rough performance reporting.
Make the profiler converge a bit faster.

This was SVN commit r8939.
2011-02-19 03:14:37 +00:00
65af9307ea Change tooltips in commands panel to be bottom-aligned, so they don't obscure the button you're pointing at
This was SVN commit r8917.
2011-02-13 12:17:32 +00:00
fb738766ea Recompute building placement preview every turn, so its colour responds to changes in the environment
This was SVN commit r8909.
2011-02-11 11:17:32 +00:00
78e174af7d Fix auto-gathering after constructing fields.
Fix building on top of animal corpses.
Fix builders getting in the way of their own building.

This was SVN commit r8900.
2011-02-10 19:50:08 +00:00
b8925fbbc9 # Support AI construction of buildings.
Pass terrain passability data to AI scripts.
Expand pathfinder passability data to 16 bits per tile, to allow more
classes.
Support 16-bit ints in serializer.
Partially support JS typed arrays.
Allow foundations to be placed on top of units (fixes #499).
Stop farms and fishes blocking movement (fixes #534).
Add obstruction flags to allow finer control over what they block.
Associate entity IDs with obstruction shapes, to allow finding colliding
entities.
Support moving to the edge of a target entity with inactive obstruction.
Support foundation entities in AI.
Support playing as non-hele civs.

This was SVN commit r8899.
2011-02-10 16:06:28 +00:00
ff785853ad Expand the selection-state box so the text can all fit in.
This was SVN commit r8890.
2011-02-05 20:34:11 +00:00
dd501b2a5a # Add initial basic player AI framework.
Support direct access to serializer streams, so serializers can be
nested.
Make component script "this.template" read-only.
Stop globally-subscribed component scripts receiving messages posted to
local components, to reduce out-of-sync risks.
Move pathfinder data out of entity template directory.
Fix GuiInterface deserialization.

This was SVN commit r8865.
2011-01-12 12:29:00 +00:00
1051d10f54 Add "chat" command.
Simplify deletion of multiple entities.
Simplify some setTimeouts.

This was SVN commit r8864.
2011-01-12 12:21:41 +00:00
11b767e235 Stop unit deletion prompt text overlapping the window border
This was SVN commit r8832.
2010-12-09 22:15:23 +00:00
7a9e12613d Update release number
This was SVN commit r8830.
2010-12-09 18:46:56 +00:00
549a4fc51a Garrisoning bug fixes
This was SVN commit r8821.
2010-12-08 20:12:24 +00:00
8ddef2fee0 Add fast-forward/rewind commands, to help with testing.
This was SVN commit r8803.
2010-12-06 19:58:06 +00:00
637b471769 Fixes bug in last change to input.js. Use target HP to determine attack possibility. Thus gaia buildings and animals are attackable, but not trees/mines/etc.
This was SVN commit r8798.
2010-12-05 22:00:07 +00:00
1b9d3fc289 Fix F10 key to open session menu.
This was SVN commit r8795.
2010-12-05 16:02:15 +00:00
67f08751f9 Fixes bug where military units that can't collect resources would show an "attack" icon on hovering a resource - instead they should have a default icon
This was SVN commit r8790.
2010-12-05 06:34:57 +00:00
238925f927 Minor garrisoning related tweaks
This was SVN commit r8778.
2010-12-03 20:25:21 +00:00
c09d6dcb83 Added garrison & repair button on the unit's command panel
This was SVN commit r8756.
2010-12-01 03:01:17 +00:00
89b0f3a9d7 New session tooltip styles
This was SVN commit r8747.
2010-11-30 04:27:04 +00:00
9837f6207f New session dialog style
This was SVN commit r8719.
2010-11-28 01:39:31 +00:00
2640f4c346 Changed victory/defeat dialogs to new session dialog style
Changed title of exit game dialog
Only show resources carried when the quantity is greater than 1

This was SVN commit r8718.
2010-11-27 21:58:19 +00:00
e486467430 Changed delete dialog text again (to make for easier translating later)
This was SVN commit r8717.
2010-11-27 20:11:42 +00:00
961a50b0a2 Changed delete dialog text
This was SVN commit r8716.
2010-11-27 20:03:16 +00:00
0b0cd938d5 Made settings and menu use new dialog
Made chat and ESC hotkey interact better with the dialog
Made command icons reference individual icons rather than sheets
Removed menu object cache

This was SVN commit r8715.
2010-11-27 19:46:12 +00:00
3c318af2e0 Started work on new dialogs for session GUI style
Resized quote area in loading screen

This was SVN commit r8713.
2010-11-27 17:06:32 +00:00
78ae72d87a Message to let players know formations don't work yet
This was SVN commit r8680.
2010-11-22 00:07:38 +00:00
e1fa9cd22b Show resource subtype in GUI if main type is treasure
This was SVN commit r8673.
2010-11-20 22:36:04 +00:00
68a63d62c8 Displaying civ icons on summary screen, moving "Civ centres built" and "Enemy civ centres destroyed" to new "Conquest" tab
This was SVN commit r8671.
2010-11-20 21:42:54 +00:00
2925ab4ce4 Ghosted version labels in session GUI
This was SVN commit r8662.
2010-11-20 17:40:54 +00:00
f236fb7bd1 Fixed bug where gaia was not treated as attackable (fences could not be destroyed)
This was SVN commit r8651.
2010-11-18 23:25:42 +00:00
d65e47dda0 Properly center loaded resource text
Add attack stats to "armour" icon

This was SVN commit r8618.
2010-11-15 03:38:01 +00:00
042972e298 Renamed "session_new" to "session"
This was SVN commit r8608.
2010-11-14 20:32:38 +00:00
6e6ae573e4 Delete old session GUI files.
This was SVN commit r7558.
2010-05-20 20:17:46 +00:00
8c1a3f7c8a Protect against missing globals when loading GUI in unusual ways
This was SVN commit r7550.
2010-05-20 00:57:03 +00:00
c8c10a4871 # Extensions and cleanups to session GUI files.
Add various GUI pieces (exit button, resource counts, unit details).
Clean up implementation of button panels.
Split some content out of 'common' and into page-specific files.
Delete some obsolete content.

This was SVN commit r7337.
2010-02-28 21:45:09 +00:00
7c2e9027c2 # Rewrite of the game's simulation system
Giant merge from
http://svn.wildfiregames.com/hg-source/file/5fb522019d5e
Infrastructure is largely complete, gameplay is largely missing
Disabled by default; use command-line flag "-sim2"
(Second attempt at commit...)

This was SVN commit r7259.
2010-01-09 19:20:14 +00:00
f0d9806b3f # Restructured GUI implementation
CGUI now represents a single 'page'. CGUIManager maintains multiple
pages and switches between them.
Split the XML files into pregame, loading, session and messagebox pages.
Added hotloading of GUI pages.
Minor GUI cleanups.
(Merge from hg 81862d33780c)

This was SVN commit r7214.
2009-12-03 20:17:22 +00:00