6e37762e3c
fix some more issues with the loading tips
...
This was SVN commit r8781.
2010-12-03 23:52:11 +00:00
83f297182e
Fix tip loading issue with pre-converted textures
...
This was SVN commit r8780.
2010-12-03 23:31:02 +00:00
238925f927
Minor garrisoning related tweaks
...
This was SVN commit r8778.
2010-12-03 20:25:21 +00:00
a6ca28ccf9
Fix reference to big screenshot key (see #627 ).
...
This was SVN commit r8760.
2010-12-02 17:44:18 +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
6e602c15cd
Renamed tips
...
Shorted Spartan tip text
This was SVN commit r8744.
2010-11-29 19:12:48 +00:00
c922912ac5
Cleaned up loading files
...
Changed single player start game text
This was SVN commit r8735.
2010-11-28 17:27:00 +00:00
e53616f857
Fix non power-of-two middle progress bar section dimensions
...
This was SVN commit r8734.
2010-11-28 16:49:43 +00:00
f06eba3da5
yet another awesome tip. :)
...
This was SVN commit r8732.
2010-11-28 14:35:48 +00:00
9ab58ce6e8
Another great "tip".
...
This was SVN commit r8731.
2010-11-28 14:22:42 +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
bbd6f50af9
Resize quote area so that long quotes don't get cut off
...
This was SVN commit r8708.
2010-11-27 08:57:09 +00:00
51312f84c4
Add gradient to tip image
...
Resize tip images to fill out rectangle
This was SVN commit r8707.
2010-11-27 08:44:03 +00:00
ed0fe5b47b
Shrink space between tip title and message
...
This was SVN commit r8706.
2010-11-27 08:10:22 +00:00
1197d7872e
Redone tips screenshots. New shadow overlay.
...
This was SVN commit r8705.
2010-11-27 08:02:54 +00:00
9edd94f0fa
Make tip image 512x384 (inside border dimensions)
...
This was SVN commit r8704.
2010-11-27 07:59:13 +00:00
08bfe7b7f9
tweaked image sizes
...
This was SVN commit r8703.
2010-11-27 07:45:27 +00:00
55b6fbc669
4th tip. Made tip images use transparency.
...
This was SVN commit r8702.
2010-11-27 07:00:06 +00:00
8bcf6b782f
tips
...
This was SVN commit r8701.
2010-11-27 06:09:55 +00:00
db22548ecb
New loading screen style (may need more polishing)
...
This was SVN commit r8699.
2010-11-27 03:07:48 +00:00
0d0af824e7
Treasures collected counter for summary screen
...
This was SVN commit r8690.
2010-11-25 18:01:23 +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
e4d356c3bf
Map exploration counter for summary screen
...
This was SVN commit r8679.
2010-11-21 19:42:26 +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
f20a6dcfc8
Fixed bug where players would not initialize resource counts properly from scenario
...
This was SVN commit r8652.
2010-11-19 05:05:45 +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
aa9788a40e
Fix team index bug in game setup GUI
...
This was SVN commit r8647.
2010-11-18 06:51:10 +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
c1c8f64f0d
Move statistics from GuiInterface.GetSimulationState to GuiInterface.GetExtendedSimulationState
...
This was SVN commit r8603.
2010-11-14 19:09:13 +00:00
74ed8cf464
Adjusted size of resource icons
...
This was SVN commit r8595.
2010-11-13 22:19:17 +00:00
f4b0b72aa8
Fixed bug introduced by recent change to input.js: diplomacy is properly read to determine enemy players for attacking
...
This was SVN commit r8593.
2010-11-13 20:49:58 +00:00
4100a13e0a
# Add resource shuttling.
...
Add resource-carrying animations/props to an actor for testing.
Warn more quietly about invalid cursor names.
This was SVN commit r8589.
2010-11-13 19:15:29 +00:00
2b70b43086
Based selection groups off of a new tag which must contain a valid template name.
...
<SelectionGroupName>unit_template_name_b</SelectionGroupName>
This was SVN commit r8587.
2010-11-13 05:35:40 +00:00
6c7f9f7b8d
#Treasure objects.
...
This was SVN commit r8585.
2010-11-13 03:44:38 +00:00
3cefbbe253
Modified UnitAI to respect diplomatic status of players, allies can no longer be attacked, and fixed some related bugs in player init
...
This was SVN commit r8583.
2010-11-13 02:36:53 +00:00
245f29b798
Summary screen. Closes #638 .
...
This was SVN commit r8576.
2010-11-12 22:24:49 +00:00
46bde9969e
Made a "poleis" branch emblem sprite.
...
This was SVN commit r8568.
2010-11-11 19:50:06 +00:00
c5f0b5d7be
Hide the lower session panel if nothing is selected
...
This was SVN commit r8566.
2010-11-11 16:00:53 +00:00
7d26b8eefd
Roman civ sprite
...
This was SVN commit r8561.
2010-11-08 23:52:44 +00:00
dde2cd38be
Show Population Cost in unit training buttons
...
Show Population Bonus in unit construction buttons
This was SVN commit r8559.
2010-11-08 23:23:52 +00:00
0517d41275
Removed extraneous cancel button from multiplayer setup dialogs
...
Adjusted the right side of the bottom panel in the session GUI
Renamed "dev console" to "dev overlay" in the chat message to be more
consistent
This was SVN commit r8557.
2010-11-08 14:49:40 +00:00
e43eb0c18b
# Various hotkey fixes and cleanups.
...
Support ctrl for removing entities from selection.
Move big screenshot hotkey to shift+F2.
Increase mouse wheel rotation speed.
Fix HotkeyIsPressed when a more specific hotkey was matched instead.
Support multiple hotkeys with the same binding.
Use hotkeys instead of raw key events in GUI.
Delete some obsolete hotkey definitions.
Remove unused broken EntitySelection toggle method.
This was SVN commit r8546.
2010-11-07 20:42:52 +00:00
644b9aedea
# Add double-click and triple-click selection modes, based on patch by Christoph and evans.
...
Fixes #515 .
This was SVN commit r8544.
2010-11-07 00:12:55 +00:00
741477926c
Make the minimap fit completely inside the border when in circular mode (to prevent units from sneaking around behind the rim)
...
This was SVN commit r8539.
2010-11-06 02:13:40 +00:00
e7b5f9eeb9
Allow up to 24 construction or training buttons
...
Add tooltip of generic name back to the unit name
Move civ name to player name tooltip
Make player name colored with the player color again
This was SVN commit r8538.
2010-11-06 01:55:29 +00:00
dbcd004844
Fix player assignments on map change (number of players may decrease, knocking assigned players out of a slot). Fixes #655
...
This was SVN commit r8534.
2010-11-04 20:34:29 +00:00
81f5e0ac5f
Allow continuing playing when a client leaves a multiplayer game ( fixes #620 ).
...
Fix multiplayer autostart.
Make NETTURN_LOG syntax differently ugly.
This was SVN commit r8525.
2010-11-03 00:21:52 +00:00
5d764f1435
Run network server in a separate thread, to minimise latency.
...
Make some parts of logger and console thread-safe.
Simplify console: remove special commands; remove prefix for script
commands.
Remove LOG_ONCE, to simplify logger.
Change some code to use the new logger interface.
Fix OOS when revealing map.
Clean up some formatting.
This was SVN commit r8511.
2010-10-31 22:00:28 +00:00
a952767f48
Changed the disabled state messages for some menu buttons, they were a bit rough for a public release imho
...
This was SVN commit r8503.
2010-10-31 00:16:33 +00:00
1840bb3507
Stop units walking outside the edges of circular maps.
...
Switch the GUI between square/circular minimap automatically.
This was SVN commit r8500.
2010-10-30 18:25:34 +00:00
10c5dbcba4
Fix Atlas and autostart.
...
Fix non-POD in varargs.
Remove misleading max_players config variable (the engine doesn't care
about it, all the limits are hard-coded).
Remove civ-center-based player civ initialisation hack.
Add dummy player_defaults.json.
Clean up formatting a bit.
This was SVN commit r8498.
2010-10-30 13:27:23 +00:00
d6bf303740
Clean up line endings
...
This was SVN commit r8497.
2010-10-30 12:22:18 +00:00
5567727bd1
New maps get player data per #590 , and some minor bugfixes
...
This was SVN commit r8496.
2010-10-30 05:19:55 +00:00
9ee44bd9b8
Game setup changes, including showing name, civ, team, and some options loaded from the scenarios. Civ data added. Civ info window to preview civs. Icon tooltips. Support for random map implementation. Fixes #590 .
...
This was SVN commit r8494.
2010-10-30 04:02:42 +00:00
02aa8499ed
Partial experimental version of circular maps
...
This was SVN commit r8470.
2010-10-25 21:59:52 +00:00
6373c2cfcb
Made GUI always visible
...
Adjusted size of icon buttons in the session GUI
Allowed support units to garrison in watch towers
This was SVN commit r8458.
2010-10-24 23:40:09 +00:00
b100ba5a08
Show a 1 when only a single unit remains garrisoned (re-fixes #610 )
...
This was SVN commit r8457.
2010-10-24 18:01:11 +00:00
ec27e78e60
Clear out the displayed garrison quantity number if no units are garrisoned
...
This was SVN commit r8454.
2010-10-24 01:32:35 +00:00
3521c8f51e
Made garrisoning based on the quantity of units, not the population cost of those units.
...
This was SVN commit r8453.
2010-10-24 01:14:34 +00:00
0aaddf62aa
Garrisoning for buildings based on patch by Evans ( fixes #610 )
...
This was SVN commit r8451.
2010-10-23 22:43:15 +00:00
24fb9cd313
Split unit icon sheets into individual textures, for easier editing
...
This was SVN commit r8440.
2010-10-22 23:27:42 +00:00
add040f7e1
Hide city phase indicator
...
This was SVN commit r8409.
2010-10-17 20:13:02 +00:00
937769035a
Only show formation icons for units
...
This was SVN commit r8407.
2010-10-17 20:01:18 +00:00
43f2be44ba
label
...
This was SVN commit r8405.
2010-10-17 18:57:51 +00:00
eca237647e
Play victory/defeat music at appropriate times.
...
Stop ambient sounds when returning to main menu.
This was SVN commit r8404.
2010-10-17 18:30:36 +00:00
7b7e98ea7b
Delete obsolete version of GUI files
...
This was SVN commit r8403.
2010-10-17 18:28:53 +00:00
c2918cdf32
Fixes health bar not showing when multiple units that have health are selected
...
This was SVN commit r8395.
2010-10-17 02:34:07 +00:00
b5313de1c7
Fixed infinitely tall health bar when selecting multiple trees, rocks, or other things without health
...
This was SVN commit r8394.
2010-10-17 02:26:20 +00:00
f4df65d7f1
Change default maps to newer ones
...
This was SVN commit r8378.
2010-10-16 20:49:29 +00:00
468816aaea
Show chat message when the developer console is opened or closed. (For SHIFT-D hotkey)
...
This was SVN commit r8377.
2010-10-16 19:57:26 +00:00
86cb0db407
Fix chat input not getting cleared when ESC is pressed
...
Allow chat messages to be sent internally (bypass chat input box)
Show chat message when the developer console is opened or closed.
(moved dev console back to the right side)
This was SVN commit r8376.
2010-10-16 19:49:48 +00:00
eec07b3f85
Fix missing main menu music when S3TC warning is displayed, by removing archive builder from GUI startup.
...
This was SVN commit r8368.
2010-10-15 14:10:36 +00:00
835609df20
Change S3TC warning yet again, to point to a web page with more information. Also stop hard-coding the message.
...
This was SVN commit r8367.
2010-10-15 12:29:20 +00:00
3fce7d86f3
Temporarily re-enable fake formations in GUI
...
This was SVN commit r8350.
2010-10-13 21:40:56 +00:00
0c61f34db1
Reference group count by name instead of templateName
...
This was SVN commit r8347.
2010-10-13 20:16:03 +00:00
bd3ffd2c6a
Reworked EntityGroups
...
Moved selection size check into selection.js
This was SVN commit r8346.
2010-10-13 19:48:13 +00:00
9909675b68
Made EntityGroups more efficient
...
"Ability to add units to or remove from an already selected group of
units" based on patch by k776 (modified to avoid going over the max
selection size)
(Fixes #602 )
This was SVN commit r8332.
2010-10-11 17:24:06 +00:00
1cdc8d1726
Warn about some obsolete documentation
...
This was SVN commit r8331.
2010-10-11 17:03:58 +00:00
184779e00e
# Add "[", "]" keys to rotate buildings during placement, based on patch from k776.
...
Fixes #588 .
This was SVN commit r8314.
2010-10-09 13:53:17 +00:00
5eedb07297
Fix selection of loading screen textures with pre-converted texture cache
...
This was SVN commit r8305.
2010-10-07 19:56:13 +00:00
69b2581ff0
Preparation for garrison code
...
This was SVN commit r8295.
2010-10-06 18:55:46 +00:00
1784c67c8b
Changed background icon for total unit count
...
This was SVN commit r8294.
2010-10-06 05:25:30 +00:00
ca223eeb5b
Made multiple unit selection health bar vertical again
...
Increased unit selection icons to 16
Added total unit count
This was SVN commit r8292.
2010-10-06 04:19:25 +00:00
ff8477c339
Made unit selection icons the same size as the formation icons
...
This was SVN commit r8291.
2010-10-05 22:44:32 +00:00
9872cb17b8
Deselect units that disappear into fog-of-war.
...
Fixes #596 .
This was SVN commit r8278.
2010-10-05 00:08:05 +00:00
eff766d6b9
Made ESC close out open dialogs rather than offer to close the game
...
Fixed the multiple unit health bar failing to work correctly
Changed multiple selection area to fit layout better.
Organized code
This was SVN commit r8256.
2010-10-03 22:42:15 +00:00
59c8ecfa3d
Use voices for infantry/cavalry units.
...
Make arrows quieter.
Handle order-related sounds via the GUI instead of simulation, to make
them player-specific and to reduce latency.
This was SVN commit r8254.
2010-10-03 17:58:49 +00:00
aa32677784
Restore highlighting of units on hover.
...
Optimise overlay code a bit.
This was SVN commit r8253.
2010-10-03 16:48:52 +00:00
9a0db9713e
Add resource supply status bars.
...
Change bar size for buildings.
Only highlight one entity on mouse hover, and only if it's not a unit.
Display status bars on foundations.
This was SVN commit r8249.
2010-10-03 00:30:43 +00:00
21a07af553
Messed with the GUI backgrounds to make them fit better. Starting a new Arcadia III map.
...
This was SVN commit r8247.
2010-10-02 23:46:09 +00:00
f9b5bd37ca
Removed button background from command icons
...
This was SVN commit r8246.
2010-10-02 23:24:13 +00:00
7ea522a484
# Add on-screen health bars
...
This was SVN commit r8241.
2010-10-02 12:41:29 +00:00
4afcd057f6
Made lower panel sprites same scale
...
Adjusted vertical spacing of player and unit names.
This was SVN commit r8239.
2010-10-02 03:24:12 +00:00
d2f07800ed
Fixed bug where resource bar sometimes covered the health bar
...
This was SVN commit r8237.
2010-10-01 22:29:55 +00:00
8a01e11db7
Health bar shows average for multiple selections
...
Center panel texture shrunk and dark tile texture is tiled over the
panels better
Command icons reference new sheet
This was SVN commit r8236.
2010-10-01 22:18:03 +00:00
fcedcae052
# Add victory/defeat conditions, based on patch from fcxSanya.
...
Fixes #565 .
This was SVN commit r8234.
2010-10-01 20:51:21 +00:00
53abdf4717
Fixed the size of the menu and civ icon sprites
...
This was SVN commit r8223.
2010-10-01 01:13:43 +00:00
729cf72d2b
More GUI fixes. Specifically, making panel textures size appropriately in different resolutions.
...
Smaller panel image with less dark on the sides.
This was SVN commit r8217.
2010-09-30 23:01:24 +00:00
61fa8d29f6
Some more in-game GUI progress. Multiple selections now look more like the mockup, but all the stats icons and bars still reference the first unit. I will fix that part later.
...
This was SVN commit r8216.
2010-09-30 22:39:45 +00:00
54142e5ee8
Some more progress towards Michael's GUI design.
...
This was SVN commit r8213.
2010-09-29 21:55:51 +00:00
41819d3189
Moved notification area to rest on right side of lower panel.
...
(Hide right panel when not used)
This was SVN commit r8206.
2010-09-28 18:31:40 +00:00
4e897394dc
Fixed some overlapping issues
...
Added menu hotkey
This was SVN commit r8205.
2010-09-28 18:15:11 +00:00
b2278e56a6
Fixed menu graphics
...
Misc consistency improvements
Added pause hotkey
This was SVN commit r8204.
2010-09-28 17:40:41 +00:00
ac11a5cf28
Fixed chat dialog graphics
...
This was SVN commit r8203.
2010-09-28 15:53:20 +00:00
93e81319e8
Added civ icon
...
Fixed Settings Dialog graphics
This was SVN commit r8202.
2010-09-28 14:58:14 +00:00
ea7c2e569c
Michael's new GUI layout
...
(I made some changes to some parts which can always be changed back.
It's still a work in progress.)
This was SVN commit r8200.
2010-09-28 14:19:13 +00:00
82691683cb
Fix #56 (add unit-following camera mode (press 'F')), based on patch from markelov.
...
Remove obsolete IsNewSimulation function.
This was SVN commit r8190.
2010-09-26 23:05:25 +00:00
7f3a628e0b
Some small aesthetic changes to selection details area
...
This was SVN commit r8182.
2010-09-25 18:19:06 +00:00
fa1dc05de2
New GUI layout
...
Delete confirmation dialog
Resource bar replaces resource quantity/icon
Selected units are grouped by type regardless of rank
Ranked units use the same icon
"Basic" units are now considered to have the rank of "Basic" for
grouping purposes
This was SVN commit r8180.
2010-09-25 15:22:41 +00:00
924d1219a7
# Add fog-of-war.
...
Move Vision component to C++, for more efficient FoW processing.
Disable FoW on demo maps.
This was SVN commit r8160.
2010-09-23 12:13:13 +00:00
1cc4d358d7
Fix #549 (Allow units to be moved by right-clicking on the mini-map), based on patch from Badmadblacksad
...
This was SVN commit r8107.
2010-09-11 19:49:21 +00:00
c8eaee35cc
Add initial texture conversion settings.
...
Replace button texture with higher-quality PNG.
This was SVN commit r8102.
2010-09-10 21:05:13 +00:00
9a337d434b
Fixes button layout in multiplayer setup based on patch by fcxSanya ( Fixes #560 )
...
This was SVN commit r8089.
2010-09-08 21:10:31 +00:00
0864ba4fb4
Fixed main menu parchment buttons ( Fixes #561 )
...
Switched placement of load game and cancel buttons
This was SVN commit r8081.
2010-09-05 19:04:55 +00:00
178d45d0e2
Added regular size cancel / close buttons to several menu areas ( Fixes #558 and #560 )
...
Moved main menu buttons to top right
This was SVN commit r8078.
2010-09-04 22:27:24 +00:00
fae4a3da24
Fix #548 (GUI should give feedback when training queue entry is blocked), based on patch from fcxSanya
...
This was SVN commit r8071.
2010-09-04 13:24:52 +00:00
086d522050
Made structures reference new buildings icon sheet
...
This was SVN commit r8068.
2010-09-04 01:41:10 +00:00
90e4672c8d
Removed unnecessary null assignment
...
This was SVN commit r8051.
2010-08-30 14:43:26 +00:00
0a98fbaba2
Cache the Entity States and Templates to increase performance
...
This was SVN commit r8037.
2010-08-28 21:12:52 +00:00
a9b11b780e
Fix right clicks passing through GUI objects and triggering unit commands.
...
Fix cursor displaying unit commands when over a GUI object.
This was SVN commit r8020.
2010-08-21 23:58:08 +00:00
a41dd1d736
# Add repair command.
...
Fix #537 (Repair functionality for damaged buildings) based on patch
from evans.
Make some unnecessarily optional template elements required.
This was SVN commit r8015.
2010-08-21 21:53:51 +00:00
aa65eb2008
Fixed empty tooltips from displaying a small, empty square
...
This was SVN commit r8004.
2010-08-19 14:57:51 +00:00
dfa155f6b9
Simplified the main selected unit's icon tooltip
...
This was SVN commit r8003.
2010-08-19 14:09:00 +00:00
5ee7f7b178
Reworked selection details and rank code
...
Added rank tag to templates to avoid string parsing
This was SVN commit r7995.
2010-08-17 13:37:46 +00:00
7a2fac889f
Enabled template tooltips
...
This was SVN commit r7988.
2010-08-17 00:55:02 +00:00
cabd993966
Switch default multiplayer map.
...
Change infantry-train sound to something a bit more appropriate.
This was SVN commit r7967.
2010-08-15 12:22:19 +00:00
9c5fd64d5f
Defocus the chat box when sending an empty message
...
This was SVN commit r7954.
2010-08-15 01:27:52 +00:00
64daef95df
Fix chat to use GUID instead of host ID.
...
Fix randomly incorrect player names.
Fix script errors when connecting to an invalid IP address.
Adjust the server/client disconnection messages to be a bit more
accurate.
This was SVN commit r7946.
2010-08-14 19:45:22 +00:00
8967395da6
Made chat messages send a GUID rather than a user name
...
This was SVN commit r7943.
2010-08-14 15:34:36 +00:00
50bccd8720
Made notifications visible only to the relevant player
...
This was SVN commit r7942.
2010-08-14 04:34:49 +00:00
5a42689d5e
Fix typo
...
This was SVN commit r7940.
2010-08-13 22:06:19 +00:00
9a1e450031
Added a basic notification system
...
Currently, it only reports insufficient resource notifications
This was SVN commit r7939.
2010-08-13 22:02:27 +00:00
c8f90ce5a2
Refined chat and added chat messages to the console
...
Cleaned up session menu code (cached menu objects)
This was SVN commit r7935.
2010-08-13 16:05:06 +00:00
961d19d037
Try a more readable stroked font.
...
This was SVN commit r7932.
2010-08-13 14:14:27 +00:00
2deac598eb
Remove focus from chat box after sending message
...
This was SVN commit r7931.
2010-08-13 13:50:03 +00:00
6c7b82130c
# Redesigned the camera control system.
...
Add shift+wheel (and Q/E, and ctrl+arrows, and ctrl+WASD) to rotate the
camera.
Restrict the rotation and zoom to narrow ranges. (Constraints can be
disabled in the dev overlay).
Smooth the movement and rotation.
Fix some stupid whitespace.
Fix some const correctness.
This was SVN commit r7930.
2010-08-13 13:26:29 +00:00
e831cac647
Added "return to menu" button to disconnected screen
...
Show the name of the player that left (if not the host)
This was SVN commit r7926.
2010-08-12 23:15:01 +00:00
f0a0c69770
Removed the connection message
...
Removed the disconnection message's color
This was SVN commit r7925.
2010-08-12 20:15:27 +00:00
859c696afe
Show when a player leaves multiplayer
...
This was SVN commit r7924.
2010-08-12 19:31:17 +00:00
b7d5648cc9
The clear timer line will not be needed all the time, but when a new message removes an older message (only happens when there's not enough room) it needs to disable the timer for that older message
...
This was SVN commit r7923.
2010-08-12 17:50:43 +00:00
3947495db9
Don't need to manually clear timers because this happens automatically when they expire
...
This was SVN commit r7922.
2010-08-12 17:40:30 +00:00
d41d554678
Reworked session code splitting some things out to different files
...
This was SVN commit r7921.
2010-08-12 15:44:03 +00:00
2c23b6c3bb
Added golden fleece actor placeholder
...
Change golden fleece resource value from 3000 to 1000
Changed large tree resources from 500 back to 300
This was SVN commit r7916.
2010-08-12 03:33:30 +00:00
d5bd374586
This should finish up multiplayer chat ( #216 )
...
Made chat window look a little better
Fixed issue with autostart
This was SVN commit r7914.
2010-08-12 03:01:33 +00:00
4cfca1625d
Added Multi-player chat in menu and hotkey (return key)
...
Made player names match custom names in multi-player
The chat window will still need some more aesthetic work
This was SVN commit r7909.
2010-08-11 22:16:16 +00:00
54d9224918
Add focus() script method to GUI objects.
...
Add basic GUI script timer.
This was SVN commit r7908.
2010-08-11 21:04:09 +00:00
0dc50ea1cd
Fix GUI errors on broken entities with no icons. Delete some bogus icon sheet references.
...
This was SVN commit r7905.
2010-08-11 10:54:08 +00:00
46bf5bc6cb
Switch default single-player map to Arcadia. Fix default multiplayer map.
...
This was SVN commit r7903.
2010-08-11 10:52:15 +00:00
461100b6f8
Try rephrasing the pre-release warning text
...
This was SVN commit r7900.
2010-08-11 01:22:05 +00:00
d46abd9aaf
Use a fixed aspect ratio for the menu screen background and loading screen concept art, to prevent ugly stretching at widescreen resolutions
...
This was SVN commit r7898.
2010-08-10 22:39:00 +00:00
e6c3f1c482
# Use more sound effects
...
This was SVN commit r7891.
2010-08-10 01:25:24 +00:00
e64d115d7c
# Change selection circles to match the player colour
...
This was SVN commit r7880.
2010-08-08 17:28:51 +00:00
353032070c
Replace "_" with " " in displayed map names.
...
Hide "_default" map from display.
Default to techdemo-mp map for multiplayer games.
Fix script error when selecting "Unassigned" in single-player setup
screen.
This was SVN commit r7872.
2010-08-08 15:25:16 +00:00
814a8722da
Don't load the Atlas DLL on startup, to improve performance.
...
This was SVN commit r7871.
2010-08-08 15:23:39 +00:00
4e58318ffc
Fix "pre-alpha" reference.
...
This was SVN commit r7870.
2010-08-08 15:23:03 +00:00
eef74bb784
Right-clicking with buildings selected should always set the rally point, even when clicking on another unit
...
This was SVN commit r7866.
2010-08-07 21:27:09 +00:00
d2e6233c44
Fixed HP display issues in GUI
...
This was SVN commit r7864.
2010-08-07 00:21:17 +00:00
4f2d9ee128
Fixed bandboxed entity preference code from relying on parsing template names
...
New rules for preferences:
units
defensive
others
This was SVN commit r7857.
2010-08-06 00:29:58 +00:00
07615310f2
# Add rally points for newly-trained units, based on patch from evans.
...
Fixes #521 .
This was SVN commit r7849.
2010-08-05 10:20:47 +00:00
c39c4ac8d3
Ignore recently-deceased units more gracefully in makePrimarySelection
...
This was SVN commit r7848.
2010-08-05 10:07:00 +00:00
65bcedb9fc
Load map descriptions from their XML file.
...
Add basic hold-fire stance, and use it for some test maps.
Add JSON data container to map XML files, to simplify the interaction
between scripts and maps.
Fix fixed-point printing so it roundtrips safely through map files.
Fix camera startup positions in old-format maps.
This was SVN commit r7844.
2010-08-04 21:15:41 +00:00
a5171d9145
Just display the delete button until the other commands are implemented
...
This was SVN commit r7843.
2010-08-03 01:54:16 +00:00
76e6b6dbe3
Made bandboxed selections more intelligent by preferring entities in this order:
...
1) units and animals
2) towers
3) buildings that are the same type as the first building
4) non-building entities
This was SVN commit r7840.
2010-08-01 21:50:03 +00:00
67e3a95d74
Added Delete Hotkey
...
Misc minor changes
This was SVN commit r7835.
2010-08-01 16:25:24 +00:00
aa2d305b6e
Added working delete button
...
This was SVN commit r7832.
2010-08-01 05:09:30 +00:00
dd2fcad2a2
Fixed fractional resources showing up in the GUI
...
This was SVN commit r7831.
2010-08-01 00:33:20 +00:00
be59106400
Cleaned up code (slight redesign)
...
Added more wood to trees
Standard trees 100 -> 300
Special trees 300 -> 500
This was SVN commit r7829.
2010-07-31 21:46:25 +00:00
ba591b6d9f
Redesigned the selection GUI
...
No more groups of any kind
Max selection size increased to 32
Single click - deselects all others
Single click with shift key - deselects all that are not the same type
(only for one rank)
This was SVN commit r7826.
2010-07-30 22:19:43 +00:00
0cd0a1f584
# Add auto-attacking of nearby enemies.
...
Add general range-detection code.
Avoid unnecessarily computing 3D entity positions.
This was SVN commit r7817.
2010-07-29 20:39:23 +00:00
365c005394
Code cleanup
...
This was SVN commit r7815.
2010-07-29 18:22:58 +00:00
ff7ea96189
Code cleanup
...
This was SVN commit r7811.
2010-07-26 03:31:54 +00:00
9a6c020fce
Allowed selections with only one group to also show the unit stats area
...
Split unit cycle back to 2 functions
This was SVN commit r7781.
2010-07-21 21:02:21 +00:00
6af3f28ad4
Converted resources:
...
wood -> wood.tree
stone -> stone.rock
metal -> metal.ore
Added resource: metal.treasure
Renamed cursors and added placeholder treasure cursor
Fixed basic templates and Hellene actors to work with new resources
(need to fix Celt actors)
Fixed some warnings in the session scripts.
Added entity "Golden Fleece" placeholder
This was SVN commit r7778.
2010-07-21 18:51:27 +00:00
602c92beae
GUI support for queued orders
...
This was SVN commit r7776.
2010-07-21 17:13:04 +00:00
9674c3c0fe
Remove ScriptingHost initialisation code (share with ScriptInterface instead).
...
Fix GUI scripts to avoid strict warnings.
Rejig GUI/SpiderMonkey interface to use less custom code, and to work
with JSOPTION_VAROBJFIX.
Add event name to GUI event handler function names (visible in the
profiler).
This was SVN commit r7769.
2010-07-19 23:01:58 +00:00
544afca570
Delete some old unused GUI scripts
...
This was SVN commit r7767.
2010-07-19 22:55:30 +00:00
0be1713b2b
Made several changes to session GUI (cosmetic).
...
Up/down arrow sprites are usable as regular buttons now.
Selections now group ranked units together as a single group. This
feature can be toggled in the settings window. Depending on feedback, I
will probably choose one method over the other and remove the toggle.
New map - Mountain Pass (8 player)
It will need further polishing.
This was SVN commit r7766.
2010-07-19 21:23:12 +00:00
e19146cf25
# Added AI for chickens.
...
Add scripted HFSM system.
Add very basic animal AI.
Support script-only message types.
Add shift+D hotkey to toggle dev command panel.
This was SVN commit r7763.
2010-07-18 15:19:49 +00:00
ae823038bd
Added <IconSheet></IconSheet> attribute to entities
...
Added icon_sheet attribute to GUI interface
Made session GUI reference template.icon_sheet
This was SVN commit r7761.
2010-07-16 02:45:22 +00:00
1f8459f717
Added new styles
...
Outlined player names to make them stand out more
(Probably will need a new font to get a good effect with the player
names)
This was SVN commit r7760.
2010-07-14 21:54:11 +00:00
0cb1fbe4d5
Fixed gathering from enemy farms instead of player owned farms
...
This was SVN commit r7735.
2010-07-11 01:25:50 +00:00
27512039a7
Made units attack enemy foundations instead of trying to build them
...
This was SVN commit r7730.
2010-07-10 17:28:32 +00:00
9b88e46fce
Code cleanup
...
This was SVN commit r7727.
2010-07-09 00:19:36 +00:00
c50f2d6d40
If any units in a selection have the ability to perform a task, then that task will be available even if some of the units cannot perform it. Units that cannot, will simply move to the target.
...
This was SVN commit r7726.
2010-07-08 22:47:57 +00:00
56e1802b81
Show message box when opening URL, since it might take a while to launch the browser
...
This was SVN commit r7721.
2010-07-08 18:46:39 +00:00
4b06ebd52d
Add basic help page into the main menu.
...
Add buttons to open the web site and IRC.
Tentatively allow Atlas to be launched from the menu.
Add some shutdown functions to support relaunching into Atlas without
having to restart the whole process.
This was SVN commit r7714.
2010-07-07 21:47:31 +00:00
db8dda7bda
Used Hele portrait sheet for units that begin with "camp"
...
Made button layout ever so slightly more efficient
Fixed some more Hellene animation speeds
This was SVN commit r7713.
2010-07-07 13:28:37 +00:00
7a58980ad6
Remove unneeded genericity
...
This was SVN commit r7712.
2010-07-07 10:47:20 +00:00
6bd38c1e5d
Report errors when hosting/joining fails
...
This was SVN commit r7709.
2010-07-06 20:51:45 +00:00
5d5cb02b21
Disable visible logging of network messages
...
This was SVN commit r7708.
2010-07-06 20:31:05 +00:00
31699e830d
Handle disconnections better.
...
Remove local sessions (just use ENet for everything instead) because
they add far too much complexity.
Fix memory leaks.
This was SVN commit r7706.
2010-07-06 19:54:17 +00:00
1bfb913a69
Fixed attempt to perform a string operation on a template instead of the template name
...
Worked on Hellene actor animation speeds
(They will still need some more tweaking)
This was SVN commit r7702.
2010-07-06 01:23:50 +00:00
5be1052ad0
Fixed a GUI selection display bug where the final element of a large selection was wrapping around and replacing the first selection group.
...
Added and removed some utility functions in session.js
This was SVN commit r7701.
2010-07-05 23:04:38 +00:00
669b230522
Re-enabled "remove from training queue" buttons since they work now
...
This was SVN commit r7697.
2010-07-05 16:56:30 +00:00
5d224bbeb6
Added tooltip to rank icon
...
Some code cleanup / rework
Minor fixes
This was SVN commit r7696.
2010-07-05 16:50:06 +00:00
d764473844
Fixed resource quantities not showing for player owned units
...
This was SVN commit r7685.
2010-07-04 03:49:58 +00:00
3af3cbe99a
Fixed the GUI selection issue where killed units were not being removed from the selection or the selection display
...
This was SVN commit r7683.
2010-07-04 01:03:14 +00:00
065f0deea3
Added third row of buttons to layout
...
This was SVN commit r7679.
2010-07-03 16:51:20 +00:00
e23d4d232a
Added rank icon
...
Removed displayed rank name (functions still available)
Fixed error with color name
This was SVN commit r7675.
2010-07-03 15:06:31 +00:00
be2e1b158a
Made player colors work for player names
...
Used civ name for the player name's tooltip
Created some additional utility functions
(finishing previous commit that was interrupted due to
some files being out of date)
This was SVN commit r7665.
2010-07-02 21:42:17 +00:00
051aa70940
Basic disconnection handling.
...
Pre-game chat.
Fix dynamic updates of focused input controls.
Allow scrollable texts to automatically scroll to the bottom.
Force usernames to be unique.
This was SVN commit r7664.
2010-07-02 21:28:48 +00:00
98a7d67b43
Player name now references actual player name (almost)
...
Added civ name to tooltip of player name
Player colors hacked in (to at least look consistent)
Made icons reference proper portrait sheets
This was SVN commit r7662.
2010-07-02 02:50:45 +00:00
8f48d0f007
Moved menu code out into:
...
menu.js
Moved selection details and unit commands code out into:
selection_details.js
unit_commands.js
Deleted some unused sprites
This was SVN commit r7659.
2010-07-01 20:31:47 +00:00
6d625fdc55
Added resource quantities to GUI for resource entities
...
Some code cleanup
This was SVN commit r7657.
2010-07-01 20:06:23 +00:00
1c0536bf08
# Refactored the networking code, and redesigned the game setup screen.
...
Major updates to most network classes.
Simplify CNetServer so it doesn't duplicate any client behaviour; all
players now run CNetClient.
Remove most player/slot management from networking code.
Wait for all players to finish loading before starting the simulation.
Remove CGameAttributes; attributes are now just a JS object.
Remove CPlayer; they are now just simulation entities.
Handle player colours via simulation system.
Add a default map for Atlas, so it always has something to load.
Move network documentation to Doxygen.
Remove lots of now-unused code.
This was SVN commit r7653.
2010-06-30 21:41:04 +00:00
303a3ff437
Fix line endings
...
This was SVN commit r7652.
2010-06-30 21:34:44 +00:00
1f7bb6c1fc
Applied new theme (thinWheatWindow)
...
Added bronze rectangles behind resources
Made queue panel resize if needed
This was SVN commit r7646.
2010-06-29 15:54:53 +00:00
26bdae945b
New style: thinWheatWindow
...
(same as wheatWindow, but thinner borders)
This was SVN commit r7645.
2010-06-29 15:51:11 +00:00
f21f8485e8
Added MAX_SELECTION_SIZE (24) to bandboxed selections
...
Cleaned up button layout code
This was SVN commit r7644.
2010-06-28 12:30:59 +00:00
21b1f1c965
Cut off panel on right side at 1024 for wide resolutions
...
Larger selection icons (Max of 16 now instead of 18)
This was SVN commit r7643.
2010-06-28 00:31:24 +00:00
e15f6120b1
Fixed minimap (z-value was making it unclickable)
...
Made stamina bar visible for player owned units only
This was SVN commit r7642.
2010-06-27 21:45:07 +00:00
08710e4dd6
New GUI design - marble edges instead of bronze edges
...
Overall layout changes (lower panel is shorter)
Moved presetting of shadows and fancy water into
session.xml from session.js using action on="Load"
This was SVN commit r7640.
2010-06-27 18:45:39 +00:00
a947ab5582
Fixed alignment issue with the left and right sides of the right marble border in the wheatWindowSand sprite
...
This was SVN commit r7639.
2010-06-27 18:40:44 +00:00
786bd5d11a
New basic GUI designed roughly off of AoE3 - ALPHA 1
...
Features:
-Basic menu and settings dialog
-New look for panel
-Multiple unit selections are now visible in GUI
This was SVN commit r7635.
2010-06-26 18:10:03 +00:00
f1d23f203e
Clone the current session GUI files
...
This was SVN commit r7634.
2010-06-26 17:11:04 +00:00
2c160e5bd8
Delete script scheduler, since it causes GC crashes and isn't used for anything important and could be implemented in pure JS instead.
...
This was SVN commit r7622.
2010-06-07 18:41:03 +00:00
5c9d0c17e2
Change default building placement angle by 45 degrees
...
This was SVN commit r7621.
2010-06-07 18:14:18 +00:00
7dca91f26b
# Various changes to the text rendering system.
...
Rewrite font builder tool to be much simpler and to support more text
effects.
Change GUI to use new set of fonts.
Switch font textures from TGA to PNG so they're easier for the font
builder to create.
Support RGBA font textures (for e.g. stroked text).
Greatly improve text rendering performance by using vertex arrays.
Fix rendering code leaving vertex buffers bound.
Add 'clip' property to GUI text objects, to disable clipping when
rendering.
Delete part of unused console function registration system.
This was SVN commit r7595.
2010-05-30 13:42:56 +00:00
739b25dc22
Fix script error when audio is disabled
...
This was SVN commit r7567.
2010-05-22 14:29:55 +00:00
4f13623099
Implementation of basic ambient sounds
...
This was SVN commit r7559.
2010-05-21 15:13:35 +00:00
6e6ae573e4
Delete old session GUI files.
...
This was SVN commit r7558.
2010-05-20 20:17:46 +00:00
c684c211a2
# Basic experimental multiplayer integration with new simulation system.
...
Add new turn manager that should be more correct and potentially more
efficient.
Remove evil CNetServer/CNetClient multiple inheritance of CTurnManager.
Add multiplayer autostart.
Various minor cleanups.
This was SVN commit r7551.
2010-05-20 00:59:01 +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
c0a0e0bdbd
Make the session GUI slightly more resilient to broken data files
...
This was SVN commit r7531.
2010-05-09 21:43:24 +00:00
037770a2a3
Fix use of 'undefined' sound group on death.
...
Warn about implicit script/native type conversions.
This was SVN commit r7527.
2010-05-09 13:56:06 +00:00
1738da1c3e
Add 'pause' command back into new session GUI
...
This was SVN commit r7523.
2010-05-09 01:13:56 +00:00
549ec9d561
Fix units attacking rocks and trees instead of gathering resources from them
...
This was SVN commit r7520.
2010-05-09 00:44:33 +00:00
c75029b6ab
Allow shift+click for multiple building placement
...
This was SVN commit r7519.
2010-05-09 00:25:03 +00:00
b821f7a289
Add hotkey "M" to toggle in-game music
...
This was SVN commit r7515.
2010-05-08 17:51:01 +00:00
e73a3cff78
Add some robustness against broken data
...
This was SVN commit r7505.
2010-05-07 15:56:24 +00:00
c34392053f
# Add a demo map with all units on it.
...
Support XML-only maps with simple flat terrain.
This was SVN commit r7501.
2010-05-03 19:13:58 +00:00
d485ecafdc
Optimise pathfinder tile storage a bit (improves speed by maybe 10%).
...
Increase the maximum search tile limit (reduces worst-case speed by
lots).
This was SVN commit r7495.
2010-05-02 20:14:09 +00:00
e140aa7baf
Avoid running the old simulation code in the background when it's not needed.
...
Optimise GUI updates to only occur when necessary.
Switch to more peaceful music after starting the game.
This was SVN commit r7492.
2010-05-01 16:20:58 +00:00
cfae58928f
# New unit movement system, which does a far better job of approaching targets and avoiding obstacles.
...
Add short-range vertex-based pathfinder.
Integrate new pathfinder into unit motion code.
Change obstruction system to get rid of circles, and differentiate
structures from units.
Make PositionChanged messages synchronous.
Try to prevent some accidental float->int conversions.
This was SVN commit r7484.
2010-04-29 23:36:05 +00:00
08db7ebe13
# Support training units in buildings.
...
Includes basic batch training (see #298 ).
This was SVN commit r7469.
2010-04-19 19:47:23 +00:00
abaea508ac
# Fix startup warning in scenario editor
...
This was SVN commit r7461.
2010-04-17 11:29:34 +00:00
90d5ba7552
Remove the useless profile option on the menu. Disable the currently-non-working multiplayer and history buttons.
...
This was SVN commit r7415.
2010-03-30 21:15:15 +00:00
89cce1b3ac
# Switch to new simulation system by default
...
This was SVN commit r7401.
2010-03-26 16:10:42 +00:00
f0c633785a
# GUI tweaks.
...
Add an obvious pre-release warning to the menu.
Report the build's svn_revision on the menu.
Fix exiting from sim2 session.
Make the in-game dev options a bit prettier.
This was SVN commit r7400.
2010-03-26 13:21:09 +00:00
00e18e4ea8
Report S3TC non-support with an in-game GUI message box.
...
Fixes #313 .
This was SVN commit r7390.
2010-03-23 22:45:07 +00:00
a5b8ec6028
Add obstruction debug mode, with GUI toggle.
...
Make pathfinder debug mode off by default, with GUI toggle.
This was SVN commit r7377.
2010-03-20 19:18:01 +00:00
