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
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
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
6ed9263ee1
Added 'var' to JS variable declarations. Fixes a fatal crash when code that alters the variable 'GUIObject' dies rather than returning successfully, since 'GUIObject' is a class name.
...
This was SVN commit r1564.
2004-12-23 22:13:59 +00:00
c21bfde045
Clipped empty space from the new textures after hearing from Philip that they don't have to be of equal height and width. :)
...
This was SVN commit r1563.
2004-12-23 21:39:40 +00:00
1c89ab78f0
Packing it in for tonight.
...
This was SVN commit r1562.
2004-12-23 21:21:02 +00:00
9dc183c9a5
This was SVN commit r1561.
2004-12-23 18:54:36 +00:00
3801b4b52f
Established Editor framework (theoretically).
...
This was SVN commit r1560.
2004-12-23 18:43:43 +00:00
4dfdefa4d6
Whoops missed a few greek houses
...
This was SVN commit r1559.
2004-12-23 18:12:50 +00:00
76e0fc0ee6
Note to self: Deleting and then adding the same filename doesn't work in the same session, even if it's a more recent version. :)
...
This was SVN commit r1558.
2004-12-23 18:04:14 +00:00
5ac6555b9b
Added sprites that will potentially be used for the Editor when I get around to it.
...
This was SVN commit r1557.
2004-12-23 18:01:55 +00:00
3ab194ae42
Melee range adjustment that Jason requested.
...
This was SVN commit r1556.
2004-12-23 17:51:39 +00:00
47842863c4
Initial IP Hosting and map selection screens from Malte. Committed on his behalf as he's having problems with his authorisation.
...
This was SVN commit r1555.
2004-12-23 17:22:22 +00:00
0382cdd9b1
More tooltip updates. Made the main menu buttons and the in-game resource counters use them.
...
Fixed space/tab inconsistencies in (though not between) GUI XML files.
This was SVN commit r1554.
2004-12-23 13:56:34 +00:00
c16d5ec50c
Update for the default map for the new structure placeholders
...
This was SVN commit r1553.
2004-12-23 04:53:53 +00:00
264587cff9
Hopefully the last actor name fixes for today
...
This was SVN commit r1552.
2004-12-23 04:12:27 +00:00
cbb08dfb47
Internal name adjustments for the hellenes entities
...
This was SVN commit r1551.
2004-12-23 04:09:28 +00:00
1f3fe479e3
Few actor spelling fixes
...
This was SVN commit r1550.
2004-12-23 01:30:03 +00:00
71d54ad31e
Oops, messed up, adding files again
...
This was SVN commit r1549.
2004-12-23 01:10:12 +00:00
bf1468441c
Some internal name corrections
...
This was SVN commit r1548.
2004-12-23 01:07:53 +00:00
011b293f06
structure actor fixes for romans, hellenes, and celts
...
This was SVN commit r1547.
2004-12-23 01:00:21 +00:00
73ba7e1823
Actor files for persian, carthaginian, and iberian structures.
...
This was SVN commit r1546.
2004-12-22 23:14:49 +00:00
de3823141e
structure placeholder textures
...
This was SVN commit r1545.
2004-12-22 23:11:02 +00:00
548a961e1e
Persian structure meshes
...
This was SVN commit r1544.
2004-12-22 23:04:24 +00:00
a38edb3442
Placeholder and Carthaginian structure meshes
...
This was SVN commit r1543.
2004-12-22 22:58:27 +00:00
16e5b8f94b
Quickly added an Editor button.
...
This was SVN commit r1541.
2004-12-21 17:54:33 +00:00
659a9ea57a
Initial (incomplete) tooltip code
...
This was SVN commit r1540.
2004-12-21 13:37:24 +00:00
6486de894d
Eliminated grayscale images.
...
This was SVN commit r1539.
2004-12-20 19:33:09 +00:00
849f50a500
Grayscale effects for GUI sprites
...
This was SVN commit r1536.
2004-12-19 12:20:04 +00:00
76c67f029d
Made loading screen appear, now that Simon's fix has enabled the scheduler before the session. This one is just static ... We'd need to break loadSession() up into fragments and call each in turn in order to have a loading bar, as far as I can tell. (Also, any way to disable the cursor&input from JS?)
...
This was SVN commit r1535.
2004-12-19 10:53:40 +00:00
eb033b8192
Added lit version of the main-menu backdrop, so we can split that up for the individual menu button overlays.
...
This was SVN commit r1533.
2004-12-19 00:05:10 +00:00
92e7394c7b
Eradicated lit sprites thanks to sprite effects from Philip. :D
...
This was SVN commit r1530.
2004-12-18 18:48:37 +00:00
99a022f847
Even more GUI cleanup.
...
This was SVN commit r1529.
2004-12-18 17:05:22 +00:00
7cfa5f6e4d
More GUI texture cleanup. :)
...
This was SVN commit r1528.
2004-12-18 16:27:32 +00:00
ba0ebd6644
Renamed icon-size/icon-id to cell-size/cell-id, and allowed cell-id to be used in <icon>s.
...
Added <effect>s to sprites/images - currently multiply-color and
add-color, though they're far from perfect.
This was SVN commit r1525.
2004-12-18 13:32:00 +00:00
323ca1746f
Big GUI update to kinda-sorta-maybe put lots of previously individual GUI art into cellular sheets. Still needs some work.
...
This was SVN commit r1523.
2004-12-18 02:42:22 +00:00
cd35701f70
Updated GUI/entities to use Philip's spiffy new icon sheets. :)
...
This was SVN commit r1520.
2004-12-17 17:22:27 +00:00
6526301cfe
GUI icon-sheets
...
This was SVN commit r1519.
2004-12-17 16:20:08 +00:00
0f7f23d774
Oops, forgot to commit some new fonts. :)
...
This was SVN commit r1517.
2004-12-16 23:29:31 +00:00
4815f76c5f
Various GUI fixes to get the scripts in line with Mark's revised data types (much appreciated!).
...
This was SVN commit r1516.
2004-12-16 19:21:05 +00:00
07ebaf86c5
Quick fix for icons that weren't being refreshed (a couple remain, but I think those are due to a temporary datatype mismatch).
...
This was SVN commit r1509.
2004-12-15 22:32:59 +00:00
7346e39cc4
Revised Status Pane icons so they're split into separate components, which seems to make them display properly (nested commands like [icon=] apparently don't interpret correctly if appending to one of their strings).
...
This was SVN commit r1508.
2004-12-15 21:59:17 +00:00
cb5759c737
Fixed minor icon glitch. Recompiled. (Quick commit before I try something more drastic.)
...
This was SVN commit r1506.
2004-12-15 19:20:29 +00:00
7d76ef980a
Fixed GUI error from yesterday. Still can't figure out why it's fixed, but hey, it works. All yours now, Malte. (y)
...
This was SVN commit r1499.
2004-12-14 17:23:10 +00:00
b04b3447c8
For reasons I cannot fathom at this late hour, a section of objects in 2_mainmenu.xml causes the coordinates of the session GUI to be screwed up. After a couple of hours of lack of success, commented it out so it'll work until tomorrow. Gotta get some sleep before work.
...
This was SVN commit r1498.
2004-12-13 23:15:11 +00:00
94ee723981
Added icon I missed.
...
This was SVN commit r1497.
2004-12-13 22:11:20 +00:00
01443e4785
Fixed 0 A.D.-style windows from yesterday to use sprite collages. Made another one as background to future hosting screen.
...
This was SVN commit r1496.
2004-12-13 21:37:30 +00:00
6194fdb400
Added MP button (though it needs artistic intervention (ie Malte) to do the white highlights and get it positioned just right).
...
This was SVN commit r1495.
2004-12-13 19:14:37 +00:00
114f3f1513
Finished off first draft of in-game menu (ie made it actually do something useful). Hit F10 or click corner Map Orb buttons at random until you find it, as I'm too tired to mock up a replacement button image. ;)
...
This was SVN commit r1493.
2004-12-13 01:14:31 +00:00
24abb51b59
First crack at loading screen (though need to figure out a way to move session loading to next frame to get it to actually stay on the screen). Some preliminary work on sub-windows.
...
This was SVN commit r1489.
2004-12-12 19:34:38 +00:00
01c35dd616
Added some more placeholder portraits.
...
This was SVN commit r1476.
2004-12-08 17:00:43 +00:00
9302d3c668
Uploaded some placeholder icons, recompilation, removed redundant version of ScEd.
...
This was SVN commit r1471.
2004-12-07 18:35:11 +00:00
9b0ce13f8f
Fixing some transparency issues
...
This was SVN commit r1470.
2004-12-07 05:29:40 +00:00
c5dc84223e
A few actor fixes
...
This was SVN commit r1469.
2004-12-07 05:28:20 +00:00
7e7743a90d
Implemented population of command buttons.
...
This was SVN commit r1461.
2004-12-06 00:54:06 +00:00
0d270c968c
More GUI stuff, primarily to start implementing entity lists.
...
This was SVN commit r1451.
2004-12-05 03:37:01 +00:00
944397c4cf
(Trying again, as it timed out last time I tried this.) Added various entity attributes, and struggled to get them to appear in GUI (seem to be issues with numeric interpretation and icons sometimes don't appear), but it's a start. Also made start on training
...
This was SVN commit r1450.
2004-12-04 21:38:52 +00:00
0c0d20d3eb
Marginally improved game performance by reducing session GUI updates (now waits over a second before updating the controls, but at least the frame rate is better). Also turned off GUI refresh when in full-screen mode (Alt+G).
...
This was SVN commit r1448.
2004-12-02 23:38:51 +00:00
8d087f55f6
Missing mesh files
...
This was SVN commit r1442.
2004-12-02 10:16:30 +00:00
00d39d9a9d
Missing actor files
...
This was SVN commit r1441.
2004-12-02 10:13:53 +00:00
b1534dfd7b
Missing actor files
...
This was SVN commit r1440.
2004-12-02 10:13:48 +00:00
f7b7760e68
Missing actor files
...
This was SVN commit r1439.
2004-12-02 10:12:05 +00:00
3d82cd7fb8
Missing actor files
...
This was SVN commit r1438.
2004-12-02 10:10:37 +00:00
e459e93ab4
Combat fixes ... Increased standard entity movement rate, and made pain sounds only occur on death.
...
This was SVN commit r1423.
2004-11-28 21:31:39 +00:00
a2bcfd8a47
Minor GUI fixes.
...
This was SVN commit r1422.
2004-11-28 21:11:37 +00:00
ec62c14ca4
Created entities for all Hellenic buildings created so far.
...
This was SVN commit r1421.
2004-11-28 20:11:02 +00:00
ee669ca572
More of the same.
...
This was SVN commit r1420.
2004-11-28 19:10:26 +00:00
dcb00048e0
Added support for unit icon sheets.
...
This was SVN commit r1419.
2004-11-28 19:09:40 +00:00
3f78a37325
Added support for building icon sheets.
...
This was SVN commit r1418.
2004-11-28 19:07:26 +00:00
2ad47d5758
Added civ icon sheets.
...
This was SVN commit r1417.
2004-11-28 19:05:31 +00:00