Terncode/pixel.horse
1
0
Fork 0
mirror of https://github.com/Terncode/pixel.horse.git synced 2026-09-24 21:55:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'archive' into archive-update-v0.54.0

Browse Source
This commit is contained in:
Eliot Partridge
2019-09-21 22:48:14 -05:00
parent 857ceaa878 895627a641
commit 45affd3ef4
18 changed files with 62 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ts/client/credits.ts
+2
View File
@@ -127,6 +127,8 @@ export const CONTRIBUTORS: Contributors[] = [
{ name: 'SC', links: ['https://0somecunt0.tumblr.com/tagged/sfw'] },
{ name: 'SailorDolpin', links: ['https://vk.com/id324582699'] },
{ name: 'Deeraw', links: ['https://www.deviantart.com/deerdraw', 'https://twitter.com/TheOnlyDeeraw'] },
{ name: 'Aviivix' },
{ name: 'SnowFl8keAnge1' },
],
},
];
src/ts/client/draw.ts
+1
View File
@@ -27,6 +27,7 @@ function drawEntities(batch: PaletteSpriteBatch, entities: Entity[], camera: Cam
batch.depth = depth;
if (entity.type === PONY_TYPE) {
batch.depth = -batch.depth;
drawPonyEntity(batch, entity as Pony, options);
entitiesDrawn++;
} else if (entity.draw !== undefined) {
src/ts/client/game.ts
+2 -2
View File
@@ -1740,8 +1740,8 @@ export class PonyTownGame implements Game {
} else {
disposeFrameBuffer(gl, frameBuffer);
disposeFrameBuffer(gl, frameBuffer2);
createFrameBuffer(gl, frameBuffer, width, height, false, useDepthBuffer, null);
createFrameBuffer(gl, frameBuffer2, width, height, false, false, frameBuffer.depthStencilRenderbuffer);
createFrameBuffer(gl, frameBuffer, width, height, useDepthBuffer, null);
createFrameBuffer(gl, frameBuffer2, width, height, false, frameBuffer.depthStencilRenderbuffer);
}
}
}
src/ts/client/webgl.ts
+2 -2
View File
@@ -66,8 +66,8 @@ export function initWebGLResources(gl: WebGLRenderingContext, paletteManager: Pa
gl.disable(gl.DITHER);
try {
createFrameBuffer(gl, frameBuffer, camera.w, camera.h, false, true, null);
createFrameBuffer(gl, frameBuffer2, camera.w, camera.h, true, false, frameBuffer.depthStencilRenderbuffer);
createFrameBuffer(gl, frameBuffer, camera.w, camera.h, true, null);
createFrameBuffer(gl, frameBuffer2, camera.w, camera.h, false, frameBuffer.depthStencilRenderbuffer);
} catch (e) {
DEVELOPMENT && console.warn(e);
failedFBO = true;