1
0
forked from 0ad/0ad
Commit Graph

269 Commits

Author SHA1 Message Date
79da4bf050 On-demand loading of actors (sort of)
This was SVN commit r2017.
2005-03-19 11:55:27 +00:00
475dfb2c78 Partial support for new actor format. Partialer support for missing actors without crashing.
This was SVN commit r2014.
2005-03-18 22:30:23 +00:00
308535d58d add instrumentation to see what's slow when starting a session
renderer: also move list of alpha maps here from InitResources

This was SVN commit r2007.
2005-03-18 22:02:20 +00:00
e6c8cef293 types.h => lib/types.h (avoid name collision)
This was SVN commit r1935.
2005-02-26 15:13:15 +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
3b1395d80b Optimised game-loading, by not reading terrain textures or calculating bounding boxes when not necessary; maps load about twenty seconds faster (at least in Debug mode). Also fixed possible minor bug (FLT_MIN vs -FLT_MAX) and other trivial things.
This was SVN commit r1917.
2005-02-09 23:19:48 +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
NoMonkey
704907db97 Player colors now recognize gaia as player 0 and allow for 8 regular player colors.
This was SVN commit r1865.
2005-01-29 18:20:16 +00:00
NoMonkey
d7b3d6b0c7 Added a new material, "player_trans.xml" which will give a model player color. So now if you want a player to be colored, just add this material!
This was SVN commit r1830.
2005-01-27 02:52:26 +00:00
NoMonkey
19fd48b1d5 This was SVN commit r1790. 2005-01-23 21:56:47 +00:00
NoMonkey
2af3b77d7e This was SVN commit r1789. 2005-01-23 21:56:00 +00:00
d29833e4ed mouse_x/y => g_mouse_x/y
This was SVN commit r1767.
2005-01-23 17:35:36 +00:00
NoMonkey
0df00e5b16 This was SVN commit r1761. 2005-01-23 08:28:56 +00:00
NoMonkey
d9f1a06b34 This was SVN commit r1760. 2005-01-23 08:22:52 +00:00
NoMonkey
674433a51a This was SVN commit r1759. 2005-01-23 07:54:17 +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
MarkT
25fdbfd931 Fixes for two pathfinding bugs (neither of which were actually pathfinding bugs), added player objects (details in TM)
This was SVN commit r1733.
2005-01-18 00:46:18 +00:00
2077698156 New JavaScript interface for the network client, plus some linux/gcc/misc fixes
This was SVN commit r1730.
2005-01-17 04:52:02 +00:00
1c044ac229 Primitive entity player-selection in ScEd
This was SVN commit r1727.
2005-01-16 23:09:41 +00:00
38b30e5eb4 Corrected ICC errors and some warnings. Removed some unnecessarily verbose logging. Did minor things.
This was SVN commit r1718.
2005-01-13 00:17:31 +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
fc4a34d768 Nicer XML-writing system
This was SVN commit r1711.
2005-01-11 20:15:39 +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
f7e82dbc16 add ps/Errors.h and/or lib/types.h headers (shouldn't rely on precompiled.h to pull those in).
also prepended ps/ to make location clear.

This was SVN commit r1652.
2005-01-07 00:47:44 +00:00
618c6cbbe7 Avoid flickering when zooming at near-zero speeds
This was SVN commit r1639.
2005-01-04 22:16:03 +00:00
855e1a7f81 Small ScEd updates
This was SVN commit r1601.
2004-12-30 23:01:09 +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
46f5c61179 Linux/GCC/glibc Compat
This was SVN commit r1532.
2004-12-18 23:30:28 +00:00
465ceff912 More leak fixes
This was SVN commit r1514.
2004-12-16 12:41:54 +00:00
b534e640ca Resource leak fixes
This was SVN commit r1513.
2004-12-16 12:01:47 +00:00
11f3b3c575 CFilePacker now takes version+magic string in the ctor (allows writing data in one go, so vfs_store can be used).
This was SVN commit r1505.
2004-12-15 14:26:21 +00:00
6d7d049d89 Attempted to minimise dependencies between header files (to make compilation minorly faster)
This was SVN commit r1490.
2004-12-12 19:43:55 +00:00
aa1442e8f8 Fix for mesh manager crashes (plus some parts of Boost, which may be a little excessive)
This was SVN commit r1488.
2004-12-12 18:40:00 +00:00
77196dbe06 less dependencies on res/res.h in headers (a bad thing) => less recompiles when I change vfs.h :)
This was SVN commit r1467.
2004-12-07 02:04:38 +00:00
a2a6f29ab3 s/Prometheus/Pyrogenesis/
This was SVN commit r1459.
2004-12-05 21:56:09 +00:00
ffb5f87857 Corrected mesh manager's use of hashmap. Added CStrW support to JS/GUI interface. Added error checking to CStr::Left/Right to make bugs more obvious.
This was SVN commit r1456.
2004-12-05 18:26:43 +00:00
4d83cba7e6 add required precompiled header include
This was SVN commit r1431.
2004-12-01 06:52:39 +00:00
30ad195c0b Linux/GCC Compat
This was SVN commit r1393.
2004-11-23 23:56:10 +00:00
7a84eca26b "*.<ext>" filter as per new vfs_next_dirent; also use ARRAY_SIZE
This was SVN commit r1391.
2004-11-23 23:52:39 +00:00
5a09dcd81b "*.xml" filter as per new vfs_next_dirent
This was SVN commit r1390.
2004-11-23 23:52:13 +00:00
MarkT
793794649f Combat code, some scripting, broken network, and fixed some bugs.
This was SVN commit r1301.
2004-11-11 07:09:32 +00:00
Calefaction
f257c67967 Updated to fix compile errors caued by missing CVertexProgram
This was SVN commit r1299.
2004-11-08 22:15:06 +00:00
Calefaction
82108a30c9 Removed, no longer needed (replacement using GLSL coming)
This was SVN commit r1296.
2004-11-08 22:09:28 +00:00
Calefaction
e3137cd302 Various updates, including the new MeshManager
This was SVN commit r1295.
2004-11-08 22:02:01 +00:00
3136791492 Linux/GCC Compat(tm)
This was SVN commit r1284.
2004-11-07 21:30:47 +00:00
Calefaction
955ddcf9a1 More programmable pipeline updates
This was SVN commit r1280.
2004-10-30 21:57:46 +00:00
728e6e1f10 Update to fix likely GCC compile problem
This was SVN commit r1277.
2004-10-24 15:49:52 +00:00
Calefaction
09ce67303e Updates to fix VC2K5 compile problem
This was SVN commit r1276.
2004-10-24 00:48:54 +00:00
Calefaction
7947293015 Initial programmable pipeline push
This was SVN commit r1272.
2004-10-23 18:13:54 +00:00
MarkT
2ab625720b Fairly major XML/entprop changes; some more minor stuff that fell out as a consequence.
This was SVN commit r1220.
2004-10-07 19:23:35 +00:00
notpete
e260a5eb8e Support for recursive actor directories; few other minor changes.
This was SVN commit r1219.
2004-10-06 18:46:33 +00:00
notpete
17a4174505 Minor additional functionality.
This was SVN commit r1218.
2004-10-06 18:45:59 +00:00
cb11ff27c2 startServer() display corruption bug, bug #28
This was SVN commit r1202.
2004-09-28 16:01:11 +00:00
011666f393 Minor fixes for Linux/GCC
This was SVN commit r1201.
2004-09-26 21:21:34 +00:00
Calefaction
39501530d4 Updated to properly update material parameters.
This was SVN commit r1200.
2004-09-26 04:09:57 +00:00
Calefaction
b1c269b72e Complete materials checkin
This was SVN commit r1197.
2004-09-24 03:52:03 +00:00
7f962ea9c4 Fixed very minor bug
This was SVN commit r1196.
2004-09-23 13:23:42 +00:00
Calefaction
831053d680 Update to the material system
This was SVN commit r1193.
2004-09-23 05:10:03 +00:00
Calefaction
4fff66cfce Initial import of material code. MaterialReader is implemented and functional. Currently models do not attempt to load materials, nor does the renderer use them.
This was SVN commit r1192.
2004-09-23 04:00:56 +00:00
4a7757dac6 VC2k5 fix: avoided ambiguous parameter naming
This was SVN commit r1185.
2004-09-21 22:11:33 +00:00
e4f160df27 fix headers: ogl_tex.h is user-level texture stuff, tex.h is only the texture loader.
this came up due to header change - some unnecessary stuff isn't
included by default anymore.

This was SVN commit r1155.
2004-09-19 11:57:51 +00:00
d79dad28d0 Fixed scrolling for windowed mode - stop scrolling when the mouse moves outside the window
This was SVN commit r1005.
2004-08-16 14:33:26 +00:00
9cd4cab693 A few log categories
This was SVN commit r994.
2004-08-15 20:57:31 +00:00
6fa44006e8 remove mods/official from pathname (since Unpacker now uses the VFS)
This was SVN commit r969.
2004-08-11 20:18:30 +00:00
1768ccded3 Miscellaneous GCC fixes
This was SVN commit r948.
2004-08-09 16:44:08 +00:00
1b3887a274 Fixed some warnings
This was SVN commit r921.
2004-08-06 11:20:37 +00:00
b2afef529c Introducing: The Pre-Game State. The game instance is not created on program load as before, but can be started by JS functions.
This was SVN commit r912.
2004-08-05 13:07:51 +00:00
MarkT
2b396ccb57 Minor improvements to some simulation code.
This was SVN commit r887.
2004-08-02 23:14:54 +00:00
352a3bed64 fix warning
This was SVN commit r869.
2004-07-31 19:46:14 +00:00
09f47d6820 Core Classes Reorganization:
- g_Terrain and g_Camera totally eradicated as globals, is now m_Terrain
of CWorld and m_Camera of CGameView
- terrainMain.cpp is almost completely empty with functionality moved
into the relevant core classes
- Miscellaneous global functions moved into Core Classes (mostly
GameView)

This was SVN commit r865.
2004-07-31 15:57:18 +00:00
5f810002c7 Changed error handling in Xeromyces
This was SVN commit r845.
2004-07-29 16:17:21 +00:00
d2070837d2 Global variables are nasty. Hacked g_Terrain into a pointer so that it doesn't crash when automatically destructing, although it ought to be handled in a nicer way.
This was SVN commit r839.
2004-07-28 19:27:35 +00:00
415662c4cd First set of Core Classes changes! w00t :P
This was SVN commit r823.
2004-07-27 21:00:53 +00:00
MarkT
befae8627d Changed hotkey handling for groups and bookmarks; small pathfinding fixes.
This was SVN commit r809.
2004-07-23 10:56:52 +00:00
MarkT
5470eff53c Fixed (probably) degenerate case stalling the heightfield tracer.
This was SVN commit r807.
2004-07-22 17:00:43 +00:00
MarkT
6d8b9e33ef Minor additions: Added hotkeys to GUI buttons, camera bookmarking (not sure if this system will stay), shoring up some JS error checking, moved a bunch of constants into the config file and added a new rotation mode.
This was SVN commit r804.
2004-07-22 16:18:12 +00:00
MarkT
194fdf9b4b Unit selection and ordering, setTimeout, scheduler, fixed timestep code, various fixes and reinforcement of the JS<->Native code.
This was SVN commit r783.
2004-07-20 19:30:35 +00:00
1e40ed1543 More attempted error handling
This was SVN commit r769.
2004-07-17 17:09:33 +00:00
c62940201f Removed trailing newlines in log messages
This was SVN commit r705.
2004-07-11 16:05:58 +00:00
7bef7160ca gcc warning fixes
This was SVN commit r702.
2004-07-11 12:49:44 +00:00
0eecb81bac wchar_t/etc fixes
This was SVN commit r692.
2004-07-10 20:56:15 +00:00
5c4699d7dc wchar_t/etc fixes
This was SVN commit r688.
2004-07-10 20:25:20 +00:00
a8f48ff7e0 XMB
This was SVN commit r665.
2004-07-08 15:22:09 +00:00
fc30c305f4 Added necessary #includes
This was SVN commit r660.
2004-07-08 14:44:04 +00:00
e803594239 Removed unnecessary #includes
This was SVN commit r659.
2004-07-08 14:43:16 +00:00
12170cabeb Headers for non-PCH
This was SVN commit r611.
2004-06-28 15:34:10 +00:00
fd701dc5d9 more L4 warnings stomped
This was SVN commit r585.
2004-06-22 13:22:46 +00:00
eed80d019a Memory leak fix
This was SVN commit r568.
2004-06-19 21:27:23 +00:00
73954008d0 renamed loop variable to avoid warning
This was SVN commit r554.
2004-06-19 14:39:24 +00:00
32b6627645 Miscellaneous gcc fixes
This was SVN commit r541.
2004-06-18 18:56:10 +00:00
ea68626ec1 Remove new new (Xerces doesn't like it)
This was SVN commit r516.
2004-06-15 21:08:05 +00:00
17fb3238c7 fixed some unfreed XMLString::transcode's
This was SVN commit r505.
2004-06-13 23:37:37 +00:00
0983fdcf9c CStr namespace de-pollution; added using namespace to source
This was SVN commit r475.
2004-06-11 02:20:59 +00:00
15ca5cbf21 newline stomper and fixed warnings
This was SVN commit r473.
2004-06-11 02:14:18 +00:00
MarkT
e4fe4ed602 JS Interface to entities. It even partially works now.
This was SVN commit r469.
2004-06-10 22:24:03 +00:00
8d52add5ea ran newline stomper; no real changes
This was SVN commit r423.
2004-06-08 12:10:51 +00:00
notpete
5b3be293ca Removed Xerces initialisation; added some prop-related logging for errors.
This was SVN commit r418.
2004-06-07 20:03:10 +00:00
notpete
e8f2611b9c Constructor added to CObjectEntry::Anim.
This was SVN commit r417.
2004-06-07 20:01:46 +00:00
notpete
178e5a1c47 Modified to calculate bone transformation matrices in world space, rather than object space.
This was SVN commit r416.
2004-06-07 20:00:56 +00:00
notpete
97b7efab20 Fixed some assumptions PATCH_SIZE is 16.
This was SVN commit r415.
2004-06-07 19:59:20 +00:00
notpete
71d74e9121 Minor change for modified CTextureEntry interface.
This was SVN commit r414.
2004-06-07 19:57:59 +00:00
notpete
05ae51351c Minor change to support on-demand texture loading; fixed backwards orientation issue.
This was SVN commit r413.
2004-06-07 19:57:19 +00:00
notpete
6caf7c7466 Support for loading texture data on data, rather than loading all known textures on startup.
This was SVN commit r412.
2004-06-07 19:56:26 +00:00
c7a84e84be added precompiled.h everywhere
This was SVN commit r392.
2004-06-03 18:38:14 +00:00
2c2b9ab71a Removed mods/official/ prefix now that ObjectEntry is VFS aware
This was SVN commit r382.
2004-06-03 13:22:19 +00:00
831defdf07 Use the VFS Wrapper instead of Xerces' local file input. Use XMLCh/CStr
conversion functions from XML.h/XMLUtils.cpp

This was SVN commit r381.
2004-06-03 13:20:36 +00:00
MarkT
d32be2011f Pathfinding tweaks; coldet fixes.
This was SVN commit r379.
2004-06-03 02:20:48 +00:00
4daa183dd3 stripped some headers from deprecated prometheus.h => huge rearrange
This was SVN commit r378.
2004-06-03 01:43:33 +00:00
6782c17105 fixed a few warnings; updated vfs file enum code
This was SVN commit r375.
2004-06-03 00:20:20 +00:00
0ce04bf73f no message
This was SVN commit r364.
2004-06-02 16:59:12 +00:00
af3cb23fde Minor changes for linux
This was SVN commit r348.
2004-06-02 15:03:17 +00:00
bc9ac47ada Converted to VFS directory enum
This was SVN commit r344.
2004-06-02 14:27:54 +00:00
c07e561241 - Added a little logging for successful and failed loading of animations
This was SVN commit r343.
2004-06-02 14:26:29 +00:00
04763a1f35 - Added a few logging statements (using CLogger)
- Converted to use VFS directory enum instead of _findfirst

This was SVN commit r342.
2004-06-02 14:24:37 +00:00
3abf9ac4b5 lots of type fixes; types.h is now a convenience wrapper on top of the standard uintN_t routines
This was SVN commit r334.
2004-06-01 17:34:12 +00:00
1eaadd38aa ran everything though mark's newline stomper.
This was SVN commit r322.
2004-05-30 00:46:58 +00:00
notpete
2d0ce81aee Optimistic bogus newline fix.
This was SVN commit r317.
2004-05-29 23:35:46 +00:00
notpete
02ec5888ec Fixed 180 degree rotation issue caused by missed merge with Mark's code on last check in.
This was SVN commit r316.
2004-05-29 23:35:31 +00:00
notpete
7fb944a1e1 Either moved from terrain directory, or an inital revision, depending on the file. Whole bunch of changes related to props and animation.
This was SVN commit r306.
2004-05-29 20:56:24 +00:00