9e74e3a077
# Atlas updates: better unit ownership control; fixed bottom-bar display; fixed iterator problem in undo; renamed 'd' to 'msg' for consistency
...
This was SVN commit r3836.
2006-05-04 02:44:03 +00:00
a7594bb39c
# GCC compatibility
...
This was SVN commit r3828.
2006-04-28 04:53:23 +00:00
235e19c58f
# Atlas: Updated Atlas DLL with fixed manifest. Double-click resizable panels to reset to default size. Moved player selection into extremely ugly drop-down list. Fixed culling when changing visible window's aspect ratio. Added manifest to VS2003 builds, to enable XP themes.
...
This was SVN commit r3814.
2006-04-25 05:10:47 +00:00
f791a61c46
# Fixed SxS CRT usage.
...
Also added wx's .rc file to Atlas.
This was SVN commit r3812.
2006-04-24 18:01:01 +00:00
3d26549032
Fixed file properties - removed svn:executable and svn:keywords (left over from CVS conversion?) from all files; set svn:eol-style=native for *.cpp, *.h (and fixed files with inconsistent line endings)
...
This was SVN commit r3802.
2006-04-23 23:14:18 +00:00
d9b033c85f
# Enabled some interoperability between different compiler versions for the game and the editor DLL
...
This was SVN commit r3790.
2006-04-21 03:53:10 +00:00
c81df59294
# Include headers for compilation without PCH
...
This was SVN commit r3774.
2006-04-19 05:30:02 +00:00
d158ed9dc9
Terrain overlay: Fixed incorrect state change
...
Other: Trivially tidied profile text. Removed VC2005 deprecation
avoidance, since wx 2.6.3 does that anyway.
This was SVN commit r3773.
2006-04-19 00:56:24 +00:00
8a11f53011
# More consistent terrain-space coordinate names
...
# Removed more ancient unused code
# Partial VC2005 compatibility for Atlas editor / AoE3Ed
# Terrain overlay rendering system; used to implemented Atlas brush
display
# Renamed 'right' to 'left'
This was SVN commit r3771.
2006-04-17 20:02:51 +00:00
001e951066
Autobuilder: Notify autologger of commits.
...
Interact.cpp: Added category to LOG calls.
Atlas: Renamed all handler source files, so they won't conflict with
other files of the same name. (Fixes bug #77 )
This was SVN commit r3721.
2006-04-03 21:08:58 +00:00
f45c44ca09
Rotated various things (terrain texture UVs, default light and camera angles) by 45 degrees.
...
Map XML: Store camera position. Stopped using DTDs (because they make it
too hard to change the XML structure without breaking all the old XML
files).
Game.h: Include fewer files, to make compilation sometimes faster.
World: Changed some things to not be singletons, since they were
(ab)used as CWorld members.
This was SVN commit r3670.
2006-03-21 20:55:45 +00:00
ccc8055226
Fail more nicely with invalid actors
...
This was SVN commit r3669.
2006-03-19 22:37:56 +00:00
d3f57744d9
Refactored actor variation system, and added support for entity-level selections (controlled by the current animation).
...
Avoided tooltip error message.
Avoided noisy warnings when textures fail to load.
This was SVN commit r3653.
2006-03-17 03:59:49 +00:00
ed38414b41
Texture converter, DevIL: ABGR DDS support.
...
Textures: converted ARGB to ABGR.
Misc: warning fixes, etc.
This was SVN commit r3631.
2006-03-14 21:29:19 +00:00
cff5dfae07
Preliminary version of player selection for Atlas. You can press any key 0-8 while the place object tool is active to place an object for that player, though the preview object will always be shown in white (Gaia) until I can figure out how to cleanly update its colour.
...
This was SVN commit r3444.
2006-01-29 23:38:19 +00:00
5ac92a3302
Advance water in sync with simulation and unit animations (so it stops when the game is paused).
...
Other miscellaneous tidyings.
This was SVN commit r3386.
2006-01-21 23:27:42 +00:00
acbd00188e
Explicit cast to CStr() to fix Linux build.
...
This was SVN commit r3282.
2005-12-23 01:24:07 +00:00
ed7c2fe3d6
Atlas: Allow placement of actors.
...
This was SVN commit r3275.
2005-12-22 04:20:16 +00:00
3ea5fa5b46
Lots of fixes for the Linux build:
...
- renamed sysdep/unix/ functions where necessary
- more int -> LibError conversions in the sysdep/unix/ part
- added some explicit #include statements where necessary
- moved enum LibError/ErrorReaction declarations
(gcc doesn't support forward enum declarations)
This was SVN commit r3267.
2005-12-17 22:00:54 +00:00
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
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
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
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
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
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
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
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
5c4d41fd0f
Initial parts of Atlas integration
...
This was SVN commit r2435.
2005-06-25 02:21:26 +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
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
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
780b6e266b
Changed actor colour syntax. Made the Actor Editor edit colours.
...
This was SVN commit r2189.
2005-04-28 20:44: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
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
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
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