1
0
forked from 0ad/0ad
Commit Graph

467 Commits

Author SHA1 Message Date
c0e915fd5d # Added more resources to the techdemo-mp.pmp (multiplayer testing map) to make testing more fun (also added some underwater/shoreline texture)
This was SVN commit r7734.
2010-07-10 23:35:48 +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
778af99416 Fix NaNs when gathering from unsupported resource types.
Fall back to walking to the target when unable to perform the specified
command on it.

This was SVN commit r7723.
2010-07-08 20:08:08 +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
dc5a78af30 Fix simulation test
This was SVN commit r7707.
2010-07-06 20:30:22 +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
dff694f0f0 Fix units spawning on top of each other.
Add type-safety to prevent that kind of bug happening again.

This was SVN commit r7691.
2010-07-04 17:19:38 +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
22d7f871ed Entities that have 0 resources remaining are now removed
This was SVN commit r7684.
2010-07-04 02:36:30 +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
d98b0c21b4 Fix references to nonexistent celt_fortress
This was SVN commit r7678.
2010-07-03 15:51:32 +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
9332a20998 Add map for multiplayer testing
This was SVN commit r7674.
2010-07-03 14:55:32 +00:00
5bc3c4b751 Fix inheritance of construction/training lists.
This was SVN commit r7667.
2010-07-03 01:23:23 +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
0d58a10604 Changed player 1 to "hele" to match units on Latium map
This was SVN commit r7663.
2010-07-02 03:10:14 +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
0002a5befe Extended access to existing player attributes
(this goes with previous commit - forgot to include it)

This was SVN commit r7661.
2010-07-02 02:46:32 +00:00
913c1b1946 Added getter methods for some existing attributes
This was SVN commit r7660.
2010-07-02 02:44:25 +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
5fec6c40dd Set svn:eol-style native
This was SVN commit r7655.
2010-07-01 16:58:44 +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
b80a3bece3 This was SVN commit r7638. 2010-06-27 18:28:16 +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
37798136c2 Actor animation tweaks for Greek archers.
This was SVN commit r7618.
2010-06-07 02:43:09 +00:00
95fd92ad3a This was SVN commit r7616. 2010-06-06 23:43:59 +00:00
f7d50b3f17 Try to fix animation speeds for a couple of units
This was SVN commit r7614.
2010-06-06 20:49:41 +00:00
72f0638a4b Delete obsolete entity template files
This was SVN commit r7613.
2010-06-06 20:38:44 +00:00
23c92b7fe3 Fix actor viewer animation offsetting.
Fix attack animation drifts.

This was SVN commit r7612.
2010-06-05 22:23:28 +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
e6cab58194 Add map for testing terrain passability and movement costs
This was SVN commit r7591.
2010-05-27 23:32:59 +00:00
11a20e1bcf # Handle terrain passability and movement costs in pathfinder.
Simplify terrain code (remove Handle indirection).
Delete unused terrain properties.

This was SVN commit r7590.
2010-05-27 23:31:03 +00:00
5c3a59234c Fix OOS errors when placing buildings.
Allow script components to supply custom serialization objects.

This was SVN commit r7571.
2010-05-22 23:02:07 +00:00
739b25dc22 Fix script error when audio is disabled
This was SVN commit r7567.
2010-05-22 14:29:55 +00:00
ab7c9a9879 Generic ambience
This was SVN commit r7560.
2010-05-21 15:15:34 +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
cdcee291cf Convert all remaining entity template data to new file format.
Add dummy component implementations for new data.
Partly support multiple weapons for a single unit.

This was SVN commit r7547.
2010-05-15 21:07:52 +00:00
91522c6f58 This was SVN commit r7539. 2010-05-12 04:42:32 +00:00
ecccf4c0d7 Added <soundgroup> for cavalry steps XML and added Run to infnatry
This was SVN commit r7534.
2010-05-10 00:17:24 +00:00
86d117d623 Introduced a infantry "run" XML file
This was SVN commit r7533.
2010-05-10 00:15:29 +00:00
afe29fdadf Fix errors and inconsistencies in entity template XML files
This was SVN commit r7532.
2010-05-09 21:46:41 +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
549ff09c8b Added XML for generic animal death and fixed horse death xml
This was SVN commit r7529.
2010-05-09 18:34:40 +00:00
8defd5aaa3 Fix footstep sounds
This was SVN commit r7528.
2010-05-09 14:45:19 +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
4daf1ea92c Adjusted the levels so this was a little more present in the overall mix
This was SVN commit r7526.
2010-05-09 01:46:46 +00:00
a9ae34e864 Fixed mounted folder structure to reflect the other entities and added mounted deaths with xml
This was SVN commit r7525.
2010-05-09 01:38:33 +00:00
328f711dc4 Added "gathering.xml" which now references to audio/resource/farming/ in order to share hoeing sounds for the alpha release
This was SVN commit r7524.
2010-05-09 01:23:26 +00:00
1738da1c3e Add 'pause' command back into new session GUI
This was SVN commit r7523.
2010-05-09 01:13:56 +00:00
145a4b65aa Fixed walking sound to match animation and to fix a phase issue when multiple instances are played at the same time
This was SVN commit r7522.
2010-05-09 01:12:43 +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
3c75dba1b8 Clean up some svn:executable flags
This was SVN commit r7518.
2010-05-08 23:17:08 +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
1b51cf7ad5 Fix obstruction shapes for some buildings
This was SVN commit r7487.
2010-05-01 09:44:28 +00:00
d0bcb06d1c Add a map for testing pathfinding.
This was SVN commit r7485.
2010-04-29 23:36:43 +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
08720c9a58 Convert minimap data in entity templates
This was SVN commit r7481.
2010-04-23 18:37:37 +00:00
f4ad5906c9 # Display units on the minimap
This was SVN commit r7480.
2010-04-23 18:36:48 +00:00
dd809f83e8 # Add documentation of the entity template XML file format.
Simplify the format a bit.
Use less <interleave> in the RNG so that error reports become
understandable.
Fixes #491.

This was SVN commit r7478.
2010-04-23 16:09:03 +00:00
116645ff74 Update the entity templates to a slightly cleaner format
This was SVN commit r7477.
2010-04-23 16:07:45 +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
45368671c4 Convert training queue data in entity templates.
This was SVN commit r7468.
2010-04-19 19:45:31 +00:00
17c9478229 Add some training buildings to the test map.
This was SVN commit r7467.
2010-04-19 19:44:35 +00:00
fb72b3c63b # Add a map for testing projectiles
This was SVN commit r7462.
2010-04-17 11:32:15 +00:00
abaea508ac # Fix startup warning in scenario editor
This was SVN commit r7461.
2010-04-17 11:29:34 +00:00
4570a6af72 Import quiver prop since it's needed for archers
This was SVN commit r7459.
2010-04-16 19:26:55 +00:00
40688ec5df # Initial support for automatic validation of entity template XML.
Add RelaxNG schemas for all current components.
Add -dumpSchema command-line option to dump the combined entity schema.
Add a Perl script to validate entity templates against the schema.
See #413.

This was SVN commit r7452.
2010-04-09 19:02:39 +00:00
336817a849 Update entity template conversion to be more correct and consistent
This was SVN commit r7451.
2010-04-09 18:48:11 +00:00
252d427f10 Fix consistency problems in old entity templates
This was SVN commit r7450.
2010-04-09 18:46:25 +00:00
8a278ea5a8 This was SVN commit r7446. 2010-04-06 23:29:34 +00:00
4c0d47707b # Fix animation syncing.
Make animations trigger sound effects.
Adjust attack animation timings to match simulation.
Simplify the animation speed settings.

This was SVN commit r7438.
2010-04-05 23:09:34 +00:00
cfca28cab0 # Initial audio integration with new simulation system.
Support sound group playback from simulation scripts. See #486.
Update some sound group files to sound better for rough testing.
Clean up CSoundGroup a tiny bit.

This was SVN commit r7437.
2010-04-04 21:24:39 +00:00
7275071785 Convert sound data in entity templates
This was SVN commit r7436.
2010-04-04 21:12:21 +00:00
7a14a3ee90 Sync new entity definitions with old
This was SVN commit r7435.
2010-04-04 20:53:43 +00:00
bddb73af13 # Make pop bonuses increase the pop limit, not decrease
This was SVN commit r7434.
2010-04-04 20:52:21 +00:00
992d0b04c1 First batch of fixed Stereo > Mono
This was SVN commit r7433.
2010-04-03 23:21:44 +00:00
62a0129aba oops, this is the actual file
This was SVN commit r7432.
2010-04-03 19:58:50 +00:00
e41d4500ef XML to boot
This was SVN commit r7431.
2010-04-03 19:54:47 +00:00
ffba5a6ecc Something for Philip :-)
This was SVN commit r7430.
2010-04-03 19:53:56 +00:00
0d6882dad2 # Fix the actor viewer in Atlas.
Delete the old standalone actor viewer.
Import some terrain textures that are useful for tools.
Fixes #483.

This was SVN commit r7428.
2010-04-03 11:07:42 +00:00
01df384cf1 gate, siege and destro sounds. Added proper folder for gate
This was SVN commit r7426.
2010-04-02 19:12:42 +00:00
da468976bf poor animals :-(
This was SVN commit r7425.
2010-04-02 19:04:28 +00:00
7cbfc08190 More (appropriate) arrow impact on wood.
This was SVN commit r7424.
2010-04-02 19:02:46 +00:00
7a7b6e1dbb Arrow impact on metal By Goblor
This was SVN commit r7423.
2010-04-02 18:18:47 +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
e6da57c7c5 Rename music files. Set svn:mime-type.
This was SVN commit r7392.
2010-03-24 09:59:26 +00:00
ad5dfd2a37 Replacement music files *Lower VBRs
This was SVN commit r7391.
2010-03-24 03:19:31 +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
600ab80a79 Remove unnecessarily large music files
This was SVN commit r7389.
2010-03-23 21:34:05 +00:00
0d92be3408 Music
This was SVN commit r7388.
2010-03-22 15:01:19 +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
5293aee71d #Hypaspist modification.
This was SVN commit r7354.
2010-03-13 19:21:09 +00:00
aca1074188 Load build speeds and foundation actors from entity template files
This was SVN commit r7353.
2010-03-12 22:28:51 +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
86205b4d8e # Basic projectile attacks in new simulation system
This was SVN commit r7347.
2010-03-07 21:38:39 +00:00
36e90e71f2 Convert ranged attack data in entity templates
This was SVN commit r7346.
2010-03-07 20:22:15 +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
96bb3afaaf Support disabling of inherited components in entity templates
Allow units to walk through farms

This was SVN commit r7323.
2010-02-12 22:48:16 +00:00
f8aca33a14 # Support resource gathering in new simulation system
This was SVN commit r7322.
2010-02-12 22:46:53 +00:00
321cc8ae8f Convert resource data in entity templates
This was SVN commit r7321.
2010-02-12 22:46:07 +00:00
60a9e63c71 # Improved unit animation in new simulation system
Tried to make the motion/AI/animation state transitions saner
Added smoothed rotation of moving units
Slightly more informative error reporting

This was SVN commit r7319.
2010-02-10 19:28:46 +00:00
06b0ea0a26 Fix breakage from accidental removal of global variable
This was SVN commit r7314.
2010-02-07 20:16:17 +00:00
d609a9f81c # Basic animation support in new simulation system.
Movement speed.
Improved accuracy of walking.

This was SVN commit r7313.
2010-02-07 20:06:16 +00:00
ea4c22fc0e Convert walking speed data in entity templates
This was SVN commit r7312.
2010-02-07 19:54:58 +00:00
b25076ed4d Min/max range support in pathfinder
This was SVN commit r7311.
2010-02-06 20:58:48 +00:00
b21e798243 # Primitive melee combat support in new simulation system
This was SVN commit r7309.
2010-02-05 22:00:39 +00:00
c50fe9b8c0 Convert health, armour, attack data in entity templates
This was SVN commit r7308.
2010-02-05 21:45:31 +00:00
a0ae9062d3 Convert footprint data in entity templates
This was SVN commit r7292.
2010-01-29 21:07:15 +00:00
92df4d1793 Default to disabled-LOS mode with new simulation system
This was SVN commit r7291.
2010-01-29 21:04:23 +00:00
3c2e80c698 Disable the default slide-down-hills behaviour
This was SVN commit r7290.
2010-01-27 19:34:58 +00:00