Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-12-24 12:03:36 +00:00
Code Issues Projects Releases Packages Wiki Activity
5124 commits 10 branches 176 tags 1 GiB
Commit graph

5124 commits

This branch
This branch
All branches
Author SHA1 Message Date
Richard Davey
837d3cba46 Merge pull request #2505 from gotenxds/ReverseAnimation 
Added a reverse functionality to animations.
 2016-06-02 15:01:57 +01:00
Richard Davey
f67d304e99 Merge pull request #2504 from Nuuf/master 
added functions for getting closest child and farthest child
 2016-06-02 14:58:09 +01:00
Richard Davey
3f13fd17fc Merge pull request #2518 from cryptographer/dev 
dry mobile template
 2016-06-02 14:54:17 +01:00
Richard Davey
56cc7dc155 Merge pull request #2519 from TadejZupancic/patch-1 
Fixing measurement of text width that produced too narrow canvas
 2016-06-02 14:53:17 +01:00
Richard Davey
d18c591c15 Merge pull request #2499 from kevinleedrum/2496 
Fixing issue #2496: Wrapped BitmapText not centering
 2016-06-02 14:51:09 +01:00
Richard Davey
e4d56175ab Merge pull request #2514 from VitaZheltyakov/dev 
Corrected intersects fuction
 2016-06-02 14:49:04 +01:00
Richard Davey
752e3ea6ef Merge pull request #2511 from PigeonT/dev 
bugfix, in Class Graphics, the method generateTexture should return t…
 2016-06-02 14:47:46 +01:00
TadejZupancic
317c85db90 Fixing measurement of text width that produced too narrow canvas 
When using a style on characters (e.g. addColor), the length of the whole line with default style was measured ignoring the different width of the characters with added style. 

I've included the measureLine function, which does the same measurements as updateLine, but it does not render the line to canvas - it only returns the line length.

Now this function is used for measuring line of text if some style is added to it.
 2016-06-02 11:10:40 +02:00
cryptographer
274f52f169 dry mobile template 2016-06-01 17:05:42 -04:00
gotenxds
7fc34c117c Reverse and reverseOnce will now return the animation to allow linking. 2016-05-31 20:29:02 +03:00
gotenxds
b34860c89b Reverse and reverseOnce will now return the animation to allow linking. 2016-05-31 20:27:55 +03:00
Vitaliy
cd3742f9f2 Corrected intersects fuction 
Added protection against incorrect handling collisions. Clashes with the body itself will not be processed.
 2016-05-31 01:18:17 +03:00
pigeonT
93c0cf378f bugfix, in Class Graphics, the method generateTexture should return type RenderTexture, but not current Texture. When use typescript to compile, there is a Error: Type 'Texture' is not assignable to type 'RenderTexture'. 2016-05-29 23:36:18 +02:00
Gustav
5a1cb006ec beautified 2016-05-28 00:27:35 +02:00
gotenxds
d243da7a1b Small fix, should check for -1 not 0 2016-05-27 21:37:56 +03:00
gotenxds
ae3ebf00cd Added typescript defs; Fixed jshint. 2016-05-27 18:04:33 +03:00
gotenxds
d4636e9e81 Added a reverseOnce method. 2016-05-27 17:58:54 +03:00
gotenxds
b0c4f3bc4c Added a convenient function. 2016-05-27 17:48:06 +03:00
gotenxds
bb7cbb36f6 If animation is reversed it should start from last frame. 2016-05-27 17:43:36 +03:00
gotenxds
2c752a25c2 Deleted whitespace. 2016-05-27 15:55:46 +03:00
John Doe
911d345571 Merge remote-tracking branch 'origin/ReverseAnimation' into ReverseAnimation 
Conflicts:
	src/animation/Animation.js
	typescript/phaser.comments.d.ts
	typescript/phaser.d.ts
 2016-05-27 15:46:57 +03:00
John Doe
ce17ac9902 Added a reverse functionality to animations. 2016-05-27 15:44:32 +03:00
John Doe
11805b311d Added a reverse functionality to animations. 2016-05-27 02:24:23 +03:00
Gustav
5b4b41c958 added functions for getting closest child and farthest child 2016-05-26 21:51:56 +02:00
Pete Baron
9450cecbe3 Progress update. 2016-05-26 14:13:18 +12:00
Pete Baron
0904e386de Use firstgid (TODO: assumes tileset 0 currently, needs to calculate the correct tileset) to fix the 'out by one' tilemap example errors. 
Handle empty VBO case, and make sure we only drawArrays the correct number of vertices (to fix the large corrupt block in the top-right corner of many example demos).
 2016-05-26 14:13:07 +12:00
Pete Baron
0dd3610ee4 Minor optimisation in TilemapLayerGL to remove unnecessary loop. 2016-05-26 14:10:45 +12:00
kevinleedrum
c1a2970488 Fixing issue #2496: Wrapped BitmapText not centering 2016-05-24 09:09:38 -04:00
photonstorm
027725e702 Defs update. 2016-05-24 02:31:07 +01:00
photonstorm
07ef075e92 Phaser.Line.intersectsRectangle checks for intersection between a Line and a Rectangle, or any Rectangle-like object such as a Sprite or Body. 2016-05-24 02:30:00 +01:00
photonstorm
c1c2e6bc9d Removed left-over Body.isCircle checks. 2016-05-23 23:02:04 +01:00
photonstorm
d8d0c8ac65 2.4.9 build files. 2016-05-23 13:18:30 +01:00
photonstorm
e974ff4ee9 Removed Circle functions and updated setSize docs. 2016-05-23 13:16:21 +01:00
photonstorm
9b9e398c73 InputHandler.checkPointerDown had an incorrect single pipe character |, instead of an OR check ||, and an isDown check, causing Button Over events to fail (thanks @pengchuan #2486) 2016-05-23 13:03:11 +01:00
photonstorm
16e9acac84 Updated Body.reset call. 2016-05-23 12:54:41 +01:00
photonstorm
8743e8952c Reverted worldScale calculation. 2016-05-23 12:54:33 +01:00
photonstorm
09dd84565e Arcade Physics Body incorrectly positioned if the Sprite had a negative scale (see http://www.html5gamedevs.com/topic/22695-247-248-body-anchoring-any-migration-tips/) (thanks @SBCGames @icameron @Nuuf @EvolViper #2488 #2490) 2016-05-23 12:46:01 +01:00
Richard Davey
07e2edc651 Merge pull request #2495 from monagames/ts-colormatrix-filter-fix 
Ts colormatrix filter fix
 2016-05-23 12:39:22 +01:00
Richard Davey
06bd29662a Merge pull request #2491 from monagames/systemjs-ts-fixes 
Fixes for typescript declarations with system.js
 2016-05-23 12:34:50 +01:00
Richard Davey
6fb0ee4f63 Merge pull request #2489 from wingyplus/pixi-d-ts 
typescript/pixi.d.ts: Add `padding` to Graphics.generateTexture
 2016-05-23 12:33:53 +01:00
photonstorm
7844ad927c Preparing for 2.4.9 dev. 2016-05-23 12:32:37 +01:00
Pete Baron
5b6e157a43 Progress update. 2016-05-23 21:22:00 +12:00
Pete Baron
a9bf339efd Fully working sci-fly demo using a single gl draw to blit all of the tiles at once. Theoretically extremely fast (requires testing). Works here in FireFox and Chrome at 60 fps on an i7 4770 with Nvidia 780 GTX drawing typically 1989 tiles per frame. 2016-05-23 21:09:13 +12:00
Pete Baron
1b7eaadd06 First (nearly) working batch drawing test. Instead of pushing rectangles as pairs of triangles individually, this version creates a vertex buffer object for all visible tile rectangles, with degenerate triangles separating each one from the next. The drawing is done by a single call to gl.drawArrays. 
Bizarrely, this version still chokes in Firefox, implying that the previous demo's horrible performance was not down to the GPU blocking as the rectangles are sent to it.

The test is not fully working because it does not scroll the drawing position. So instead of the map moving when you hit a scroll boundary, it simply stops drawing the top or left edges as the scroll region moves away from the visible window.  It's an easy fix, but I think I'll leave it until I find out exactly why Firefox still chokes on this demo.

Progress text file updated with latest experiments and progress today.
 2016-05-23 17:48:54 +12:00
monagames
2fee58fefc Fixed typescript definitions for PIXI ColorMatrixFilter 2016-05-22 09:58:10 +02:00
monagames
12397377ab Fixes for typescript declarations with system.js 2016-05-21 20:22:40 +02:00
Thanabodee Charoenpiriyakij
1387aaa055 typescript/pixi.d.ts: Add padding to Graphics.generateTexture 2016-05-21 14:12:37 +07:00
photonstorm
d1234d1685 Preparing for 2.5.0 dev. 2016-05-19 13:45:51 +01:00
photonstorm
9f28d0659d Phaser 2.4.8 release. 2016-05-19 12:36:51 +01:00
Richard Davey
0bf2f985af Merge pull request #2483 from zeterain/patch-6 
Update Documentation in Game.js
 2016-05-19 11:59:48 +01:00