diff -Nru doomsday-server-stable-2.3.0.3651+groovy/debian/changelog doomsday-server-stable-2.3.1.3685+groovy/debian/changelog --- doomsday-server-stable-2.3.0.3651+groovy/debian/changelog 2021-02-04 13:31:46.000000000 +0000 +++ doomsday-server-stable-2.3.1.3685+groovy/debian/changelog 2021-02-04 13:31:48.000000000 +0000 @@ -1,6 +1,6 @@ -doomsday-server-stable (2.3.0.3651+groovy) groovy; urgency=medium +doomsday-server-stable (2.3.1.3685+groovy) groovy; urgency=medium - * New release: Stable build 3651. - * Updated metadata for Flatpak + * New release: Stable build 3685. + * Changed release type to "Stable" for 2.3.1 - -- Jaakko Keränen (skyjake) Fri, 01 Jan 2021 03:44:15 +0200 + -- Jaakko Keränen (skyjake) Thu, 04 Feb 2021 15:18:19 +0200 diff -Nru doomsday-server-stable-2.3.0.3651+groovy/debian/rules doomsday-server-stable-2.3.1.3685+groovy/debian/rules --- doomsday-server-stable-2.3.0.3651+groovy/debian/rules 2021-02-04 13:31:46.000000000 +0000 +++ doomsday-server-stable-2.3.1.3685+groovy/debian/rules 2021-02-04 13:31:48.000000000 +0000 @@ -8,7 +8,7 @@ cd builddir && QTCHOOSER_RUNTOOL=qmake QT_SELECT=5 cmake \ -DQMAKE=qtchooser \ -DCMAKE_BUILD_TYPE=Release \ - -DDENG_BUILD=3651 \ + -DDENG_BUILD=3685 \ -DCMAKE_CXX_FLAGS=-std=c++11 \ -DDENG_ENABLE_SDK=OFF \ -DDENG_ENABLE_COTIRE=OFF -DDENG_ENABLE_GUI=OFF \ diff -Nru doomsday-server-stable-2.3.0.3651+groovy/doomsday/apps/client/include/world/convexsubspace.h doomsday-server-stable-2.3.1.3685+groovy/doomsday/apps/client/include/world/convexsubspace.h --- doomsday-server-stable-2.3.0.3651+groovy/doomsday/apps/client/include/world/convexsubspace.h 2021-01-01 01:44:15.000000000 +0000 +++ doomsday-server-stable-2.3.1.3685+groovy/doomsday/apps/client/include/world/convexsubspace.h 2021-02-04 13:18:19.000000000 +0000 @@ -185,14 +185,6 @@ // -------------------------------------------------------------------------------------- /** - * Returns the vector described by the offset from the map coordinate space origin to - * the top most, left most point of the geometry of the subspace. - * - * @see bounds() - */ - de::Vector2d const &worldGridOffset() const; - - /** * Returns a pointer to the face geometry half-edge which has been chosen for use as * the base for a triangle fan GL primitive. May return @c nullptr if no suitable base * was determined. diff -Nru doomsday-server-stable-2.3.0.3651+groovy/doomsday/apps/client/net.dengine.client.pack/defaultstyle.pack/Info doomsday-server-stable-2.3.1.3685+groovy/doomsday/apps/client/net.dengine.client.pack/defaultstyle.pack/Info --- doomsday-server-stable-2.3.0.3651+groovy/doomsday/apps/client/net.dengine.client.pack/defaultstyle.pack/Info 2021-01-01 01:44:15.000000000 +0000 +++ doomsday-server-stable-2.3.1.3685+groovy/doomsday/apps/client/net.dengine.client.pack/defaultstyle.pack/Info 2021-02-04 13:18:19.000000000 +0000 @@ -1,4 +1,4 @@ title: Doomsday Default UI Style -version: 2.3 +version: 2.3.1 license: GPL 3+ tags: core ui style diff -Nru doomsday-server-stable-2.3.0.3651+groovy/doomsday/apps/client/net.dengine.client.pack/Info doomsday-server-stable-2.3.1.3685+groovy/doomsday/apps/client/net.dengine.client.pack/Info --- doomsday-server-stable-2.3.0.3651+groovy/doomsday/apps/client/net.dengine.client.pack/Info 2021-01-01 01:44:15.000000000 +0000 +++ doomsday-server-stable-2.3.1.3685+groovy/doomsday/apps/client/net.dengine.client.pack/Info 2021-02-04 13:18:19.000000000 +0000 @@ -1,7 +1,7 @@ # Client's primary resources title: Doomsday Client -version: 2.3 +version: 2.3.1 license: GPL 3+ tags: core client diff -Nru doomsday-server-stable-2.3.0.3651+groovy/doomsday/apps/client/net.dengine.client.pack/renderer.pack/Info doomsday-server-stable-2.3.1.3685+groovy/doomsday/apps/client/net.dengine.client.pack/renderer.pack/Info --- doomsday-server-stable-2.3.0.3651+groovy/doomsday/apps/client/net.dengine.client.pack/renderer.pack/Info 2021-01-01 01:44:15.000000000 +0000 +++ doomsday-server-stable-2.3.1.3685+groovy/doomsday/apps/client/net.dengine.client.pack/renderer.pack/Info 2021-02-04 13:18:19.000000000 +0000 @@ -1,6 +1,6 @@ # General resources for the renderer title: Doomsday Renderer -version: 2.3 +version: 2.3.1 license: GPL 3+ tags: core diff -Nru doomsday-server-stable-2.3.0.3651+groovy/doomsday/apps/client/net.dengine.client.pack/renderer.pack/lensflares.pack/Info doomsday-server-stable-2.3.1.3685+groovy/doomsday/apps/client/net.dengine.client.pack/renderer.pack/lensflares.pack/Info --- doomsday-server-stable-2.3.0.3651+groovy/doomsday/apps/client/net.dengine.client.pack/renderer.pack/lensflares.pack/Info 2021-01-01 01:44:15.000000000 +0000 +++ doomsday-server-stable-2.3.1.3685+groovy/doomsday/apps/client/net.dengine.client.pack/renderer.pack/lensflares.pack/Info 2021-02-04 13:18:19.000000000 +0000 @@ -1,5 +1,5 @@ title: Doomsday Default Lens Flares -version: 2.3 +version: 2.3.1 license: GPL 3+ tags: core fx diff -Nru doomsday-server-stable-2.3.0.3651+groovy/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/dgl/dgl_draw.fsh doomsday-server-stable-2.3.1.3685+groovy/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/dgl/dgl_draw.fsh --- doomsday-server-stable-2.3.0.3651+groovy/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/dgl/dgl_draw.fsh 2021-01-01 01:44:15.000000000 +0000 +++ doomsday-server-stable-2.3.1.3685+groovy/doomsday/apps/client/net.dengine.client.pack/renderer.pack/shaders/dgl/dgl_draw.fsh 2021-02-04 13:18:19.000000000 +0000 @@ -31,83 +31,87 @@ DENG_VAR vec4 vColor; DENG_VAR vec2 vTexCoord[2]; -vec4 sampleTexture0(int batchIndex, vec2 uv) +#define SAMPLE_UTEX0(n) if (vBatchIndex == n) { return texture(uTex0[n], uv); } +#define SAMPLE_UTEX1(n) if (vBatchIndex == n) { return texture(uTex1[n], uv); } + +vec4 sampleTexture0(vec2 uv) { - switch (batchIndex) - { - case 0: return texture(uTex0[0], uv); - case 1: return texture(uTex0[1], uv); - case 2: return texture(uTex0[2], uv); - case 3: return texture(uTex0[3], uv); - case 4: return texture(uTex0[4], uv); - case 5: return texture(uTex0[5], uv); - case 6: return texture(uTex0[6], uv); - case 7: return texture(uTex0[7], uv); + SAMPLE_UTEX0(0) + SAMPLE_UTEX0(1) + SAMPLE_UTEX0(2) + SAMPLE_UTEX0(3) +#if DGL_BATCH_MAX > 4 + SAMPLE_UTEX0(4) + SAMPLE_UTEX0(5) + SAMPLE_UTEX0(6) + SAMPLE_UTEX0(7) +#endif #if DGL_BATCH_MAX > 8 - case 8: return texture(uTex0[8], uv); + SAMPLE_UTEX0(8) #endif #if DGL_BATCH_MAX > 9 - case 9: return texture(uTex0[9], uv); + SAMPLE_UTEX0(9) #endif #if DGL_BATCH_MAX > 10 - case 10: return texture(uTex0[10], uv); + SAMPLE_UTEX0(10) #endif #if DGL_BATCH_MAX > 11 - case 11: return texture(uTex0[11], uv); + SAMPLE_UTEX0(11) #endif #if DGL_BATCH_MAX > 12 - case 12: return texture(uTex0[12], uv); + SAMPLE_UTEX0(12) #endif #if DGL_BATCH_MAX > 13 - case 13: return texture(uTex0[13], uv); + SAMPLE_UTEX0(13) #endif #if DGL_BATCH_MAX > 14 - case 14: return texture(uTex0[14], uv); + SAMPLE_UTEX0(14) #endif #if DGL_BATCH_MAX > 15 - case 15: return texture(uTex0[15], uv); + SAMPLE_UTEX0(15) #endif - } + return vec4(1.0, 0.0, 1.0, 1.0); } -vec4 sampleTexture1(int batchIndex, vec2 uv) +vec4 sampleTexture1(vec2 uv) { - switch (batchIndex) - { - case 0: return texture(uTex1[0], uv); - case 1: return texture(uTex1[1], uv); - case 2: return texture(uTex1[2], uv); - case 3: return texture(uTex1[3], uv); - case 4: return texture(uTex1[4], uv); - case 5: return texture(uTex1[5], uv); - case 6: return texture(uTex1[6], uv); - case 7: return texture(uTex1[7], uv); + SAMPLE_UTEX1(0) + SAMPLE_UTEX1(1) + SAMPLE_UTEX1(2) + SAMPLE_UTEX1(3) +#if DGL_BATCH_MAX > 4 + SAMPLE_UTEX1(4) + SAMPLE_UTEX1(5) + SAMPLE_UTEX1(6) + SAMPLE_UTEX1(7) +#endif #if DGL_BATCH_MAX > 8 - case 8: return texture(uTex1[8], uv); + SAMPLE_UTEX1(8) #endif #if DGL_BATCH_MAX > 9 - case 9: return texture(uTex1[9], uv); + SAMPLE_UTEX1(9) #endif #if DGL_BATCH_MAX > 10 - case 10: return texture(uTex1[10], uv); + SAMPLE_UTEX1(10) #endif #if DGL_BATCH_MAX > 11 - case 11: return texture(uTex1[11], uv); + SAMPLE_UTEX1(11) #endif #if DGL_BATCH_MAX > 12 - case 12: return texture(uTex1[12], uv); + SAMPLE_UTEX1(12) #endif #if DGL_BATCH_MAX > 13 - case 13: return texture(uTex1[13], uv); + SAMPLE_UTEX1(13) #endif #if DGL_BATCH_MAX > 14 - case 14: return texture(uTex1[14], uv); + SAMPLE_UTEX1(14) #endif #if DGL_BATCH_MAX > 15 - case 15: return texture(uTex1[15], uv); + SAMPLE_UTEX1(15) #endif - } + return vec4(1.0, 0.0, 1.0, 1.0); } + void main() { out_FragColor = vColor; @@ -116,11 +120,11 @@ vec4 texColor[2] = vec4[2](vec4(1.0), vec4(1.0)); if ((uTexEnabled[vBatchIndex] & 0x1) != 0) { - texColor[0] = sampleTexture0(vBatchIndex, vTexCoord[0]); + texColor[0] = sampleTexture0(vTexCoord[0]); } if ((uTexEnabled[vBatchIndex] & 0x2) != 0) { - texColor[1] = sampleTexture1(vBatchIndex, vTexCoord[1]); + texColor[1] = sampleTexture1(vTexCoord[1]); } // Modulate the texture colors in the requested manner. diff -Nru doomsday-server-stable-2.3.0.3651+groovy/doomsday/apps/client/res/linux/net.dengine.Doomsday.metainfo.xml doomsday-server-stable-2.3.1.3685+groovy/doomsday/apps/client/res/linux/net.dengine.Doomsday.metainfo.xml --- doomsday-server-stable-2.3.0.3651+groovy/doomsday/apps/client/res/linux/net.dengine.Doomsday.metainfo.xml 2021-01-01 01:44:15.000000000 +0000 +++ doomsday-server-stable-2.3.1.3685+groovy/doomsday/apps/client/res/linux/net.dengine.Doomsday.metainfo.xml 2021-02-04 13:18:19.000000000 +0000 @@ -55,6 +55,12 @@ jaakko.keranen@iki.fi + + +

Patch release that addresses issues found in version 2.3.

+ + https://manual.dengine.net/version/2.3.1 +

This version improves support for vanilla DOOM render hacks and adds more script bindings to manipulate things in the map. In Heretic, ambient sound sequences are now customizable.

Binary files /tmp/tmpWLWkYO/3j_DkkoyG3/doomsday-server-stable-2.3.0.3651+groovy/doomsday/apps/client/res/macx/English.lproj/InfoPlist.strings and /tmp/tmpWLWkYO/K6zLGxja29/doomsday-server-stable-2.3.1.3685+groovy/doomsday/apps/client/res/macx/English.lproj/InfoPlist.strings differ diff -Nru doomsday-server-stable-2.3.0.3651+groovy/doomsday/apps/client/src/gl/dgl_draw.cpp doomsday-server-stable-2.3.1.3685+groovy/doomsday/apps/client/src/gl/dgl_draw.cpp --- doomsday-server-stable-2.3.0.3651+groovy/doomsday/apps/client/src/gl/dgl_draw.cpp 2021-01-01 01:44:15.000000000 +0000 +++ doomsday-server-stable-2.3.1.3685+groovy/doomsday/apps/client/src/gl/dgl_draw.cpp 2021-02-04 13:18:19.000000000 +0000 @@ -547,6 +547,12 @@ GL.glBindBuffer(GL_ARRAY_BUFFER, buf.arrayData.glName()); LIBGUI_ASSERT_GL_OK(); + DENG2_ASSERT(GL.glGetAttribLocation(gl->shader.glName(), "aVertex") == VAA_VERTEX); + DENG2_ASSERT(GL.glGetAttribLocation(gl->shader.glName(), "aColor") == VAA_COLOR); + DENG2_ASSERT(GL.glGetAttribLocation(gl->shader.glName(), "aTexCoord") == VAA_TEXCOORD0); + DENG2_ASSERT(GL.glGetAttribLocation(gl->shader.glName(), "aFragOffset") == VAA_FRAG_OFFSET); + DENG2_ASSERT(GL.glGetAttribLocation(gl->shader.glName(), "aBatchIndex") == VAA_BATCH_INDEX); + // Updated pointers. GL.glVertexAttribPointer(VAA_VERTEX, 3, GL_FLOAT, GL_FALSE, stride, DENG2_OFFSET_PTR(Vertex, vertex)); GL.glVertexAttribPointer(VAA_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, stride, DENG2_OFFSET_PTR(Vertex, color)); @@ -615,11 +621,6 @@ s_maxBatchLength = de::max(s_maxBatchLength, batchLength); s_totalBatchCount += batchLength; - int oldTex[2]; - getBoundTextures(oldTex[0], oldTex[1]); - - glBindBatchTextures(batchLength); - // Batched uniforms. gl->uMvpMatrix.set(gl->batchMvpMatrix, batchLength); gl->uTexMatrix0.set(gl->batchTexMatrix0, batchLength); @@ -648,8 +649,12 @@ glState.apply(); + int oldTex[2]; + getBoundTextures(oldTex[0], oldTex[1]); + glBindArrays(); gl->shader.beginUse(); + glBindBatchTextures(batchLength); DENG2_ASSERT(gl->shader.validate()); GL.glDrawArrays(glPrimitive(batchPrimType), 0, numVertices()); ++s_drawCallCount; gl->shader.endUse(); diff -Nru doomsday-server-stable-2.3.0.3651+groovy/doomsday/apps/client/src/render/rend_main.cpp doomsday-server-stable-2.3.1.3685+groovy/doomsday/apps/client/src/render/rend_main.cpp --- doomsday-server-stable-2.3.0.3651+groovy/doomsday/apps/client/src/render/rend_main.cpp 2021-01-01 01:44:15.000000000 +0000 +++ doomsday-server-stable-2.3.1.3685+groovy/doomsday/apps/client/src/render/rend_main.cpp 2021-02-04 13:18:19.000000000 +0000 @@ -2904,8 +2904,12 @@ MaterialAnimator &matAnimator = material->getAnimator(Rend_MapSurfaceMaterialSpec()); - Vector2f materialOrigin = curSubspace->worldGridOffset() // Align to the worldwide grid. - + surface.originSmoothed(); + Vec2f materialOrigin = + // Align to the worldwide grid. + Vec2f(fmod(curSubspace->poly().bounds().minX, material->width()), + fmod(curSubspace->poly().bounds().maxY, material->height())) + + surface.originSmoothed(); + // Add the Y offset to orient the Y flipped material. /// @todo fixme: What is this meant to do? -ds if (plane.isSectorCeiling()) diff -Nru doomsday-server-stable-2.3.0.3651+groovy/doomsday/apps/client/src/render/skydrawable.cpp doomsday-server-stable-2.3.1.3685+groovy/doomsday/apps/client/src/render/skydrawable.cpp --- doomsday-server-stable-2.3.0.3651+groovy/doomsday/apps/client/src/render/skydrawable.cpp 2021-01-01 01:44:15.000000000 +0000 +++ doomsday-server-stable-2.3.1.3685+groovy/doomsday/apps/client/src/render/skydrawable.cpp 2021-02-04 13:18:19.000000000 +0000 @@ -118,7 +118,9 @@ { if (world::Material *mat = chooseMaterialForSkyLayer(layer)) { - MaterialAnimator &matAnimator = mat->as().getAnimator(SkyDrawable::layerMaterialSpec(layer.isMasked())); + MaterialAnimator &matAnimator = + mat->as() + .getAnimator(SkyDrawable::layerMaterialSpec(layer.isMasked())); // Ensure we've up to date info about the material. matAnimator.prepare(); diff -Nru doomsday-server-stable-2.3.0.3651+groovy/doomsday/apps/client/src/world/base/convexsubspace.cpp doomsday-server-stable-2.3.1.3685+groovy/doomsday/apps/client/src/world/base/convexsubspace.cpp --- doomsday-server-stable-2.3.0.3651+groovy/doomsday/apps/client/src/world/base/convexsubspace.cpp 2021-01-01 01:44:15.000000000 +0000 +++ doomsday-server-stable-2.3.1.3685+groovy/doomsday/apps/client/src/world/base/convexsubspace.cpp 2021-02-04 13:18:19.000000000 +0000 @@ -61,8 +61,6 @@ Polyobjs polyobjs; ///< Linked polyobjs (not owned). #ifdef __CLIENT__ - Vector2d worldGridOffset; ///< For aligning the materials to the map space grid. - typedef QSet Lumobjs; Lumobjs lumobjs; ///< Linked lumobjs (not owned). @@ -167,11 +165,6 @@ , d(new Impl(this)) { d->poly = &convexPolygon; -#ifdef __CLIENT__ - // Determine the world grid offset. - d->worldGridOffset = Vector2d(fmod(poly().bounds().minX, 64), - fmod(poly().bounds().maxY, 64)); -#endif poly().setMapElement(this); setBspLeaf(bspLeaf); } @@ -301,11 +294,6 @@ #ifdef __CLIENT__ -Vector2d const &ConvexSubspace::worldGridOffset() const -{ - return d->worldGridOffset; -} - dint ConvexSubspace::shadowLineCount() const { return d->shadowLines.count(); diff -Nru doomsday-server-stable-2.3.0.3651+groovy/doomsday/apps/libdoomsday/net.dengine.base.pack/Info doomsday-server-stable-2.3.1.3685+groovy/doomsday/apps/libdoomsday/net.dengine.base.pack/Info --- doomsday-server-stable-2.3.0.3651+groovy/doomsday/apps/libdoomsday/net.dengine.base.pack/Info 2021-01-01 01:44:15.000000000 +0000 +++ doomsday-server-stable-2.3.1.3685+groovy/doomsday/apps/libdoomsday/net.dengine.base.pack/Info 2021-02-04 13:18:19.000000000 +0000 @@ -1,7 +1,7 @@ # Shared resources for all Doomsday applications title: Doomsday Base -version: 2.3 +version: 2.3.1 license: GPL 3+ tags: core diff -Nru doomsday-server-stable-2.3.0.3651+groovy/doomsday/apps/libdoomsday/src/resource/composite.cpp doomsday-server-stable-2.3.1.3685+groovy/doomsday/apps/libdoomsday/src/resource/composite.cpp --- doomsday-server-stable-2.3.0.3651+groovy/doomsday/apps/libdoomsday/src/resource/composite.cpp 2021-01-01 01:44:15.000000000 +0000 +++ doomsday-server-stable-2.3.1.3685+groovy/doomsday/apps/libdoomsday/src/resource/composite.cpp 2021-02-04 13:18:19.000000000 +0000 @@ -284,7 +284,10 @@ if (geom.top() < 0) geom.setTop(0); if (geom.height() > int(pctex->d->logicalDimensions.y)) { - pctex->d->dimensions.y = geom.height(); + // BUG: Why not update both logical dimensions and pixel dimensions? Are these + // only intended to be different if there are more than 1 pixel per logical unit? + + /*pctex->d->logicalDimensions.y = */pctex->d->dimensions.y = geom.height(); } if (!foundComponentCount) diff -Nru doomsday-server-stable-2.3.0.3651+groovy/doomsday/apps/libdoomsday/src/resource/textures.cpp doomsday-server-stable-2.3.1.3685+groovy/doomsday/apps/libdoomsday/src/resource/textures.cpp --- doomsday-server-stable-2.3.0.3651+groovy/doomsday/apps/libdoomsday/src/resource/textures.cpp 2021-01-01 01:44:15.000000000 +0000 +++ doomsday-server-stable-2.3.1.3685+groovy/doomsday/apps/libdoomsday/src/resource/textures.cpp 2021-02-04 13:18:19.000000000 +0000 @@ -267,7 +267,7 @@ // Ensure the offset is within valid range. if (offset < 0 || unsigned(offset) < unsigned(definitionCount) * sizeof(offset) || - dsize(offset) > reader.source()->size()) + dsize(offset) > reader.source()->size()) { LOG_RES_WARNING("Ignoring definition #%i: invalid offset %i") << i << offset; } @@ -474,9 +474,22 @@ try { - TextureManifest &manifest = - self().declareTexture(uri, flags, def.logicalDimensions(), - Vector2i(), def.origIndex()); + // BUG: See IssueID #2446 -- The SKY* patches in Heretic are 200 pixels tall + // even though the texture is declared as 128 pixels tall. The extra height + // is supposed to make the sky extend upward to facilitate looking up. + // However, for some reason only Composite::dimensions() is updated to account for + // this extended height, and not Composite::logicalDimensions(). If both are + // updated, skyfix walls appear as black in DOOM (for an unknown reason). + // Therefore, apply a hacky workaround that uses the true composite dimensions + // for sky textures only. + + TextureManifest &manifest = self().declareTexture( + uri, + flags, + def.percentEncodedName().beginsWith("SKY") ? def.dimensions() + : def.logicalDimensions(), + Vec2i(), + def.origIndex()); // Are we redefining an existing texture? if (manifest.hasTexture()) diff -Nru doomsday-server-stable-2.3.0.3651+groovy/doomsday/apps/plugins/common/src/world/player.cpp doomsday-server-stable-2.3.1.3685+groovy/doomsday/apps/plugins/common/src/world/player.cpp --- doomsday-server-stable-2.3.0.3651+groovy/doomsday/apps/plugins/common/src/world/player.cpp 2021-01-01 01:44:15.000000000 +0000 +++ doomsday-server-stable-2.3.1.3685+groovy/doomsday/apps/plugins/common/src/world/player.cpp 2021-02-04 13:18:19.000000000 +0000 @@ -304,7 +304,7 @@ trajectory = Slope::fromVec(Matrix4f::rotate(angles.x, up) * Matrix4f::rotate(angles.y, side) * front); - *angle = angle_t(trajectory.angle / DD_PI * ANG180); + *angle = int(trajectory.angle / DD_PI * ANG180); *slope = trajectory.slope; } @@ -775,7 +775,7 @@ void P_Thrust3D(player_t *player, angle_t angle, float lookdir, coord_t forwardMove, coord_t sideMove) { - angle_t pitch = LOOKDIR2DEG(lookdir) / 360 * ANGLE_MAX; + angle_t pitch = int(LOOKDIR2DEG(lookdir) / 360 * ANGLE_MAX); angle_t sideangle = angle - ANG90; mobj_t *mo = player->plr->mo; coord_t zmul, mom[3]; diff -Nru doomsday-server-stable-2.3.0.3651+groovy/doomsday/apps/plugins/heretic/defs/heretic/skies.ded doomsday-server-stable-2.3.1.3685+groovy/doomsday/apps/plugins/heretic/defs/heretic/skies.ded --- doomsday-server-stable-2.3.0.3651+groovy/doomsday/apps/plugins/heretic/defs/heretic/skies.ded 2021-01-01 01:44:15.000000000 +0000 +++ doomsday-server-stable-2.3.1.3685+groovy/doomsday/apps/plugins/heretic/defs/heretic/skies.ded 2021-02-04 13:18:19.000000000 +0000 @@ -8,11 +8,12 @@ Sky { ID = "sky1"; - Height = 0.6; - Horizon offset = -0.105; + Height = 0.75; + Horizon offset = 0; Layer 1 { Flags = enable; Material = "textures:SKY1"; + Color limit = 0.1; }; } diff -Nru doomsday-server-stable-2.3.0.3651+groovy/doomsday/apps/plugins/importidtech1/src/mapinfotranslator.cpp doomsday-server-stable-2.3.1.3685+groovy/doomsday/apps/plugins/importidtech1/src/mapinfotranslator.cpp --- doomsday-server-stable-2.3.0.3651+groovy/doomsday/apps/plugins/importidtech1/src/mapinfotranslator.cpp 2021-01-01 01:44:15.000000000 +0000 +++ doomsday-server-stable-2.3.1.3685+groovy/doomsday/apps/plugins/importidtech1/src/mapinfotranslator.cpp 2021-02-04 13:18:19.000000000 +0000 @@ -1519,6 +1519,10 @@ { os << "\n Flags = " + allFlags.join(" | ") + ";"; } + if (DoomsdayApp::game().id().beginsWith("hexen")) + { + os << "\n Sky height = 0.75;\n"; + } de::Uri skyLayer1MaterialUri(info.gets(doubleSky? "sky2Material" : "sky1Material"), RC_NULL); if(!skyLayer1MaterialUri.path().isEmpty()) { diff -Nru doomsday-server-stable-2.3.0.3651+groovy/doomsday/cmake/Version.cmake doomsday-server-stable-2.3.1.3685+groovy/doomsday/cmake/Version.cmake --- doomsday-server-stable-2.3.0.3651+groovy/doomsday/cmake/Version.cmake 2021-01-01 01:44:15.000000000 +0000 +++ doomsday-server-stable-2.3.1.3685+groovy/doomsday/cmake/Version.cmake 2021-02-04 13:18:19.000000000 +0000 @@ -1,6 +1,6 @@ set (DENG_VERSION_MAJOR 2) set (DENG_VERSION_MINOR 3) -set (DENG_VERSION_PATCH 0) +set (DENG_VERSION_PATCH 1) set (DENG_VERSION ${DENG_VERSION_MAJOR}.${DENG_VERSION_MINOR}.${DENG_VERSION_PATCH}) if (DEFINED DENG_BUILD) @@ -23,7 +23,7 @@ Stable ) -set (DENG_TEAM_COPYRIGHT "Copyright (c) 2003-2020 Deng Team") +set (DENG_TEAM_COPYRIGHT "Copyright (c) 2003-2021 Deng Team") # Build Configuration -------------------------------------------------------- diff -Nru doomsday-server-stable-2.3.0.3651+groovy/doomsday/doc/doomsday.6 doomsday-server-stable-2.3.1.3685+groovy/doomsday/doc/doomsday.6 --- doomsday-server-stable-2.3.0.3651+groovy/doomsday/doc/doomsday.6 2021-01-01 01:44:15.000000000 +0000 +++ doomsday-server-stable-2.3.1.3685+groovy/doomsday/doc/doomsday.6 2021-02-04 13:18:19.000000000 +0000 @@ -1,5 +1,5 @@ .\" manual page generated by Amethyst (mdoc+tbl) -.Dd tammikuuta 1, 2021 +.Dd helmikuuta 4, 2021 .Os .Dt "DOOMSDAY" 6 .Sh NAME diff -Nru doomsday-server-stable-2.3.0.3651+groovy/doomsday/doc/doomsday-server.6 doomsday-server-stable-2.3.1.3685+groovy/doomsday/doc/doomsday-server.6 --- doomsday-server-stable-2.3.0.3651+groovy/doomsday/doc/doomsday-server.6 2021-01-01 01:44:15.000000000 +0000 +++ doomsday-server-stable-2.3.1.3685+groovy/doomsday/doc/doomsday-server.6 2021-02-04 13:18:19.000000000 +0000 @@ -1,5 +1,5 @@ .\" manual page generated by Amethyst (mdoc+tbl) -.Dd tammikuuta 1, 2021 +.Dd helmikuuta 4, 2021 .Os .Dt "DOOMSDAY-SERVER" 6 .Sh NAME diff -Nru doomsday-server-stable-2.3.0.3651+groovy/doomsday/doc/doomsday-shell-text.6 doomsday-server-stable-2.3.1.3685+groovy/doomsday/doc/doomsday-shell-text.6 --- doomsday-server-stable-2.3.0.3651+groovy/doomsday/doc/doomsday-shell-text.6 2021-01-01 01:44:15.000000000 +0000 +++ doomsday-server-stable-2.3.1.3685+groovy/doomsday/doc/doomsday-shell-text.6 2021-02-04 13:18:19.000000000 +0000 @@ -1,5 +1,5 @@ .\" manual page generated by Amethyst (mdoc+tbl) -.Dd tammikuuta 1, 2021 +.Dd helmikuuta 4, 2021 .Os .Dt "DOOMSDAY-SHELL-TEXT" 6 .Sh NAME diff -Nru doomsday-server-stable-2.3.0.3651+groovy/doomsday/sdk/liblegacy/include/de/binangle.h doomsday-server-stable-2.3.1.3685+groovy/doomsday/sdk/liblegacy/include/de/binangle.h --- doomsday-server-stable-2.3.0.3651+groovy/doomsday/sdk/liblegacy/include/de/binangle.h 2021-01-01 01:44:15.000000000 +0000 +++ doomsday-server-stable-2.3.1.3685+groovy/doomsday/sdk/liblegacy/include/de/binangle.h 2021-02-04 13:18:19.000000000 +0000 @@ -35,63 +35,63 @@ #if BAMS_BITS == 32 typedef uint32_t binangle_t; -# define BANG_TO_ANGLE(bang) ((angle_t)bang) +# define BANG_TO_ANGLE(bang) ((angle_t)(bang)) #elif BAMS_BITS == 16 typedef uint16_t binangle_t; -# define BANG_TO_ANGLE(bang) ((angle_t)bang << 16) +# define BANG_TO_ANGLE(bang) ((angle_t)(bang) << 16) #else typedef unsigned char binangle_t; -# define BANG_TO_ANGLE(bang) ((angle_t)bang << 24) +# define BANG_TO_ANGLE(bang) ((angle_t)(bang) << 24) #endif -#define ANGLE_TO_BANG(angle) ((binangle_t)((angle_t)angle >> BAMS_BITS)) +#define ANGLE_TO_BANG(angle) ((binangle_t)((angle_t)(angle) >> BAMS_BITS)) #if BAMS_BITS == 32 // Some predefined angles. -#define BANG_0 0 // To the east. -#define BANG_45 0x20000000 // To the northeast. -#define BANG_90 0x40000000 // To the north. -#define BANG_135 0x60000000 // To the northwest. -#define BANG_180 0x80000000 // To the west. -#define BANG_225 0xa0000000 // To the southwest. -#define BANG_270 0xc0000000 // To the south. -#define BANG_315 0xe0000000 // To the southeast. -#define BANG_360 0x100000000 // Actually the same as angle 0. -#define BANG_MAX 0xffffffff // The largest possible angle. +#define BANG_0 0u // To the east. +#define BANG_45 0x20000000u // To the northeast. +#define BANG_90 0x40000000u // To the north. +#define BANG_135 0x60000000u // To the northwest. +#define BANG_180 0x80000000u // To the west. +#define BANG_225 0xa0000000u // To the southwest. +#define BANG_270 0xc0000000u // To the south. +#define BANG_315 0xe0000000u // To the southeast. +#define BANG_360 0x100000000u // Actually the same as angle 0. +#define BANG_MAX 0xffffffffu // The largest possible angle. #elif BAMS_BITS == 16 // Some predefined angles. -#define BANG_0 0 // To the east. -#define BANG_45 0x2000 // To the northeast. -#define BANG_90 0x4000 // To the north. -#define BANG_135 0x6000 // To the northwest. -#define BANG_180 0x8000 // To the west. -#define BANG_225 0xa000 // To the southwest. -#define BANG_270 0xc000 // To the south. -#define BANG_315 0xe000 // To the southeast. -#define BANG_360 0x10000 // Actually the same than angle 0. -#define BANG_MAX 0xffff // The largest possible angle. +#define BANG_0 ((binangle_t) 0) // To the east. +#define BANG_45 ((binangle_t) 0x2000) // To the northeast. +#define BANG_90 ((binangle_t) 0x4000) // To the north. +#define BANG_135 ((binangle_t) 0x6000) // To the northwest. +#define BANG_180 ((binangle_t) 0x8000) // To the west. +#define BANG_225 ((binangle_t) 0xa000) // To the southwest. +#define BANG_270 ((binangle_t) 0xc000) // To the south. +#define BANG_315 ((binangle_t) 0xe000) // To the southeast. +#define BANG_360 0x10000u +#define BANG_MAX ((binangle_t) 0xffff) // The largest possible angle. #else // Byte-sized. // Some predefined angles. -#define BANG_0 0 // To the east. -#define BANG_45 0x20 // To the northeast. -#define BANG_90 0x40 // To the north. -#define BANG_135 0x60 // To the northwest. -#define BANG_180 0x80 // To the west. -#define BANG_225 0xa0 // To the southwest. -#define BANG_270 0xc0 // To the south. -#define BANG_315 0xe0 // To the southeast. -#define BANG_360 0x100 // Actually the same than angle 0. -#define BANG_MAX 0xff // The largest possible angle. +#define BANG_0 ((binangle_t) 0) // To the east. +#define BANG_45 ((binangle_t) 0x20) // To the northeast. +#define BANG_90 ((binangle_t) 0x40) // To the north. +#define BANG_135 ((binangle_t) 0x60) // To the northwest. +#define BANG_180 ((binangle_t) 0x80) // To the west. +#define BANG_225 ((binangle_t) 0xa0) // To the southwest. +#define BANG_270 ((binangle_t) 0xc0) // To the south. +#define BANG_315 ((binangle_t) 0xe0) // To the southeast. +#define BANG_360 ((binangle_t) 0x100) // Actually the same than angle 0. +#define BANG_MAX ((binangle_t) 0xff) // The largest possible angle. #endif #define BAMS_PI 3.14159265359 -#define RAD2BANG(x) ((binangle_t)((x)/BAMS_PI*BANG_180)) +#define RAD2BANG(x) ((binangle_t)((int)((x)/BAMS_PI*BANG_180))) #define BANG2RAD(x) ((float)((x)/(float)BANG_180*BAMS_PI)) #define BANG2DEG(x) ((float)((x)/(float)BANG_180*180)) diff -Nru doomsday-server-stable-2.3.0.3651+groovy/doomsday/sdk-qch.doxy doomsday-server-stable-2.3.1.3685+groovy/doomsday/sdk-qch.doxy --- doomsday-server-stable-2.3.0.3651+groovy/doomsday/sdk-qch.doxy 2021-01-01 01:44:15.000000000 +0000 +++ doomsday-server-stable-2.3.1.3685+groovy/doomsday/sdk-qch.doxy 2021-02-04 13:18:19.000000000 +0000 @@ -6,7 +6,7 @@ GENERATE_QHP = YES QCH_FILE = "doomsday.qch" QHP_NAMESPACE = "net.dengine.sdk.200" -QHP_VIRTUAL_FOLDER = "doomsday-2.3.0" +QHP_VIRTUAL_FOLDER = "doomsday-2.3.1" QHG_LOCATION = "../build/scripts/qhelp.py" # Dynamic HTML doesn't work inside Qt Creator Binary files /tmp/tmpWLWkYO/3j_DkkoyG3/doomsday-server-stable-2.3.0.3651+groovy/doomsday/tools/shell/res/macx/English.lproj/InfoPlist.strings and /tmp/tmpWLWkYO/K6zLGxja29/doomsday-server-stable-2.3.1.3685+groovy/doomsday/tools/shell/res/macx/English.lproj/InfoPlist.strings differ diff -Nru doomsday-server-stable-2.3.0.3651+groovy/.gitignore doomsday-server-stable-2.3.1.3685+groovy/.gitignore --- doomsday-server-stable-2.3.0.3651+groovy/.gitignore 2021-01-01 01:44:15.000000000 +0000 +++ doomsday-server-stable-2.3.1.3685+groovy/.gitignore 2021-02-04 13:18:19.000000000 +0000 @@ -9,6 +9,7 @@ macx_release_build /doomsday/build/win32/license.txt *.user.* +*.txt.user *-build-* *-build build-* @@ -41,4 +42,3 @@ /products /debian .vsbuild -