gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity
3,097 Commits 1 Branch 39 Tags
008d487d2c1bebb3d08c19bb16417b5677d0f35d
Commit Graph

180 Commits

Author SHA1 Message Date
Matei 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
Ykkrosh 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
prefect acbd00188e Explicit cast to CStr() to fix Linux build. 
This was SVN commit r3282.
 2005-12-23 01:24:07 +00:00
Ykkrosh ed7c2fe3d6 Atlas: Allow placement of actors. 
This was SVN commit r3275.
 2005-12-22 04:20:16 +00:00
prefect 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
Matei bc23379066 Fixes to entity death and event handling, plus some updates to RmGen. 
This was SVN commit r3226.
 2005-12-11 02:09:11 +00:00
Ykkrosh 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
Ykkrosh 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
Ykkrosh 12b8dd2d9b Fixed warning when exiting from non-Atlas game 
This was SVN commit r3211.
 2005-12-08 20:25:17 +00:00
Ykkrosh 895d717c06 This was SVN commit r3208. 2005-12-08 03:33:14 +00:00
Ykkrosh 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
Ykkrosh 9b1da42678 Atlas: Better toolbar. 
This was SVN commit r3192.
 2005-12-05 20:17:10 +00:00
Ykkrosh 036a8d3246 Atlas: Toolbar. 
This was SVN commit r3190.
 2005-12-03 06:35:31 +00:00
Ykkrosh 547293ee49 Atlas: Vaguely usable object placement code. Bug fixes. 
This was SVN commit r3186.
 2005-12-02 21:08:10 +00:00
Ykkrosh 0a252de08c Atlas: Incomplete object (entity+actor) placement code. +/- keys for zooming. 
This was SVN commit r3184.
 2005-12-02 07:37:57 +00:00
janwas 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
Ykkrosh 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
janwas 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
Ykkrosh 124f7171bd More reliable texture blending. Resource unloading. Minor fixes. 
This was SVN commit r3106.
 2005-11-06 05:05:07 +00:00
janwas 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
prefect fb115d19b9 Fix compilation with g++ 
This was SVN commit r3094.
 2005-11-05 23:03:55 +00:00
Ykkrosh faaee7d1b5 Atlas: Terrain painting 
This was SVN commit r3092.
 2005-11-05 04:59:54 +00:00
Ykkrosh a679206ca1 Atlas: Use sem_msgwait_np 
This was SVN commit r3090.
 2005-11-04 00:02:43 +00:00
prefect 9e2ec6aa3e Wide to Multi-byte conversion needs some hinting. 
This was SVN commit r3089.
 2005-11-03 22:51:14 +00:00
prefect 5f5d19cac4 Compile fixes and cleanup 
This was SVN commit r3088.
 2005-11-03 22:21:44 +00:00
Ykkrosh 7bfe647366 Atlas: Initial terrain-selection panel. 
TextureManager: Skip *.jbf too.

This was SVN commit r3085.
 2005-11-03 03:49:57 +00:00
Ykkrosh 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
Ykkrosh 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
janwas 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
prefect 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
Ykkrosh 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
Ykkrosh 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
Ykkrosh 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
janwas 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
Ykkrosh 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
Matei 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
Ykkrosh 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
Ykkrosh 7ebdefec4b Atlas: improved brushes 
This was SVN commit r2875.
 2005-10-09 03:26:16 +00:00
Ykkrosh 8bc8bcb740 Atlas: more flexible brushes 
This was SVN commit r2868.
 2005-10-08 03:55:21 +00:00
Ykkrosh 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
prefect 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
Ykkrosh 721f6e4a1e Atlas: [very] primitive brushes 
This was SVN commit r2843.
 2005-10-04 02:50:59 +00:00
Ykkrosh 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
prefect 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
Ykkrosh 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
janwas 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
Matei e5dea3e5a1 Water source code :|. 
This was SVN commit r2746.
 2005-09-18 03:47:15 +00:00
Ykkrosh 3ecdefe973 Atlas: Allow VFS reloading 
This was SVN commit r2736.
 2005-09-16 06:07:04 +00:00
Ykkrosh f0885bde69 Atlas: Simple (and ugly and unreliable) interface to rmgen 
This was SVN commit r2735.
 2005-09-16 05:29:40 +00:00
Ykkrosh 599452af85 Atlas: Camera controls. 
Elsewhere: Quaternion stuff.

This was SVN commit r2734.
 2005-09-15 05:31:49 +00:00