1
0
forked from 0ad/0ad
Commit Graph

2949 Commits

Author SHA1 Message Date
95edc4ea4b Fix player assignments in Mountain Pass map.
This was SVN commit r7868.
2010-08-08 15:21:16 +00:00
9765202d16 Move 512x512_desert to non-public, since it has broken textures and isn't useful
This was SVN commit r7867.
2010-08-08 14:00:15 +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
0adb57ef98 #Fixed healer duplicate in Greek temple UI queue.
This was SVN commit r7865.
2010-08-07 20:14:21 +00:00
d2e6233c44 Fixed HP display issues in GUI
This was SVN commit r7864.
2010-08-07 00:21:17 +00:00
ea8e5a7598 Make animals spend more time eating, to save pathfinding costs
This was SVN commit r7862.
2010-08-06 22:13:57 +00:00
3a0123b7b4 add .config version redirects for AtlasUI_dbg and test_dbg.exe for VC2008
This was SVN commit r7859.
2010-08-06 13:01:38 +00:00
9d18f59940 Fix tests
This was SVN commit r7858.
2010-08-06 12:34:42 +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
40e268e06a # Add terrain smoothing tool to Atlas, based on patch from DigitalSeraphim.
Fixes #516.

This was SVN commit r7854.
2010-08-05 20:43:31 +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
82b6449f8b This was SVN commit r7847. 2010-08-05 06:47:14 +00:00
b0141436a5 This was SVN commit r7846. 2010-08-05 05:40:47 +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
41ad5bd965 # Add corpse decay and building collapse.
Make 'delete' command kill the unit instead of destroying it.
Make projectiles vanish after a timeout.
Fix projectile landing positions with low framerates.

This was SVN commit r7837.
2010-08-01 17:38:01 +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
cad0baed3c Adjusted gather speeds
Rocks have more resources (500 -> 1000)

This was SVN commit r7830.
2010-08-01 00:06:40 +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
4883ddabc3 # Automatically gather from new resource after exhausting current one.
Fix error when gather target dies before the order is processed.

This was SVN commit r7827.
2010-07-31 21:21:42 +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
f625285386 Multiply more vision ranges by 4
This was SVN commit r7820.
2010-07-29 20:50:30 +00:00
22591ae210 Add combat test maps.
This was SVN commit r7818.
2010-07-29 20:40:04 +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
913404e4b2 Multiply vision ranges by 4 (convert from tiles to metres)
This was SVN commit r7816.
2010-07-29 20:26:26 +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
e416fe18cd Code cleanup and explicit number conversion
This was SVN commit r7802.
2010-07-24 22:09:59 +00:00
bc704b288a Made Animal AI default to "PASSIVE" if its type was not found
Added rudimentary fishing for units and merchant ships
Adjusted resource gather rates
Improved Mountain Pass map

This was SVN commit r7799.
2010-07-24 20:26:25 +00:00
ddb48c4631 Updated actor viewer animation names to match changes in actor files (animations for renamed resources)
This was SVN commit r7794.
2010-07-24 12:39:10 +00:00
f8275d2ed7 Added "PASSIVE" state to the Animal AI
This was SVN commit r7790.
2010-07-23 15:25:28 +00:00
2f54e77e29 Updated gather treasure cursor
(created by Mario Machado aka mfmachado)

This was SVN commit r7789.
2010-07-22 22:18:49 +00:00
f81e6a2bbd removed the fence around the walrus (very unnecessary, and quite silly, as well as not having any effect, not sure what to say about the walrus though =) ) as the fence as discovered by Brian wasn't part of the public SVN
This was SVN commit r7782.
2010-07-21 22:20:53 +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
ef0a80623c Fixed the resource type (wood -> wood.tree)
This was SVN commit r7780.
2010-07-21 20:41:35 +00:00
41e1652e10 Using .png for session cursors
Added .png version of cursors
Added gather treasure cursor

This was SVN commit r7779.
2010-07-21 20:35:26 +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
4e5c5e2d8f # Rewrite unit AI code.
Use HFSM for unit AI.
Support queuing orders.
Automatically attack back when attacked.
Automatically gather from farms after building them.

This was SVN commit r7775.
2010-07-21 16:09:58 +00:00
8a1aa101c1 Slow down animals, so they don't pathfind quite so much.
Make farms a better size.

This was SVN commit r7774.
2010-07-21 16:05:48 +00:00
bd2fd6c713 Extend animal AI to all animals.
This was SVN commit r7771.
2010-07-20 08:45:09 +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
d9d2c33ec7 Fix tests
This was SVN commit r7765.
2010-07-18 16:06:52 +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
5f366d798f Added female citizens to civil center
Removed unneeded reference to portrait sheet for the Celts and Hellenes
advanced and elite units since they already inherit it

This was SVN commit r7762.
2010-07-16 14:22:18 +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
d304807ac4 Authentic Greek unit names.
This was SVN commit r7752.
2010-07-14 07:57:58 +00:00
0ed5cf0355 This was SVN commit r7751. 2010-07-14 07:44:42 +00:00
90bfa8408e This was SVN commit r7749. 2010-07-14 04:52:12 +00:00
5a2630be1d This was SVN commit r7748. 2010-07-14 04:40:37 +00:00
713bd4ce92 update msvcr8 manifest version to match patched vc8 compiler (same problem that necessitated pyrogenesis_dbg.exe.config)
should fix
http://www.wildfiregames.com/forum/index.php?showtopic=13212&hl=

This was SVN commit r7746.
2010-07-13 19:44:01 +00:00
828efdde8f Tweaked the Hellene animation speeds
This was SVN commit r7737.
2010-07-11 20:00:14 +00:00
6b8924324a # Added one of each civ centre unit for all players to techdemo-mp.xml (Multiplayer testing map)
This was SVN commit r7736.
2010-07-11 13:14:45 +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
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
0c149cf447 fix SxS failure when vc2008 is installed but not patched vc2005 (similar to #510)
some of our libraries are compiled with an outdated vc2005, which causes
a manifest dependency on msvcr80d v762, while our manifest and DLLs have
been updated to 4053. finally bit the bullet and added a redirection
from 762 to 4053 to fix this nightmare.
references:
http://blogs.msdn.com/b/dsvc/archive/2010/02/22/adding-a-configuration-file-for-a-vc-dll.aspx
http://stackoverflow.com/questions/1347713/per-application-config-file-bindingredirect-doesnt-apply-to-dlls

This was SVN commit r7716.
2010-07-08 10:14:05 +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