1
0
forked from 0ad/0ad
Commit Graph

501 Commits

Author SHA1 Message Date
Fire Giant
b987de64a7 Fixed bug that made it impossible to start a game (music problem stopped the session load working).
This was SVN commit r2005.
2005-03-18 10:39:52 +00:00
460ee1a22f Malte's female sketchs
This was SVN commit r2004.
2005-03-18 10:24:00 +00:00
Fire Giant
246e319b1c First drafts of new MP GUI, commiting to stay in sync with the repository
This was SVN commit r2003.
2005-03-17 19:30:37 +00:00
Fire Giant
5a32947586 Added code for testing concept images on the loading screen.
This was SVN commit r1998.
2005-03-16 14:55:16 +00:00
Fire Giant
51aa0e2077 Adding temporary concept images for testing.
This was SVN commit r1997.
2005-03-16 14:54:17 +00:00
cdecd9b242 Fixed floating prop on the persian CC and bad UV on the persian TC
This was SVN commit r1980.
2005-03-10 00:41:42 +00:00
89d9248116 Persian CC and HC
This was SVN commit r1970.
2005-03-08 16:30:04 +00:00
11d546d70a persian fancy props
This was SVN commit r1969.
2005-03-08 16:29:47 +00:00
4231bb25d0 persian fancy update
This was SVN commit r1968.
2005-03-08 16:28:54 +00:00
0aa41ad0e4 Committing some persian stuff.
This was SVN commit r1967.
2005-03-08 16:27:10 +00:00
0d6035ea68 Committing revised "game session" GUI coordinates (sorry, doesn't make much cosmetic difference, but it's an improvement on the code side). The command buttons and build lists still need to be revised (hence they're upside down -- the coordinate system has flipped), so please note that's a known problem.
This was SVN commit r1966.
2005-03-07 18:25:13 +00:00
4034a58437 *persian building fixes - posts, player color, bad actor file
*'fixed' bobbo's prop errors for his roman buildings, eliminating all
the loading errors

This was SVN commit r1961.
2005-03-01 04:14:11 +00:00
f8f2245846 Persian building stuff, and a few temporary palm trees
This was SVN commit r1952.
2005-02-28 04:50:17 +00:00
16ad78abae add sound master gain and additionally bind console to F10 for non-us keyboard layouts (where backquote is a dead key)
This was SVN commit r1941.
2005-02-26 21:43:52 +00:00
ed3c740fa8 Doesn't look like I'll be able to finish off the session coordinate adjustment this weekend, so committing one more shared file so it doesn't conflict with someone else's work.
This was SVN commit r1933.
2005-02-25 17:25:42 +00:00
71701ba244 Not finished with session yet, so committing just the shared bits I've modified (ie anything without *session*.* in the title) so that Malte can do his network GUI now that Simon's committed his changes. *nudge* *nudge*
This was SVN commit r1932.
2005-02-23 21:13:36 +00:00
a52d392f4f Changed the global test texture... toned down the shadows and increased the rez
This was SVN commit r1925.
2005-02-18 19:25:36 +00:00
14c5dcb1f0 The global goods from my little demo!
This was SVN commit r1924.
2005-02-18 06:33:40 +00:00
96aeec3547 Taking out 2 old horse actors that are pointing to animations that have one less tail bone and causing an error
This was SVN commit r1923.
2005-02-13 23:44:04 +00:00
ce27068bac Fixed some Atlas coordinates to fit in with improved input box, and some optimisations.
This was SVN commit r1914.
2005-02-08 19:11:02 +00:00
ebf76cf517 Carthaginian update for their structures. Unwrapped, skinned, and textured (complete with player color). No props yet, so they look a little bit plain, but they look better than yellow textures with carthaginian plastered all over them ;)
This was SVN commit r1913.
2005-02-06 07:15:24 +00:00
Gee
c710b84b88 Alright, I've taken all the input controls in the atlas, and removed their sprite parameter and their hidden parameter, and changed their style to "atlas_input". This is the beauty of styles and it should be utilized. A standard control should only need size/name/style (let's call it, Gee's trinity :P). Anyway, I've also adjusted the size of the input control's sprite, I have explained why in the file. Finally, hidden="false" was removed (on all input controls, but it can be removed for the others too) because it's implicit, it'll always be the standard value, so it can be omitted whenever not 'true', trust me, it'll be much neater code.
This was SVN commit r1910.
2005-02-05 18:38:54 +00:00
Gee
6af0d7cfd3 This was SVN commit r1903. 2005-02-05 07:24:09 +00:00
Gee
a1ff815784 Settings added.
This was SVN commit r1902.
2005-02-05 07:23:22 +00:00
Gee
878630d0b0 Moved to the edge.
This was SVN commit r1901.
2005-02-05 07:22:58 +00:00
Fire Giant
4ddc8b1c1d Changed the startGame() command on the server side and added some chatting stuff.
This was SVN commit r1898.
2005-02-03 18:20:14 +00:00
a6668c1b22 Some animations
This was SVN commit r1893.
2005-02-02 08:36:59 +00:00
9695f7245b Quick change of Roman fortress name.
This was SVN commit r1887.
2005-01-31 18:58:15 +00:00
Fire Giant
3760b15b51 Updated the MP screen, connecting and chatting now work. Starting a game doesn't work, due to startGame() somehow being non-functional in MP mode.
This was SVN commit r1876.
2005-01-30 14:40:25 +00:00
462369a244 Sixty helmets
This was SVN commit r1875.
2005-01-30 06:46:08 +00:00
9ff6768af9 Did some more player color on shields, just did the mask on the oval ones, cause I'm not sure how they will look. Waiting to do more till I have the player color tester in my grubby little hands.
This was SVN commit r1874.
2005-01-30 06:44:27 +00:00
d92996027a Fixed Atlas tooltips that weren't working before.
This was SVN commit r1871.
2005-01-29 23:52:22 +00:00
7c3993d284 just a little bit more color added
This was SVN commit r1870.
2005-01-29 22:22:02 +00:00
1ca0941853 reducing the super bright player color effect
This was SVN commit r1869.
2005-01-29 22:07:42 +00:00
fd5597f974 greyed out textures player color shield textures
This was SVN commit r1868.
2005-01-29 20:20:41 +00:00
ccbe6e44a1 test map for shields and player color
This was SVN commit r1867.
2005-01-29 18:35:55 +00:00
6731faa246 sheild player color test actors
This was SVN commit r1866.
2005-01-29 18:33:09 +00:00
985c4dbaf9 recommitting player color test shields
This was SVN commit r1864.
2005-01-29 18:11:08 +00:00
2722cc6640 Fixed the Atlas coords so it all works. It's not finding the tooltip object (which must be a script bug, since other pages have working tooltips), but here's what I've got so far.
This was SVN commit r1859.
2005-01-29 16:11:55 +00:00
Fire Giant
bafdbe7f98 Finally fixed the nasty misplaced main menu buttons.
This was SVN commit r1856.
2005-01-28 23:01:25 +00:00
9b7007e546 Reverted map change (since it was broken)
This was SVN commit r1843.
2005-01-27 18:51:37 +00:00
c056d9a545 This was SVN commit r1835. 2005-01-27 11:41:05 +00:00
59227899dc Initial work on GUI coordinate revision (implemented for Manual and Editor, anyway), though Editor currently has a strange infinite loop on startup I'm too tired to squash right now. Broke Editor script so game'll work in the meantime; will fix ASAP.
This was SVN commit r1834.
2005-01-27 11:33:27 +00:00
ef6358b187 updated xml files to use the test player color shields
This was SVN commit r1833.
2005-01-27 04:40:04 +00:00
1085250de6 sheilds that have been 'player colorized'
This was SVN commit r1831.
2005-01-27 03:55:12 +00:00
NoMonkey
d7b3d6b0c7 Added a new material, "player_trans.xml" which will give a model player color. So now if you want a player to be colored, just add this material!
This was SVN commit r1830.
2005-01-27 02:52:26 +00:00
dd7f2c53cf Revised online manual. Added placeholder rollovers to all units. Improved coordinate system.
This was SVN commit r1819.
2005-01-25 22:43:07 +00:00
NoMonkey
c71c360993 This was SVN commit r1806. 2005-01-24 14:06:15 +00:00
0e39146eb4 Fixing a actor mixup I made with the Hellenes
This was SVN commit r1802.
2005-01-24 02:03:40 +00:00
1de3d80f98 Update because png flipping problem was resolved, fixed the persian and roman profiles from some DD changes.
This was SVN commit r1801.
2005-01-24 01:27:16 +00:00
032346a3a9 Changing from dds to png for the civ sheets
This was SVN commit r1800.
2005-01-24 00:46:39 +00:00
2c4b86e9ab Set default number of players for SP games to the max (9 including Gaia).
This was SVN commit r1764.
2005-01-23 12:37:46 +00:00
ebfa5f8d24 Changed resources over to a player object and did some reorganisation of the session start/end code.
This was SVN commit r1763.
2005-01-23 11:50:51 +00:00
fb69ed56b2 sheild stuff:
* Some new sheild meshes
* Reuploading the shield textures because the old ones were S3 instead
of Nvidia
* Some shield actors

This was SVN commit r1762.
2005-01-23 07:58:25 +00:00
9581fbc1e5 Shield textures for the Greeks, Persians, and Romans
This was SVN commit r1750.
2005-01-21 05:20:03 +00:00
d810bb88b1 Uploading 3 civ's sheild textures. (will be modified for player color later)
This was SVN commit r1749.
2005-01-20 07:47:57 +00:00
d5b1e84e0d Place holder animations for all infantry put in place.
This was SVN commit r1748.
2005-01-20 00:07:27 +00:00
c1ff5de88b Updated with new network JS Interfaces
This was SVN commit r1747.
2005-01-19 22:34:29 +00:00
b391fb89ef * Javlin, Slinger, Archer attack animations
* Modified sling mesh
* Fixed Celt Infantry Javelinist actor

This was SVN commit r1745.
2005-01-19 08:31:37 +00:00
1e2cd629f3 Replaced unit histories with Paul's new descriptions.
This was SVN commit r1744.
2005-01-18 20:05:38 +00:00
e62258e47e Reorganised GUI scripts a bit.
This was SVN commit r1743.
2005-01-18 19:29:03 +00:00
1eb9a7872b Integrated Player attributes with the status pane and manual, and created a really rough test map with different player civs.
This was SVN commit r1742.
2005-01-18 18:09:37 +00:00
1c044ac229 Primitive entity player-selection in ScEd
This was SVN commit r1727.
2005-01-16 23:09:41 +00:00
2e58a8fd21 Entities for the Celtic Advanced and Elite units (although they don't actually work; not sure why yet).
This was SVN commit r1726.
2005-01-16 14:16:03 +00:00
986d62a2f5 Did first half of Object Editor. Added the Beautify buttons I missed yesterday.
This was SVN commit r1725.
2005-01-16 13:12:28 +00:00
d202e580b2 Committed some updates for:
* Seems I missed some of the sign xml files when I changed the png to
dds commit
* I changed foundation actors to make it so that they flatten terrain
when you place them - handy for screenshots (place and delete them to
level terrain)
* Uploaded some of the animations I have been working on
* Modified a few of the celtic dudes
* Modified the male meshes because they were holding the shield wrong
* Made a nicer temporary celt texture
* Included the map I used for the "Charge" screenshot

This was SVN commit r1724.
2005-01-16 06:01:51 +00:00
c84ea97601 Implemented first draft of Terrain Editor controls. Increased size of toolbar arrows on Philip's behalf. :)
This was SVN commit r1723.
2005-01-15 22:49:34 +00:00
551bef482a Prevented crash when loading non-existent maps
This was SVN commit r1721.
2005-01-15 17:20:51 +00:00
4c3dea8a14 Just to prove I'm not dead (yet), made a little more progress on the cliff and water controls.
This was SVN commit r1720.
2005-01-14 23:24:36 +00:00
4720a00f98 Made ScEd output entities into an XML file.
Added CStrW::utf8() (used by XMLWriter).

This was SVN commit r1716.
2005-01-12 14:31:47 +00:00
570e3c46d7 Flipped terrain alpha maps again
This was SVN commit r1715.
2005-01-12 13:20:57 +00:00
36718c1c7f Fixed a few of the noticable errors with Bobbo's latest commit.
This was SVN commit r1714.
2005-01-12 06:55:48 +00:00
cb63a8c901 A little of water and cliff painting controls.
This was SVN commit r1713.
2005-01-11 23:18:15 +00:00
cc0acc8691 Fixed UTF-16 encoded file
This was SVN commit r1709.
2005-01-11 16:59:51 +00:00
Aeros
35262fae0b This was SVN commit r1706. 2005-01-11 01:28:00 +00:00
963c56e796 Finished first draft of Edit Elevation controls.
This was SVN commit r1703.
2005-01-10 22:39:53 +00:00
beaa16eeb8 Fixed actor DTD paths
This was SVN commit r1698.
2005-01-10 21:20:21 +00:00
fd80bc2864 Made it so you could click the 0 A.D. logo in the corner in the Editor to return to the Main Menu, as requested by Jason.
This was SVN commit r1692.
2005-01-09 21:53:01 +00:00
949801ad85 A little more Editor; stopping for lunch.
This was SVN commit r1691.
2005-01-09 15:39:51 +00:00
33051d0421 A little more progress on Editor, and some fixes to yesterday's commit (hopefully this won't affect Malte's work).
This was SVN commit r1688.
2005-01-09 13:24:02 +00:00
bcaf63367b Removed some more files that weren't required.
This was SVN commit r1687.
2005-01-09 13:07:21 +00:00
5e86d5a75e Case fix Rider => rider for the prop point
This was SVN commit r1686.
2005-01-09 06:27:51 +00:00
242e9241ce Updating cavalry to use the new horses. Each civ uses is own horse color texture.
This was SVN commit r1685.
2005-01-09 06:09:37 +00:00
e2939934d9 horse updates in the fauna
This was SVN commit r1684.
2005-01-09 06:11:04 +00:00
0657b788b3 new horse textures
This was SVN commit r1683.
2005-01-09 06:08:26 +00:00
02a8a4f26c New horse animations
This was SVN commit r1682.
2005-01-09 06:06:53 +00:00
58a337e000 new horse mesh
This was SVN commit r1681.
2005-01-09 06:06:05 +00:00
c7d2f13802 Removed some files that weren't required.
This was SVN commit r1678.
2005-01-09 00:46:53 +00:00
d4e56d3f79 Corrected file names for props
This was SVN commit r1677.
2005-01-09 00:43:31 +00:00
00f83b5495 deleting improperly named prop files
This was SVN commit r1676.
2005-01-09 00:40:20 +00:00
Aeros
a596d87dab This was SVN commit r1675. 2005-01-09 00:04:14 +00:00
fc4a8c3206 A little more work on the Map Creator GUI of the Editor, which is slightly broken and I'll continue with it after Malte's done his update.
This was SVN commit r1673.
2005-01-08 18:25:09 +00:00
31a0f97302 added mountains_galore.pmp
added      mountains_night.pmp

This was SVN commit r1672.
2005-01-08 17:56:57 +00:00
ebb50bfddb Fix for the sign that is way off in the distance.
This was SVN commit r1671.
2005-01-08 17:26:33 +00:00
3ae97143ba Fix those persian icon sheets that I somehow bungled up earlier this week.
This was SVN commit r1670.
2005-01-08 07:59:28 +00:00
d5b7959b88 Apologies for the multiple commits. SVN refused if I tried to send it all at once. ;)
This was SVN commit r1649.
2005-01-05 20:37:51 +00:00
7b645acf5b Went through all building and unit entities and added their unique names and histories. Also removed structure and unit entities that aren't used (eg Special Buildings, some defensive structures), and refined build and train lists to match civ profiles.
This was SVN commit r1648.
2005-01-05 20:19:41 +00:00
45b82330fd Went through all building and unit entities and added their unique names and histories. Also removed structure and unit entities that aren't used (eg Special Buildings, some defensive structures), and refined build and train lists to match civ profiles.
This was SVN commit r1647.
2005-01-05 20:14:46 +00:00
c7de44ac74 Went through all building and unit entities and added their unique names and histories. Also removed structure and unit entities that aren't used (eg Special Buildings, some defensive structures), and refined build and train lists to match civ profiles.
This was SVN commit r1646.
2005-01-05 20:11:29 +00:00
82ec5c029f Went through all building and unit entities and added their unique names and histories. Also removed structure and unit entities that aren't used (eg Special Buildings, some defensive structures), and refined build and train lists to match civ profiles.
This was SVN commit r1645.
2005-01-05 20:03:19 +00:00
a6c41eb2fe Went through all building and unit entities and added their unique names and histories. Also removed structure and unit entities that aren't used (eg Special Buildings, some defensive structures), and refined build and train lists to match civ profiles.
This was SVN commit r1644.
2005-01-05 19:58:58 +00:00
c04a18f627 Went through all building and unit entities and added their unique names and histories. Also removed structure and unit entities that aren't used (eg Special Buildings, some defensive structures), and refined build and train lists to match civ profiles.
This was SVN commit r1643.
2005-01-05 19:55:32 +00:00
eb94902fe5 Achieved absolutely nothing 16:30-22:00 trying to fix GUI bugs. Committing nothing, just for the hell of it.
This was SVN commit r1638.
2005-01-04 22:12:56 +00:00
f9d4b15299 Few changes to the unit files for the new heads
This was SVN commit r1633.
2005-01-04 08:24:37 +00:00
e7c6299c54 A few placeholder textures for the new civ heads
This was SVN commit r1632.
2005-01-04 08:05:58 +00:00
547cd7cf74 A few alternate head meshes
This was SVN commit r1631.
2005-01-04 08:05:18 +00:00
0e66af7172 placeholder head actors for the civs
This was SVN commit r1630.
2005-01-04 08:04:46 +00:00
42eb12f6e4 This was SVN commit r1629. 2005-01-04 05:46:39 +00:00
7585337186 Eliminated unneeded actors from the /units folder
This was SVN commit r1628.
2005-01-04 05:22:04 +00:00
18f2f1ce94 Some fixes for the unit actors before I go through and elite the extra not needed stuff.
This was SVN commit r1627.
2005-01-04 04:28:51 +00:00
1890bae0d2 Created placeholder entities for all civ's units and buildings (other than the last two ranks). There's also a problem with the text on their portraits not appearing (just a plain coloured background), but apparently the existing revision has the same bug, so I guess there's no harm in committing this first before continuing to try to fix it.
This was SVN commit r1626.
2005-01-03 23:27:36 +00:00
bb8022e8c7 Fixed some bits related to Jason's new units, and added a placeholder map for entity development.
This was SVN commit r1622.
2005-01-03 13:11:53 +00:00
ddc7b6ceef Meshes for the new units and some animal meshes
This was SVN commit r1621.
2005-01-03 09:03:39 +00:00
9a6b10a3c6 Actors for placeholder signs and props actors for propped dude
This was SVN commit r1620.
2005-01-03 08:48:18 +00:00
d9e405c49d Actors for the placeholder units
This was SVN commit r1619.
2005-01-03 08:25:49 +00:00
8e0b0eda4c Dude Head update UVW's
This was SVN commit r1618.
2005-01-03 08:25:29 +00:00
88a2b0f158 place holder textures for some helmets, a new dude head texture, and updated weapons skin
This was SVN commit r1617.
2005-01-03 08:24:24 +00:00
9acdfd40fd placeholder textures for the placeholder units
This was SVN commit r1616.
2005-01-03 08:18:18 +00:00
2c892001d4 Some temporary placeholder stuff. Mainly props for the prop dude and signs for the placeholder units
This was SVN commit r1615.
2005-01-03 08:14:40 +00:00
ce1c4b8ef9 Michael made a nice 'default' map for the editor. If this could be made the default map for ScEd that would be great... instead of that ugly cliff junk.
This was SVN commit r1614.
2005-01-03 05:16:31 +00:00
bdc0073b16 Added product/company watermark to aid in taking official screenshots. Press W to toggle it.
This was SVN commit r1613.
2005-01-02 19:25:22 +00:00
a8b7c8c0cf A little more GUI stuff.
This was SVN commit r1610.
2005-01-01 19:20:42 +00:00
daebe3fec1 Editor menu bar (though no actual menu yet :p)
This was SVN commit r1607.
2005-01-01 16:53:14 +00:00
8e071ef602 Revised coordinate system for Editor, after advice from Philip. Much more flexible, less lines of code.
This was SVN commit r1606.
2005-01-01 15:30:56 +00:00
f9c51d8ec7 Replaced - with _ in GUI
This was SVN commit r1604.
2005-01-01 12:06:17 +00:00
1c2acfed8c CInput textcolor
This was SVN commit r1602.
2004-12-31 12:20:22 +00:00
e533f5c7fc Executable version of archive-builder
This was SVN commit r1600.
2004-12-30 18:08:09 +00:00
e72addb945 Editor: Finished collapsible toolbar at the top. Next task: menu bar.
This was SVN commit r1597.
2004-12-29 21:20:42 +00:00
6ed2914438 Textures fixes for the field.
This was SVN commit r1595.
2004-12-29 17:58:17 +00:00
0de36f5042 diagonal variation requested by Michael
This was SVN commit r1594.
2004-12-29 01:50:48 +00:00
906d208c41 Some textures for fields, probably didn't make their rows this straight... but *shrug* :p
This was SVN commit r1593.
2004-12-29 01:42:04 +00:00
8ebc09b336 More Editor stuff, mainly more work on the toolbar.
This was SVN commit r1591.
2004-12-28 22:16:32 +00:00
58909b727a Hopefully removing the deleted files
This was SVN commit r1589.
2004-12-28 18:14:01 +00:00
c97077f971 Itsy bitsy Editor adjustments.
This was SVN commit r1586.
2004-12-28 12:55:49 +00:00
f4fe8c8543 Sky colour, plus skycolor config value
This was SVN commit r1583.
2004-12-28 11:16:05 +00:00
7c390625c9 This was SVN commit r1582. 2004-12-28 03:53:52 +00:00
7ce95fdaa4 Modest additions to the in-game editor GUI layout.
This was SVN commit r1581.
2004-12-28 01:58:28 +00:00
05c4ec0365 Alterations to ScEd, so that it almost works (except for saving/loading maps). Change the bottom of premake.lua if you want to build it.
This was SVN commit r1580.
2004-12-27 23:27:26 +00:00
169154c043 mesh for philip's snowman
This was SVN commit r1578.
2004-12-24 03:56:20 +00:00
d58eff26c1 texture for snowman
This was SVN commit r1577.
2004-12-24 03:55:34 +00:00
5d90c70c8b actor for snowman
This was SVN commit r1576.
2004-12-24 03:55:04 +00:00
579cb98383 The actor files needed for the santa hat
This was SVN commit r1575.
2004-12-24 00:50:23 +00:00
6a6be33794 Santa needs a hat, so says Michael and Bobbo, so here is the mesh
This was SVN commit r1574.
2004-12-24 00:42:59 +00:00
66041bb56d name fix
This was SVN commit r1573.
2004-12-23 23:55:24 +00:00
26b439d589 Santa head
This was SVN commit r1572.
2004-12-23 23:54:56 +00:00
6e53868d01 Santa actors
This was SVN commit r1571.
2004-12-23 23:54:17 +00:00
d2ff0b242d Hmm, error, trying again
This was SVN commit r1570.
2004-12-23 23:49:06 +00:00
c52d74afca Male dress with puffy sleaves texture
This was SVN commit r1569.
2004-12-23 23:47:21 +00:00
103f016a23 Santa head texture
This was SVN commit r1568.
2004-12-23 23:46:15 +00:00
e192822bf2 santa texture
This was SVN commit r1567.
2004-12-23 23:45:42 +00:00