Commit Graph

121 Commits

Author SHA1 Message Date
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
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
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
5d5cb02b21 Disable visible logging of network messages
This was SVN commit r7708.
2010-07-06 20:31:05 +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
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
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
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
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
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
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
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
08487ce246 # Improve support for building placement (rotation, collision detection) in new simulation system
This was SVN commit r7362.
2010-03-17 23:16:04 +00:00
9213ee8c27 # Construct buildings from foundations.
Display construction costs in tooltips.
Stop buildings leaving corpses.
Add debug info option to GUI.

This was SVN commit r7352.
2010-03-12 21:41:40 +00:00
bf31596486 Fix cursor and GUI-object interaction in bandbox selections
This was SVN commit r7350.
2010-03-12 20:39:52 +00:00
06928f7694 # Basic bandbox selection of units in new simulation system
This was SVN commit r7349.
2010-03-11 20:01:16 +00:00
a8d810b4b3 Add a switch to allow the user to control all player's units, for easier testing
This was SVN commit r7345.
2010-03-07 20:21:17 +00:00
1712b2cdb1 # Support death in new simulation system
This was SVN commit r7344.
2010-03-07 20:14:30 +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
f8aca33a14 # Support resource gathering in new simulation system
This was SVN commit r7322.
2010-02-12 22:46:53 +00:00
b21e798243 # Primitive melee combat support in new simulation system
This was SVN commit r7309.
2010-02-05 22:00:39 +00:00
c399dc277e # Rough first version of GUI redesign
Minor GUI engine cleanups

This was SVN commit r7289.
2010-01-27 19:20:34 +00:00
f011f0a3ce Expose entity template data to GUI
This was SVN commit r7287.
2010-01-25 23:43:58 +00:00
3f1dfce41b Simplify GUI/simulation interface
This was SVN commit r7286.
2010-01-25 22:31:43 +00:00
953fb41c82 # Basic in-game building placement with new simulation system
This was SVN commit r7285.
2010-01-24 17:24:35 +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