1
0
forked from 0ad/0ad
Commit Graph

1224 Commits

Author SHA1 Message Date
467b14e928 - Added stay-in-tile-class and border-tile-class constraints.
- Made objects snap to terrain (the game does this automatically for
entities but it was a problem with actors)
- Small enhancements to the RMS API
- New version of cantabrian_highlands

This was SVN commit r2688.
2005-09-08 01:20:51 +00:00
4cc30aeb56 This was SVN commit r2684. 2005-09-07 02:24:13 +00:00
b071585610 Added tile class and "avoid at distance" support to RMGen.
This was SVN commit r2659.
2005-09-03 21:53:07 +00:00
43fda176cc This was SVN commit r2631. 2005-08-22 03:27:15 +00:00
e46136fe96 This was SVN commit r2630. 2005-08-22 03:26:40 +00:00
1039e9f2a2 Atlas: Removed compile-time linking
This was SVN commit r2629.
2005-08-20 18:05:25 +00:00
ccb813119e Atlas: Slightly better undo system (with merging of 'continuous' commands)
This was SVN commit r2628.
2005-08-20 17:37:48 +00:00
5d62c3f3f7 Atlas: Simple undo system
This was SVN commit r2627.
2005-08-20 15:44:50 +00:00
b4ad393ee4 moved ps/X* to ps/XML/
premake: reflect 2 added and 1 removed source dir
add ps/Util - some helpful functions that were previously in main.cpp

This was SVN commit r2624.
2005-08-14 23:50:37 +00:00
a0e7d02cdd Fixed and rebuilt ScEd. Updated tex to handle greyscale PNGs.
This was SVN commit r2610.
2005-08-13 17:14:57 +00:00
630b375f4d ScEd updated for new terrain stuff, window styles for pyrogenesis in windowed mode changed to give a bordered movable window.
This was SVN commit r2583.
2005-08-08 03:59:50 +00:00
dan
df536edb67 This was SVN commit r2569. 2005-07-30 21:21:36 +00:00
5b1d7b8c4b This was SVN commit r2568. 2005-07-30 21:07:02 +00:00
5cd416d82f This was SVN commit r2567. 2005-07-30 20:57:18 +00:00
af3a188200 This was SVN commit r2564. 2005-07-30 19:22:16 +00:00
661114e7a1 This was SVN commit r2540. 2005-07-25 01:31:19 +00:00
61387e95b2 This was SVN commit r2519. 2005-07-23 07:53:21 +00:00
549150fe38 Atlas: simple camera control and terrain editing.
Terrain: added terrain-editing code to CTerrain, for better
encapsulation or something.
Console: simplified screen resizing.
Game/etc: removed some unnecessary header file inclusions.

This was SVN commit r2459.
2005-07-03 16:25:48 +00:00
cf37e9cbe6 Atlas: Added a button. Reorganised game<->UI communication system.
main.cpp: Allowed correct operation when not calling Init/Shutdown.
Game.cpp: Stopped complaint when starting game with no GUI.

This was SVN commit r2446.
2005-06-27 23:04:34 +00:00
9007d77030 ScEd/lib compatibility - USE_WINMAIN (since it uses WinMain instead of main) and NO_MAIN_REDIRECT (so it can use MFC's WinMain)
This was SVN commit r2442.
2005-06-26 17:12:48 +00:00
a50b118c6c Added SmoothElevationPainter.
This was SVN commit r2441.
2005-06-26 10:28:39 +00:00
5c4d41fd0f Initial parts of Atlas integration
This was SVN commit r2435.
2005-06-25 02:21:26 +00:00
dan
816293ff36 Added iniFromScenario code through a new constructor in Map::
Initial test, doesn't load the .xml yet,

This was SVN commit r2433.
2005-06-24 04:46:13 +00:00
d4617cbd3e Minor warning-fixes and miscellaneous tidiness
This was SVN commit r2416.
2005-06-20 22:04:08 +00:00
32772dbf71 So, ScEd updated to comply with terrain XML's (and it seems to work fine too!)
This was SVN commit r2414.
2005-06-20 17:34:17 +00:00
470d87c489 Added simple elevation painter as well as array syntax for AndConstraint, RandomTerrain and the new MultiPainter.
This was SVN commit r2407.
2005-06-20 03:18:51 +00:00
2bfad45723 Added initFromScenario function for Dan to work on.
This was SVN commit r2405.
2005-06-20 02:45:11 +00:00
06b3e512d7 Modified the way objects are converted from JS to C++ to make it easier to use.
This was SVN commit r2404.
2005-06-19 22:43:07 +00:00
e3d8dd1b82 Colour Tester: added display of DXT version and image size
This was SVN commit r2401.
2005-06-18 00:56:50 +00:00
92d221f183 Interact.cpp: Use double instead of float for storing absolute times (since the precision is required).
Atlas: Nicer handling of menus.

This was SVN commit r2400.
2005-06-17 23:14:06 +00:00
e43892634b Trying once more to rename this stuff correctly...
This was SVN commit r2389.
2005-06-14 20:46:45 +00:00
79b92f8a16 Renaming new PMDExp
This was SVN commit r2388.
2005-06-14 20:42:41 +00:00
982bcf268d Deleting old PMDExp...
This was SVN commit r2387.
2005-06-14 20:39:51 +00:00
5d72244c0c Minor changes to the new PMDExp code, to make it compile successfully. Removed redundant files.
This was SVN commit r2386.
2005-06-14 20:33:50 +00:00
64e2234e81 Latest version of pmdexp provided by Rich (though he's not sure if it's in a compileable state or not).
This was SVN commit r2381.
2005-06-09 22:43:04 +00:00
08ef5c2b68 Redesigned part of RMS (removed "CenteredPlacer" concept, made createMulti a JavaScript library function).
This was SVN commit r2379.
2005-06-07 07:21:55 +00:00
bd53b14f58 More work on RMS:
- Created binaries/data/mods/official/maps/random folder to store maps
and also moved rmlibrary.js to maps (though perhaps it should be
somewhere in system?).
- RM generator now uses "logical terrains" that can have units attached
to them in addition to textures, for things like forests.
- Added basic clump placer, avoid constraints, layered painter, and
random terrains (each tile is chosen between several options).
- Misc. infrastructure changes.

This was SVN commit r2378.
2005-06-06 07:46:28 +00:00
4c16658a09 Updated autobuilder to maybe work.
This was SVN commit r2369.
2005-06-02 18:13:38 +00:00
e583af307f Updated autobuilder to update ps.pdb.
Animation files with filename="" are now ignored.

This was SVN commit r2368.
2005-06-02 18:04:20 +00:00
b657a1cbca Added CStr and some other things to precompiled.h, to reduce build times.
Altered CStr/UniDoubler's macros, to avoid polluting/conflicting/etc.
Fixed headers in non-PCH builds.
Used the _d version of vorbisfile*.lib in Debug builds.

This was SVN commit r2366.
2005-06-01 20:12:45 +00:00
34f599f3d4 Completed the area placement classes (AreaPlacer, AreaPainter and Constraint) and JS equivalents. Now it remains to implement some of the more interesting ones :P.
This was SVN commit r2340.
2005-05-23 03:51:37 +00:00
6c7dfedcbf Repaint ScEd at 2 fps when non-minimised but behind other windows
This was SVN commit r2339.
2005-05-23 03:11:04 +00:00
56343ae9c8 Updated ScEd to no longer repaint when minimized and repaint at only 20 FPS normally. The result is much friendlier on your other applications and on your fan.
This was SVN commit r2338.
2005-05-23 02:52:37 +00:00
aa027d20ec Fixed ScEd again - renamed the network system's CCommand to CNetCommand, since ScEd used that name first :-P
This was SVN commit r2337.
2005-05-23 02:39:07 +00:00
4d8c1014fb Fixed ScEd
This was SVN commit r2336.
2005-05-23 01:55:30 +00:00
409675eb44 Added icons
This was SVN commit r2326.
2005-05-20 03:28:37 +00:00
16853b79a9 Actor Editor: drop-down list of materials; event/load in animations; no grey/white stripes in main actor list.
Colour Tester: supports drag-and-drop of image files onto program
window.

This was SVN commit r2324.
2005-05-19 05:06:28 +00:00
7f3a74f077 Updated the Atlas-based tools build system, to create several .exes and one .dll. And some other minor changes that I'll try to remember later.
This was SVN commit r2323.
2005-05-19 02:46:42 +00:00
600a55b7d7 Boost Random
This was SVN commit r2315.
2005-05-16 15:19:46 +00:00
e41ddc4e77 Added random number functions using Boost as well as a "library.js" file in which the high-level API can be implemented in JS.
This was SVN commit r2313.
2005-05-16 07:30:39 +00:00
08ada296f8 Replaced tabs with 4 spaces each to be consisent.
This was SVN commit r2301.
2005-05-13 00:54:10 +00:00
b772559fbe Added get/setTerrain and get/setHeight functions to the RMS API which allow control of each individual tile, and base height argument to init().
This was SVN commit r2300.
2005-05-13 00:39:13 +00:00
c8dc599ab8 Un-hardcoded the rmgen output path since it's not useful when you run it out of binaries/system. You should now type
rmgen script.js ../../binaries/data/mods/official/maps/scenarios/map

This was SVN commit r2297.
2005-05-12 21:17:32 +00:00
2063404672 Removed #pragma once's and .ncb file for rmgen, and added binaries/system/rmgen.exe to version control.Made rmgen use js32d.lib instead of js32.lib.
This was SVN commit r2296.
2005-05-12 21:02:55 +00:00
bad202f4d0 Removed #pragma once's and .ncb file for rmgen, and added binaries/system/rmgen.exe to version control.
This was SVN commit r2295.
2005-05-12 20:59:22 +00:00
304037164b Initial stub of RM Generator. This will gradually get updated with the algorithms from the ASCII generator.
This was SVN commit r2293.
2005-05-12 05:16:59 +00:00
a75bf7fb1e Updates to texture converter and DDS code: Generates sharpened mipmaps. DDS decompression now identical to NVIDIA PS plugin (and probably most hardware). Compression lossless when possible (e.g. always for DDS->TGA->DDS), and slightly improved in other cases.
This was SVN commit r2291.
2005-05-12 03:55:39 +00:00
73ecee0c60 Fixed colour calculation. Stopped displaying .svn directories.
This was SVN commit r2199.
2005-04-29 21:19:47 +00:00
6dc15e1d06 Customisable colour settings.
This was SVN commit r2198.
2005-04-29 20:36:30 +00:00
c002228314 Initial code for the Colour Tester tool.
This was SVN commit r2196.
2005-04-29 18:46:48 +00:00
0fc17f7305 Uninteresting things that I've had hanging around for a while.
This was SVN commit r2190.
2005-04-28 20:50:19 +00:00
780b6e266b Changed actor colour syntax. Made the Actor Editor edit colours.
This was SVN commit r2189.
2005-04-28 20:44:22 +00:00
58f0ce296e Wondering whether automated builds work again...
This was SVN commit r2154.
2005-04-20 19:54:29 +00:00
b3cd340eec Updated binaries, and ScEd.
This was SVN commit r2129.
2005-04-13 05:08:45 +00:00
6a0b5fa0ab ScEd: Added unit deletion. Made zoom less frustrating. Let >2 players work.
Fixed random actor props.

This was SVN commit r2109.
2005-04-03 05:02:00 +00:00
31fb8c37c4 Entity XML inheritance graph generator. (Basically just Graphviz.)
This was SVN commit r2091.
2005-03-30 18:03:47 +00:00
8b12c84df7 ScEd: allowed creation of non-entity objects, pending total entitisation
This was SVN commit r2085.
2005-03-30 05:43:22 +00:00
b07d9954e0 Actor Editor: Copy-and-paste. Folder memory. Entity creation. Fixed importing.
This was SVN commit r2084.
2005-03-30 10:37:44 +00:00
22dd4dd67b Entities: Removed Tag attribute; it is taken from the filename instead. Made entity XML files be loaded on demand. Probably stopped crash when maps contain non-existent entities. Fixed a few bugs in entity definitions.
Maps: Stored non-entity objects in XML instead of PMP, for easier manual
editing. Updated existing maps to newest format, so that they can still
work. Added undocumented _rewriteMaps() JS function. Also renamed _mem
to vmem, and reclassified its undocumentedness as unintentional, since
it's reasonably useful.
Loader: added NonprogressiveLoad function, for ScEd/_rewriteMaps/etc
which don't care about progressiveness.
main.cpp: re-enabled vfs_display, since it doesn't crash now
Vector3D: stopped warning

This was SVN commit r2078.
2005-03-29 20:50:04 +00:00
e2c61d1519 Actor Editor: Changed serialisation system for import/export/undo/redo, so that file-opening can be undone/redone correctly.
This was SVN commit r2071.
2005-03-27 23:53:41 +00:00
71705b5aa4 Actor Editor: Most-recently-used files list. 'New' menu item. Shuffled some header inclusions around.
This was SVN commit r2069.
2005-03-27 18:07:01 +00:00
2fb2f80aa0 Actor Editor: Open / save / save as. Confirmation on exit. Allow launch from command line / Explorer.
This was SVN commit r2053.
2005-03-30 10:35:43 +00:00
c11465cfbf Updated actor references to use filenames instead of names, to allow more efficient loading. Added backward-compatible file support to the Actor Editor.
This was SVN commit r2049.
2005-03-25 23:04:36 +00:00
c2b7df72ce Updated ScEd binary. Fixed problem with loading maps.
This was SVN commit r2046.
2005-03-24 20:57:42 +00:00
af7fa2fc6c Actor Editor: File-selection dialogs in appropriate places. (They're not very nice, but they work most of the time)
This was SVN commit r2045.
2005-03-24 19:01:06 +00:00
6dbe768dd9 Actor Editor: Combo-box lists, loaded from XML. Allowed right click to edit cells.
This was SVN commit r2044.
2005-03-24 12:53:48 +00:00
5078dc1f67 Actor Editor: Allowed undo of import, though not quite correctly. Tidied up other undo-related code a little.
This was SVN commit r2042.
2005-03-23 21:14:03 +00:00
020645d583 Hacked up ScEd a bit, to disable its actor editor and to let users place entities (rather than actors) on the map.
This was SVN commit r2039.
2005-03-22 23:31:30 +00:00
5460b8982e Various small fixes and minimal improvements
This was SVN commit r2035.
2005-03-22 13:54:37 +00:00
06d6cd17f5 Actor Editor: pretty colours
This was SVN commit r2026.
2005-03-20 00:46:39 +00:00
d0146135c4 Initial Actor Editor code
This was SVN commit r2025.
2005-03-19 22:29:32 +00:00
c2d8daa135 Updated archive builder a little bit more
This was SVN commit r2002.
2005-03-17 19:17:41 +00:00
1e52b32f6b Updated archive builder, to avoid compressing things which probably don't benefit from it
This was SVN commit r2001.
2005-03-17 17:52:53 +00:00
c2450ac266 Negligibly improved PMDExp's chances of compiling
This was SVN commit r1979.
2005-03-09 18:13:35 +00:00
75ee00792a Removed unnecessary crashlog exception-catching from ScEd, to let non-Debug versions compile
This was SVN commit r1922.
2005-02-11 15:03:10 +00:00
03a6b6e804 Stopped ScEd crashing when loading maps. Avoided crashes from invalid animations. Moved game-specific code out of XMLWriter.
This was SVN commit r1920.
2005-02-11 12:57:19 +00:00
880634b598 Small changes to ScEd, to remove some hacky bits and to make it not crash with player-colours
This was SVN commit r1899.
2005-02-04 23:16:42 +00:00
f093b53459 Fixed problems in texture converter's DDS output, and in the game's DDS input.
This was SVN commit r1862.
2005-01-29 17:18:14 +00:00
10e1ce7511 Texture converter executable (plus some others to launch it with specific settings)
This was SVN commit r1854.
2005-01-28 22:16:50 +00:00
60dbb779eb Texture converter source, plus modified DevIL.
This was SVN commit r1851.
2005-01-28 19:05:33 +00:00
a410c2852c Updated ScEd's handling of players (though in a rather nasty way, since it doesn't actually have a CGame, and so it has no CPlayers, and so there are loads of HACK comments everywhere)
This was SVN commit r1740.
2005-01-18 12:45:56 +00:00
1c044ac229 Primitive entity player-selection in ScEd
This was SVN commit r1727.
2005-01-16 23:09:41 +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
15fcf8f054 Neatened some debug messages. Changed main.cpp so ScEd can use it. Fixed minor inconsistencies and warnings.
This was SVN commit r1708.
2005-01-11 16:58:16 +00:00
a571688b1d Minor auto-builder fix
This was SVN commit r1702.
2005-01-10 22:21:56 +00:00
75c714b8df Made ScEd compile more pleasantly
This was SVN commit r1700.
2005-01-10 22:13:18 +00:00
d56ae48aa1 Made the archive builder guess its location more correctly
This was SVN commit r1674.
2005-01-08 18:32:21 +00:00
dbfc576458 Fixed a bug in the autobuilder that occurs when tools (such as the autobuilder) are updated.
This was SVN commit r1642.
2005-01-05 19:46:31 +00:00
ff34bf40b1 Automated build system code (mainly for backup purposes - it won't work on anyone else's machine without a few bits of reconfiguration)
This was SVN commit r1641.
2005-01-05 19:38:45 +00:00
855e1a7f81 Small ScEd updates
This was SVN commit r1601.
2004-12-30 23:01:09 +00:00
e533f5c7fc Executable version of archive-builder
This was SVN commit r1600.
2004-12-30 18:08:09 +00:00
170c511c58 Mostly complete archive-builder
This was SVN commit r1599.
2004-12-30 17:42:22 +00:00
ed55ad4d82 Put crashlog into ScEd.
This was SVN commit r1590.
2004-12-28 20:53:54 +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
bfd7d10383 Incomplete (but hopefully working) archive builder. And some festive snow: * * *
This was SVN commit r1579.
2004-12-25 15:38:05 +00:00
ec3452679c Restructuring
This was SVN commit r1453.
2004-12-05 17:59:29 +00:00
caf8471132 Testing svk (and fixing tab usage)
This was SVN commit r1404.
2004-11-26 21:34:35 +00:00
2fe43a46fc Other changes to incomplete systems
This was SVN commit r1381.
2004-11-23 18:21:43 +00:00
033666c2de Various ancient changes that were never committed (since they don't quite work yet)
This was SVN commit r1380.
2004-11-23 18:19:27 +00:00
8760a86c13 Unfinished utility for extracting to-be-translated strings from all the game's data files
This was SVN commit r1142.
2004-09-10 13:42:02 +00:00
b359da4095 Altered point size to match Windows. Fixed bug with alignment of bold text.
This was SVN commit r1071.
2004-08-27 20:24:15 +00:00
68aa9a81f3 Removed the single-pixel borders between glyphs; most font textures are now half their former size
This was SVN commit r1045.
2004-08-24 14:58:50 +00:00
bd5690def7 Run-time selection of FreeType DLL, to let the user decide whether to enable glyph hinting
This was SVN commit r960.
2004-08-10 16:01:18 +00:00
982b0ffc25 Run-time selection of FreeType DLL, to let the user decide whether to enable glyph hinting
This was SVN commit r953.
2004-08-10 15:51:06 +00:00
5960ab2599 Slightly nicer font renderer and some other minor changes
This was SVN commit r764.
2004-07-16 15:33:15 +00:00
fcf320caa8 Handle fonts without an 0xFFFD glyph
This was SVN commit r744.
2004-07-13 22:48:17 +00:00
0e664237b6 Finally, a mostly-working font builder on Linux
This was SVN commit r549.
2004-06-19 13:46:11 +00:00
9bc8559c49 Even more Linuxness
This was SVN commit r547.
2004-06-19 12:56:09 +00:00
384c6891a1 Put the whole save/load feature back in
This was SVN commit r545.
2004-06-18 22:52:34 +00:00
033b6e70c2 Sort-of-working Linuxness
This was SVN commit r544.
2004-06-18 22:50:34 +00:00
09a56c1dfc Attempted Linuxness
This was SVN commit r543.
2004-06-18 22:05:58 +00:00
b65d35ea2e Font builder code
This was SVN commit r527.
2004-06-17 19:32:04 +00:00
1eaadd38aa ran everything though mark's newline stomper.
This was SVN commit r322.
2004-05-30 00:46:58 +00:00
notpete
210d77c9b3 Initial revision of 3DS MAX exporter for PMD and PSA files.
This was SVN commit r314.
2004-05-29 21:10:50 +00:00