Commit Graph

560 Commits

Author SHA1 Message Date
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
bab589e8a3 Tweaked game setup screen options area.
This was SVN commit r10219.
2011-09-08 04:04:04 +00:00
d22656034e Tweaked summary screen.
This was SVN commit r10218.
2011-09-08 03:59:12 +00:00
238792a524 Reworked game setup and loading screens, and adjusted title decoration for some windows.
This was SVN commit r10217.
2011-09-08 03:49:57 +00:00
bc59102801 Make menu start out higher so that it is not visible when it is not opened (it appeared as a gold band around menu button)
This was SVN commit r10211.
2011-09-08 00:19:38 +00:00
185571845f Renaming cancel button to main menu which makes more sense when returning from a match.
This was SVN commit r10201.
2011-09-07 02:07:38 +00:00
b65f8ae23a Return to game setup directly from the summary screen. (BFME2 does this; will see if it's any good.)
This was SVN commit r10200.
2011-09-07 02:03:11 +00:00
550cac253d Resize stances panel to fit better and move delete command to end of list.
This was SVN commit r10199.
2011-09-07 01:54:08 +00:00
85f60c4d28 New session tooltip colors and some code cleanup.
This was SVN commit r10197.
2011-09-07 01:43:56 +00:00
7a7ebaa983 Allow ingame menu to reverse, add sounds to all menu buttons, and some organizing and cleanup
This was SVN commit r10194.
2011-09-06 18:15:27 +00:00
8b33f5cfd2 Fixes UI becoming unresponsive when ordering units to garrison.
This was SVN commit r10190.
2011-09-06 02:06:24 +00:00
cf667d335a Reorganize sound functions, play new defeat music, clean up some tab versus space issues.
This was SVN commit r10182.
2011-09-04 01:54:54 +00:00
dfcabe4db3 Adjust main menu background scrolling speed and make submenu use random sounds when opening.
This was SVN commit r10179.
2011-09-03 03:18:40 +00:00
8f26bff788 Fix menu and dev commands overlay issue. Add music to Carthage civ file.
This was SVN commit r10177.
2011-09-03 02:12:14 +00:00
05c5596827 Fix squished menu background and make clicking on background hide the submenu
This was SVN commit r10165.
2011-09-02 00:33:19 +00:00
ec6b9dfc28 Fixes broken color to string conversion in UI. Fixes #939.
This was SVN commit r10164.
2011-09-02 00:24:30 +00:00
d5b8a39fdd Fix misaligned text in dialogs
This was SVN commit r10158.
2011-09-01 03:27:30 +00:00
5c7b1d8241 Make pause text larger
This was SVN commit r10157.
2011-09-01 02:54:05 +00:00
ee0c812b67 Tweaked style of manual and history
This was SVN commit r10156.
2011-09-01 02:49:02 +00:00
142bd05380 Menu: removed autohiding, doubled speed, added sound effects. GUI art: changed gold titlebar back to bronze, made progressbar consistent with titlebar. Repositioned start game button.
This was SVN commit r10155.
2011-09-01 02:36:38 +00:00
0fe7cd7edc Some small layout alignment tweaks/fixes
This was SVN commit r10150.
2011-08-31 03:23:14 +00:00
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
ab5d1f8482 Changed size of the manual to be based off of the center of the screen, instead of the edges of the screen.
This was SVN commit r10120.
2011-08-28 01:49:17 +00:00
6146d948ad hide yellow border between main menu and submenu
This was SVN commit r10119.
2011-08-28 01:28:50 +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
3b958b4a1c Fixing yet another problem: make sure the submenu closes if we click a button that doesn't use the submenu
This was SVN commit r10112.
2011-08-27 19:36:55 +00:00
abda9576b1 Updated panel style and made main menu "x" exit game without confirmation
This was SVN commit r10111.
2011-08-27 19:23:32 +00:00
ae866e2cb4 Fix typo in tooltip
This was SVN commit r10110.
2011-08-27 18:50:23 +00:00
e1cb8f6e10 Update main menu buttons tooltip text
This was SVN commit r10109.
2011-08-27 18:46:00 +00:00
e909567004 Convert most dialogs over to new style
This was SVN commit r10108.
2011-08-27 18:34:54 +00:00
2915e9a85e Update submenu code
This was SVN commit r10107.
2011-08-27 15:21:12 +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
53de4a8d5d remove ghost=true to allow clicking on communication buttons
This was SVN commit r10098.
2011-08-26 04:32:53 +00:00
9f6f4d8bd1 Beginning of the submenu
This was SVN commit r10097.
2011-08-26 04:25:41 +00:00
072751858b polish the alpha version label
This was SVN commit r10096.
2011-08-26 01:56:50 +00:00
1890b1df49 Align tags to avoid confusion
This was SVN commit r10088.
2011-08-24 05:12:17 +00:00
81121ca1e8 Add alpha warning back
This was SVN commit r10087.
2011-08-24 05:03:11 +00:00
bf5e94c6e4 Adjusted main menu panel background
This was SVN commit r10086.
2011-08-24 04:35:53 +00:00
8a4443e4c7 Update styles to match mockup better
This was SVN commit r10085.
2011-08-24 04:16:37 +00:00
976529d280 Fix size issue with main menu panel shading
This was SVN commit r10076.
2011-08-23 04:01:05 +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
605e9f97bf Update chat dialog and some labels in game setup to new style
This was SVN commit r10068.
2011-08-22 23:56:42 +00:00
0cd825e552 Converted parts of the game setup dialog and some general GUI elements over to new styles. There are duplicate sprites / textures that will need to be removed later when all references to them are changed.
This was SVN commit r10067.
2011-08-22 23:42:16 +00:00
da438151f0 adjust border around pre-release warning text
This was SVN commit r10062.
2011-08-22 17:41:46 +00:00
d9c65c82cf More work on main menu, and added new button style
This was SVN commit r10061.
2011-08-22 17:36:53 +00:00
a6f5784c5c Remove junk characters from beginning of Alpha Warning
This was SVN commit r10058.
2011-08-22 04:18:43 +00:00
f2f0263a3d Made menu panel use a more relative layout to work better with lower resolutions
This was SVN commit r10057.
2011-08-22 04:13:05 +00:00
36d897c694 # New menu background image
This was SVN commit r10042.
2011-08-20 17:17:53 +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
7e67e816c9 Add small 'X' exit button to corner
This was SVN commit r9949.
2011-08-01 03:30:13 +00:00
6bcb3f5695 A very rough attempt at the new main menu style.
This was SVN commit r9947.
2011-08-01 00:41:24 +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
e0eed68835 Sets default single player map to Acropolis II (also moves these constants to the top of gamesetup.js for clarity)
This was SVN commit r9783.
2011-07-07 23:16:09 +00:00
db9e05d83e Bump version number
This was SVN commit r9780.
2011-07-07 22:21:34 +00:00
519b0020ba Updated text from "Super" to "Champion."
This was SVN commit r9775.
2011-07-07 07:56:43 +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
7e1cbf6ece increase length of main menu version number field to accommodate longer version text
This was SVN commit r9616.
2011-06-11 14:22:03 +00:00
4a3230a870 This was SVN commit r9610. 2011-06-09 23:52:29 +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
123c00763a Use JuBot by default.
Fixes #774.

This was SVN commit r9507.
2011-05-12 23:55:35 +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
d6b073df22 Fix typo
This was SVN commit r9434.
2011-05-04 20:49:17 +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
aa38415b3f Changes default scenario to Death Canyon. Fixes #820.
This was SVN commit r9401.
2011-05-02 21:52:14 +00:00
0b996bbe75 Prevent selecting unusable civs in random map setup. Fixes #813.
This was SVN commit r9392.
2011-05-02 15:26:38 +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
b3ec9b35a5 #3 new Loading Tips.
This was SVN commit r9320.
2011-04-25 02:19:28 +00:00
1272587a3e #5 new Loading Tips.
Map tweaks and updates.

This was SVN commit r9319.
2011-04-25 01:04:51 +00:00
0a1313a9ff #New tips images.
This was SVN commit r9318.
2011-04-24 18:49:54 +00:00
9f7eef5a1c Lots of Neareastern Badlands stuff.
This was SVN commit r9304.
2011-04-23 05:06:25 +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
b4503bb61e Simplifies random map output, see #782.
Changes random maps to XZ coordinates, matching the engine.
More documentation for rmgen library.

This was SVN commit r9271.
2011-04-16 04:04:06 +00:00
942a45372c Random maps generated in their own thread, loading GUI is updated with progress.
Fixes some bugs in game loader error handling.

This was SVN commit r9220.
2011-04-10 05:31:18 +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
0dfc72bc2c Fixes filter behavior in setup when switching map type.
Fixes broken texture in Latium rms.
Adds demo keyword to rms test.
Fixes default rms lighting with new model.

This was SVN commit r9127.
2011-03-27 22:00:49 +00:00
f618605477 Changes default random map sizes.
Tweaks random map resources.
Adds support for circular maps to rmgen library.
Various fixes in map generator.
On Miletus map, change player 2 civ, as Romans are not fully implemented
(fixes #758)

This was SVN commit r9104.
2011-03-23 08:12:04 +00:00
0e0ed94926 Implements random map system, fixes #6.
Includes default library "rmgen" w/ API based on rmgen tool.
Modifies rmgen scripts Cantabrian Highlands, Neareastern Badlands, and
Latium.
Old map support dropped from MapReader.
Fixes a few bugs in existing game setup and initialization scripts.

This was SVN commit r9096.
2011-03-22 01:34:45 +00:00
e47e916853 This was SVN commit r9067. 2011-03-17 01:31:56 +00:00
6abd49d60a #Added link to online manual (from in-game manual). Also updated the year in the "about box" from 2010 to 2011.
This was SVN commit r9049.
2011-03-10 17:37:29 +00:00
9787f963ba Minor adjustments to feedback details
This was SVN commit r9045.
2011-03-08 01:34:25 +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
08d5e7bf66 Sort AI list by name, and rename Test Bot so it's a bit clearer and is listed first
This was SVN commit r9031.
2011-03-05 16:55:58 +00:00
d62e9de7da Fix shift-click building placement
This was SVN commit r9027.
2011-03-05 14:41:44 +00:00
18a2968919 Fix errors when starting multiplayer games
This was SVN commit r9025.
2011-03-05 14:30:24 +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
e608d9269a Load entity templates for the AI via the progressive loader.
Display message while loading the map list for the setup screen.

This was SVN commit r9019.
2011-03-05 01:56:59 +00:00
cae4b1b1af Hide useless 'server name' field on setup screen
This was SVN commit r9013.
2011-03-04 21:48:01 +00:00
3e22cf4cae Focus map-selection list by default in single-player game setup screen, to allow keyboard navigation
This was SVN commit r9009.
2011-03-04 14:29:28 +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
b15ea0691f Attempt to improve AI selection in the game setup screen.
This was SVN commit r8998.
2011-02-27 17:58:41 +00:00
0378500bdc Fix #712 (remove S3TC warning).
Add timer to S3TC decoder so it's still easy to determine if it was
used.

This was SVN commit r8981.
2011-02-25 01:28:46 +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