1
1
forked from 0ad/0ad
Commit Graph

135 Commits

Author SHA1 Message Date
13501cf58b hook up emulate_glCompressedTexImage2D to new tex transform code (which takes care of DDS unpack)
to that end, provide support for "wrapping" existing textures so that
tex_* and ogl_tex* calls may be used.

also have renderer use ogl_tex for its created-on-the-fly composite
alpha texture
also named atlas's thread (for fun+profit during debugging)

This was SVN commit r2754.
2005-09-19 22:48:20 +00:00
e5dea3e5a1 Water source code :|.
This was SVN commit r2746.
2005-09-18 03:47:15 +00:00
3ecdefe973 Atlas: Allow VFS reloading
This was SVN commit r2736.
2005-09-16 06:07:04 +00:00
f0885bde69 Atlas: Simple (and ugly and unreliable) interface to rmgen
This was SVN commit r2735.
2005-09-16 05:29:40 +00:00
599452af85 Atlas: Camera controls.
Elsewhere: Quaternion stuff.

This was SVN commit r2734.
2005-09-15 05:31:49 +00:00
99127e2458 This was SVN commit r2732. 2005-09-15 02:56:24 +00:00
4a7d0e9038 Config: Changed -e to -entgraph (to avoid conflicts with -editor).
Premake: Don't compile Atlas when compiling ScEd, though I can't
remember why.
Atlas: Load existing maps.

This was SVN commit r2720.
2005-09-14 05:37:52 +00:00
093e5c2519 Enanced the Cantabrian Highlands map some more, and added a few more comments and utility functions to rmgen and JS API.
This was SVN commit r2714.
2005-09-13 23:00:56 +00:00
0b72d0f86c Atlas: More portable GL context usage. Smoother and more responsive terrain editing.
This was SVN commit r2705.
2005-09-13 03:57:34 +00:00
a0a01e7a7d Linux/GCC Compat, added some includes, ported inline assembly stuff to gnu syntax (and misc. cleanup in ia32.cpp)
This was SVN commit r2702.
2005-09-12 23:37:52 +00:00
aa118403bb Terrain: CalcFromPosition, to convert world-space to tile-space.
ScEd: Compilation fixes.
Atlas: Screen-space to world-space conversion when editing terrain.
Wireframe option. Minor wxWidgets 2.6.1 fixes. AoE3Ed.

This was SVN commit r2698.
2005-09-12 20:04:26 +00:00
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