Commit graph

2510 commits

Author SHA1 Message Date
Christoph Oelckers
c7584cace6 - sync 3D floor branch with trunk.
SVN r3123 (3dfloors2)
2011-01-29 10:54:06 +00:00
Christoph Oelckers
264ab6b076 - replace LEVEL_HEXENFORMAT with a maptype variable so that more precise checks for the map format can be done.
SVN r3122 (3dfloors2)
2011-01-26 10:28:09 +00:00
Christoph Oelckers
9ca4c49b84 - fixed the check for not clipping sprites against 3D-floor ceilings and floors. If such a plane was set it was used unconditionally for all drawing regions of the sprite, not just those bordering the planes in question.
SVN r3110 (3dfloors2)
2011-01-19 10:04:08 +00:00
Randy Heit
c2792d12b3 - Readability changes:
* More whitespace.
  * More braces.
  * Named constants for fake3D.

SVN r3109 (3dfloors2)
2011-01-19 03:01:47 +00:00
Christoph Oelckers
be097db4e5 - added improved sprite clipping submission from kgsws.
SVN r3106 (3dfloors2)
2011-01-15 16:25:58 +00:00
Christoph Oelckers
297d608bbc - added kgsws's patch for 3D floor voxel clipping.
SVN r3099 (3dfloors2)
2011-01-11 21:08:17 +00:00
Christoph Oelckers
3532bd8df0 - updated permissions in Fragglescript code.
SVN r3098 (3dfloors2)
2011-01-11 13:56:13 +00:00
Christoph Oelckers
12ec6f0494 - forgot to update the colormap check in 3D floor automap code.
SVN r3097 (3dfloors2)
2011-01-09 15:01:54 +00:00
Christoph Oelckers
dc6854e756 - undo accidental commit of unfinished test code.
SVN r3095 (3dfloors2)
2011-01-09 13:42:33 +00:00
Christoph Oelckers
f511e29278 - sync 3D floor branch with trunk.
SVN r3094 (3dfloors2)
2011-01-09 12:07:19 +00:00
Christoph Oelckers
652558577c - added GZDoom's 3D floor for automap code.
SVN r3093 (3dfloors2)
2011-01-09 11:52:08 +00:00
Christoph Oelckers
671e09fae3 - fixed: Fog in the model sector of a 3D floor should not be transformed into a blend if it's the same color as the target sector's fog. This is necessary to make map global fog work properly.
SVN r3084 (3dfloors2)
2011-01-01 09:27:38 +00:00
Christoph Oelckers
7c66ba48ed - fixed: We need to define a mapspot with editor number 5004 for Legacy maps if we want to have them playable.
SVN r3082 (3dfloors2)
2011-01-01 08:57:00 +00:00
Christoph Oelckers
2657af8d13 - merged Gez's 3D floor patch from GZDoom.
SVN r3081 (3dfloors2)
2010-12-31 11:06:40 +00:00
Christoph Oelckers
6c94a5e7f3 - optimized 3D floor code a little. It was calling ZatPoint(0, 0) in several spots which is needlessly expensive on non-sloped 3D floors. Since both the coordinate and the plane coefficients are 0 here the function can be optimized significantly for this special case, avoiding all multiplications. Testing on a map making extremely heavy use of 3D floors (Burghead MAP110) this improved performance by 10%.
SVN r3075 (3dfloors2)
2010-12-25 11:30:38 +00:00
Christoph Oelckers
bb3cb6409f - fixed: The renderer wrote past the end of the openings array without properly checking. Changed reallocation so that R_NewOpening is doing the check itself instead of trusting that R_CheckOpenings is properly called elsewhere.
SVN r3074 (3dfloors2)
2010-12-25 11:16:26 +00:00
Christoph Oelckers
25f186b29b - fixed: Walls between swimmable 3D volumes should not be drawn.
SVN r3073 (3dfloors2)
2010-12-25 10:06:46 +00:00
Christoph Oelckers
be442820b3 - Updated CMakeLists.txt
SVN r3069 (3dfloors2)
2010-12-21 07:48:01 +00:00
Christoph Oelckers
fbeb153305 - fixed: R_DeinitPlanes must set fakeActive to 0 to ensure thar R_ClearPlanes actually clears the visplanes,
SVN r3068 (3dfloors2)
2010-12-20 23:43:23 +00:00
Christoph Oelckers
21a18f7a1b - fixed: The 3D floor rendering code did not free its clipping data properly.
SVN r3067 (3dfloors2)
2010-12-20 23:32:31 +00:00
Christoph Oelckers
c2a65e64e8 - added some asserts around the 3D floor related allocations and NULL some pointers that weren't yet when data is freed.
SVN r3066 (3dfloors2)
2010-12-20 22:39:44 +00:00
Christoph Oelckers
57649bd975 - sync 3D floors branch with trunk.
SVN r3063 (3dfloors2)
2010-12-20 16:24:02 +00:00
Christoph Oelckers
6550e2c338 - added GZDoom's FraggleScript code to 3D floors branch.
SVN r3062 (3dfloors2)
2010-12-20 15:08:49 +00:00
Christoph Oelckers
a7d4469649 - added kgsws's 3D floor patch for fixing Vavoom-style-3D-floor plane rendering.
SVN r3057 (3dfloors2)
2010-12-17 14:38:20 +00:00
Christoph Oelckers
ff3f03a2b5 - changed colormap use for 3D floors to match GZDoom: Unless FF_FADEWALLS is set, the fog value of the model sector will be used as a screen blend, not an actual fog setting. This required explicit generation of colormaps for each 3D floor definition and an added check to sector_t::SetColor and sector_t::SetFade to regenerate the 3D floor colormaps when changed.
SVN r3056 (3dfloors2)
2010-12-17 11:25:04 +00:00
Christoph Oelckers
8cf8644fc9 - removed extralight code in 3D floor branch. (Why was the initialization for this spread out all over P_GroupLines instead of cleanly separated into its own function?) This code is not compatible with 3D floors which need to replicate this functionality anyway.
- added code for parsing Legacy-style sector color information to SetTextureNoErr. This still needs adjustments to the colormap builder due to the saturation parameter Legacy has.



SVN r3055 (3dfloors2)
2010-12-16 23:53:10 +00:00
Christoph Oelckers
256876bacc - added kgsws's 3D floor patch.
SVN r3054 (3dfloors2)
2010-12-16 21:01:10 +00:00
Christoph Oelckers
810df509b4 - Use GZDoom's linedef translator for 3D floors so that Legacy maps can be tested.
SVN r3052 (3dfloors2)
2010-12-16 10:03:44 +00:00
Christoph Oelckers
10ec1efca3 - update MSVC project for new 3D floor branch.
SVN r3051 (3dfloors2)
2010-12-16 09:56:46 +00:00
Braden Obrzut
67822e95f4 - Applied kgsws-CZ's latest 3D floors patch.
SVN r3047 (3dfloors2)
2010-12-16 01:48:34 +00:00
Christoph Oelckers
7e503d2f70 - fixed: D3DFB::Clear used the palette index even when a valid color was passed to it.
SVN r3045 (trunk)
2010-12-16 00:21:13 +00:00
Christoph Oelckers
e33d1a989f - set all 'num' variables to 0 in P_FreeLevelData so that any code using them won't try to read the deleted map data.
SVN r3044 (trunk)
2010-12-15 23:10:08 +00:00
Christoph Oelckers
419a998bdf - warning removal
SVN r3043 (trunk)
2010-12-15 18:57:39 +00:00
Christoph Oelckers
b42952b85c - added a 'restart' CCMD that allows restarting the engine with different WADs being loaded without quitting first
SVN r3042 (trunk)
2010-12-15 11:45:39 +00:00
Christoph Oelckers
772d59dff4 - fixed handling of missing backgrounds for intermission text screens for real this time.
SVN r3041 (trunk)
2010-12-15 08:00:38 +00:00
Christoph Oelckers
e7eb43a343 - added Gez's automap patch to mark trigger lines.
SVN r3040 (trunk)
2010-12-15 00:14:42 +00:00
Christoph Oelckers
770a879f6a - fixed: The TouchedActors array in the Dehacked parser was not freed after parsing was done.
- Initialize the alt HUD explicitly in D_DoomMain.
- don't let S_UnloadReverbDef leave a broken list of sound environments behind.
- Added more code to explicitly delete data before initializing it.

SVN r3039 (trunk)
2010-12-15 00:09:31 +00:00
Braden Obrzut
22372fff25 - Fixed: "Show IWAD selection dialog" when only shown on Windows.
SVN r3038 (trunk)
2010-12-14 16:05:38 +00:00
Christoph Oelckers
79c5080dda - added DavidPH's submission for specifying vertex heights directly in UDMF.
SVN r3037 (trunk)
2010-12-14 00:56:44 +00:00
Christoph Oelckers
f0f17e531c - move static AM color initialization into the AM_StaticInit function.
- move D_LoadWadSettings to keysections.cpp.
- made some more data reloadable.
- data structures filled by P_SetupLevel should be cleared before loading the level. They can remain non-empty in case of an error. There's probably more to fix here...
- fixed: MidiDevices and MusicAliases were not cleared before reloading local SNDINFOs.
- fixed signed/unsigned warnings in AddSwitchPair for real (GCC really allows -1u? MSVC prints a warning for that.)


SVN r3036 (trunk)
2010-12-14 00:50:02 +00:00
Braden Obrzut
ee20d0ea7a - Fixed: GCC compiler warnings.
- zipdir will no longer store files ending in '~' on Linux.
- Added st_oldouch which restores the old ouch face behavior of only showing when health increases by 20 while taking damage.

SVN r3035 (trunk)
2010-12-13 17:09:35 +00:00
Christoph Oelckers
c6525a2271 - changed some data init code to delete the data it wants to initialize first.
- The 'savebuffer' variable still existed?
- Changed AInventory::Destroy to NULL SendItemUse and SendItemDrop if they point to the destroyed object. Although unlikely it can't be ruled out completely that this can happen with delayed CCMDs.
- fixed: Starting a new game did not clear the hub statistics array.


SVN r3034 (trunk)
2010-12-13 10:02:45 +00:00
Christoph Oelckers
99b5fe29f7 - cleaned up D_DoomMain a little. It's still far too large though.
- added explicit initialization of console background texture instead of letting C_InitConsole doing it as needed.
- added 'clearaliases' CCMD.


SVN r3033 (trunk)
2010-12-12 23:52:00 +00:00
Christoph Oelckers
ececec1c65 - init bot specific actor properties righr after parsing DECORATE, not when spawning the first bot (which is too late.)
SVN r3032 (trunk)
2010-12-12 21:09:16 +00:00
Christoph Oelckers
572bc4620a - changed automap initialization so that static data only gets initialized once upon startup instead of each time a level starts.
- initialize AUTOPAGE only once when the level starts, not each time the automap is switched on.


SVN r3031 (trunk)
2010-12-12 17:54:10 +00:00
Christoph Oelckers
0715b7dfc6 - cleaned up switch code and fixed several problems:
* savegames stored an index in the switch table and performed no validation when loading a savegame.
  * setting of a random switch animation duration was broken.
  * separated the 2 values stored in the Time variable into 2 separate variables.
  * defining a switch with one texture already belonging to another switch could leave broken definitions in the switch table.
- added function for serializing switch and door animation pointers.
- bumped min. savegame versions due to changes to DButtonThinker and removed all current savegame compatibility code.


SVN r3030 (trunk)
2010-12-12 15:43:35 +00:00
Christoph Oelckers
e257c4cb64 - moved animated door definitions into texture manager and split all associated code off p_doors.cpp
SVN r3029 (trunk)
2010-12-12 08:30:12 +00:00
Christoph Oelckers
d851040ad6 - fixed GCC compilation.
SVN r3028 (trunk)
2010-12-12 07:59:38 +00:00
Christoph Oelckers
24ab37613a - moved switch definitions into texture manager and split all associated code off p_switches.cpp into its own file.
SVN r3027 (trunk)
2010-12-11 23:02:46 +00:00
Christoph Oelckers
6309d90be0 - moved texture counting code into FTextureManager.
- moved all code and data for Build tile management into FTextureManager.
- moved texture animation management into FTextureManager.
- changed: Animate textures only once per frame, not per view. Otherwise with animations that have sub-frame accuracy camera textures of the same area can show different animation frames if the frame changes falls between the rendering of the different views.


SVN r3026 (trunk)
2010-12-11 12:00:40 +00:00