2eac4af3a4
Added unit IDs, so Atlas can store references to units without just using pointers and without crashing.
...
This was SVN commit r3214.
2005-12-09 03:15:00 +00:00
bd2c1d73a3
Terrain, Interact, LOSManager, Atlas, etc: Fixed some off-by-one and off-by-FLT_EPSILON problems with objects near/off the edge of the map. Also changed some model.GetBounds().GetCentre() into model.GetTransform().GetTranslation() to fix off-by-centre-of-bounds-minus-position problems. Thus, you can no longer make units in Atlas disappear off the edge and never be seen or selected again. Also changed out-of-bounds LOS value to make them visible if they somehow escape anyway. Also fixed out-of-bounds access of terrain heightmap.
...
MapReader: Tidied usage of Xeromyces.
Projectile: Avoided warnings.
This was SVN commit r3212.
2005-12-09 01:08:08 +00:00
12b8dd2d9b
Fixed warning when exiting from non-Atlas game
...
This was SVN commit r3211.
2005-12-08 20:25:17 +00:00
895d717c06
This was SVN commit r3208.
2005-12-08 03:33:14 +00:00
5250814397
Atlas: Fixed entities-don't-move-when-terrain-is-altered. Unbroke and fixed entity memory management. Added flatten tool. Added object movement/rotation/deletion tool - but not yet finished, since 'redo' usually crashes (for known reasons).
...
This was SVN commit r3207.
2005-12-08 02:50:55 +00:00
9b1da42678
Atlas: Better toolbar.
...
This was SVN commit r3192.
2005-12-05 20:17:10 +00:00
036a8d3246
Atlas: Toolbar.
...
This was SVN commit r3190.
2005-12-03 06:35:31 +00:00
547293ee49
Atlas: Vaguely usable object placement code. Bug fixes.
...
This was SVN commit r3186.
2005-12-02 21:08:10 +00:00
0a252de08c
Atlas: Incomplete object (entity+actor) placement code. +/- keys for zooming.
...
This was SVN commit r3184.
2005-12-02 07:37:57 +00:00
9be309d4c7
editordata: use tex_load to load the heightmap - don't need the ogl_tex functionality and this avoids the POT check (which would fail)
...
ogl_tex: remove POT-check-avoidance hack
This was SVN commit r3166.
2005-11-20 14:35:52 +00:00
41ae0f9a44
Various hacks to make ScEd work. Should be removed once ScEd is no longer needed.
...
This was SVN commit r3162.
2005-11-20 00:41:45 +00:00
0491a7980d
ScEd: add mathutil header (seems to be required now, no longer included automatically); update to ogl_tex API (they have long been renamed in ps); fix issue with PS_CRect vs CRect
...
ogl_tex: add diagnostic code to track down ScEd crash
This was SVN commit r3159.
2005-11-19 22:27:53 +00:00
124f7171bd
More reliable texture blending. Resource unloading. Minor fixes.
...
This was SVN commit r3106.
2005-11-06 05:05:07 +00:00
6668ad6e1c
CTerrain, Brushes: made CalcFromPosition static and added float x,y overload
...
minimap, PatchRData, renderer: fix ELOSState comparison vs & and use
SAFE_DELETE
ia32: add rounding control constants (for FISTP)
premake: set /QIfist compiler setting which causes float->int casts to
go through FISTP instruction instead of _ftol2() (much faster, but
requires CPU state to have been set)
LOSManager.cpp: cache m_TilesPerSize; use MIN/MAX; use
CTerrain::CalcFromPosition; clean up GetUnitState a bit. now runs at
203ns, down from 222
This was SVN commit r3099.
2005-11-06 01:33:16 +00:00
fb115d19b9
Fix compilation with g++
...
This was SVN commit r3094.
2005-11-05 23:03:55 +00:00
faaee7d1b5
Atlas: Terrain painting
...
This was SVN commit r3092.
2005-11-05 04:59:54 +00:00
a679206ca1
Atlas: Use sem_msgwait_np
...
This was SVN commit r3090.
2005-11-04 00:02:43 +00:00
9e2ec6aa3e
Wide to Multi-byte conversion needs some hinting.
...
This was SVN commit r3089.
2005-11-03 22:51:14 +00:00
5f5d19cac4
Compile fixes and cleanup
...
This was SVN commit r3088.
2005-11-03 22:21:44 +00:00
7bfe647366
Atlas: Initial terrain-selection panel.
...
TextureManager: Skip *.jbf too.
This was SVN commit r3085.
2005-11-03 03:49:57 +00:00
7078279ca2
Atlas: Altered some terminology (command vs message etc). Allowed information to pass from engine to UI.
...
This was SVN commit r3067.
2005-10-31 03:36:50 +00:00
f2b88d7792
GameSetup: "-autostart=mapname" command-line parameter, for faster testing.
...
Misc: Don't catch(...)
Atlas: Removed old project files; adjusted include paths.
This was SVN commit r3062.
2005-10-30 21:30:52 +00:00
20d038efda
profiling indicates memcpy is a bottleneck, so globally replace all of them with memcpy2 (hand-optimized). depending on transfer size, this is 10%..300% faster. also made memcpy2 into a macro instead of thunk function because vc7 was still generating a jump.
...
This was SVN commit r3057.
2005-10-30 16:19:20 +00:00
252bd478c4
Fix wgl extension function pointers (I hope). Thanks for pointing it out, Philipp.
...
This was SVN commit r3055.
2005-10-30 01:51:16 +00:00
bbda296289
TerrainProperties: Use CTerrainPropertiesPtr (boost::shared_ptr) instead of CTerrainProperties*, to fix (slightly inelegantly) memory leaks.
...
Renderer: Initialise pointers when HW lighting is unavailable.
Atlas: Avoid strange VS2005 iterator complaint.
This was SVN commit r3036.
2005-10-28 01:43:16 +00:00
178ad741b9
DevIL: Improved quality of DXT5 alpha compression.
...
textureconv: Made -(no)mipmaps work. Defaulted to DXT5 for alpha
textures (since DXT3 almost never seems any good). Recompiled with new
DevIL code.
GUIRenderer: Removed complaints about 0-sized objects (e.g. hitpoint
bars).
Atlas: Added forgotten files.
This was SVN commit r3006.
2005-10-24 23:45:52 +00:00
52a8793450
Atlas: Bits of tool-related code.
...
Game: Large screenshots (with ctrl+alt+F2).
This was SVN commit r2994.
2005-10-24 01:53:03 +00:00
26d2fc71ad
loaders: increase timeout interval (less time wasted in main loop during loading)
...
vfs: move public functions into vfs.cpp to avoid confusion (except
vfs_mount in vfs_mount.cpp, but that's obvious)
h_mgr: fix bug in filename display causing dir names to be truncated
main/gamesetup: replace 2 bools with flags; remove Atlas trampoline
functions (clutters up main.cpp)
atlas: use GameSetup.h instead of extern ..
This was SVN commit r2983.
2005-10-21 18:01:21 +00:00
f2b662d12d
Build: generate Atlas project files (with "update-workspaces --atlas") (for VS2003 only).
...
Premake: allow slight separation of files' locations on disk vs in the
project tree.
Atlas: require fewer include directories.
This was SVN commit r2956.
2005-10-17 01:11:12 +00:00
faa6a78304
Added LOS setting to GameAttributes. Also fixed a small bug with LOS rendering (the patch's render data wasn't updated for LOS until the second frame after it became visible, displaying it in black for 1 frame).
...
This was SVN commit r2887.
2005-10-10 03:35:32 +00:00
aa1348b6a8
Atlas: Disable LOS when editing. Set up initial terrain data before starting CGame (since initialisation of LOS (and probably other things in the future) wants to know about the terrain).
...
World: Deallocate LOSManager.
This was SVN commit r2877.
2005-10-09 04:29:58 +00:00
7ebdefec4b
Atlas: improved brushes
...
This was SVN commit r2875.
2005-10-09 03:26:16 +00:00
8bc8bcb740
Atlas: more flexible brushes
...
This was SVN commit r2868.
2005-10-08 03:55:21 +00:00
29d6f420fd
GameView: removed unused ancient camera code.
...
Terrain: nicer handling of negative map coordinates (mainly for Atlas
brush previews that fall over the edge).
Misc: reverted seconds->microseconds.
This was SVN commit r2866.
2005-10-07 21:09:29 +00:00
04650efe7a
Lots of gcc -Wall fixes. The common ones:
...
- switch() statements don't handle all values in an enum
- missing \n at end of file
- non-virtual destructors in classes containing virtual functions
- order of initializers in constructor initializer lists
... some other stuff (signedness, nested comments, unused variables) as
well.
This was SVN commit r2864.
2005-10-07 15:24:29 +00:00
721f6e4a1e
Atlas: [very] primitive brushes
...
This was SVN commit r2843.
2005-10-04 02:50:59 +00:00
ffd8630c45
Updated autobuilder to get the .pdb files from 'system'.
...
Deleted ps_test, since it isn't updated by the autobuilder and will be
out of date.
Removed console history file, since it doesn't need to be
version-controlled.
This was SVN commit r2823.
2005-10-01 04:26:12 +00:00
19b66bf0ff
Use BOOST_PP_CAT to delay token pasting until arguments are fully evaluated.
...
Fixes compile error on g++-3.3
This was SVN commit r2819.
2005-09-30 15:16:03 +00:00
2790981eae
CVSROOT: doesn't seem particularly useful now
...
ObjectBase: removed support for old actor format
Various: reduced sometimes-unnecessary header inclusions
Atlas: slightly nicer tool and message systems
This was SVN commit r2816.
2005-09-30 00:59:42 +00:00
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
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
