Felipe Alfonso
1755bfd779
Merge branch 'dev' into multitexture-gl
2016-07-21 21:51:14 -04:00
Felipe Alfonso
44774d648e
Final implementation related to multi texture batching
2016-07-21 21:49:29 -04:00
Richard Davey
f669202fb4
Loads of refactoring. Removed the internal layer creation, added in first/last gid detection, sorted out multiple identical layer creation.
2016-07-22 02:39:35 +01:00
Richard Davey
9eff79f2c2
Phaser.Tileset has a new property lastgid which is populated automatically by the TilemapParser when importing Tiled map data, or can be set manually if building your own tileset.
2016-07-22 02:35:33 +01:00
Richard Davey
91e7b2ca9c
Updated properties.
2016-07-22 00:30:55 +01:00
Pete Baron
8c6fec0e97
Apply "half pixel correction" to the source coordinates for tiles when drawing with WebGL.
2016-07-22 11:30:06 +12:00
Richard Davey
8832680aa0
Exposed 'width' and 'height' properties on TilemapLayer, so it can be resized and update all children.
2016-07-22 00:09:31 +01:00
Richard Davey
ed9793e06b
Removed un-needed baseTexture dirty call.
2016-07-21 22:55:10 +01:00
Richard Davey
e384724b28
Doesn't need to extend DoC, can extend DO instead.
2016-07-21 22:54:39 +01:00
photonstorm
6661952d50
Masses of changes to get tilemap layer display dimensions filtering down to linked child layers. Also allowed offset to work correctly, and fixed the display sizes with offset bounds. Exposed offset as layer.x/y. Need to duplicate in canvas variation.
2016-07-21 16:56:17 +01:00
Pete Baron
d994641d52
Don't scale the clip offset value when the layer is scaled.
2016-07-22 00:23:05 +12:00
Pete Baron
3faca89831
oops my bad: rename
2016-07-22 00:12:56 +12:00
Pete Baron
7c2dae0773
Add offset parameter to TilemapLayerGL and use it with clipping to draw a view into a map at a specified location and size in the game window.
2016-07-22 00:02:05 +12:00
Richard Davey
c36babcc1c
Code formatting and docs updates.
2016-07-21 10:45:23 +01:00
Felipe Alfonso
40b4b2dbd0
added multi texture to WebGLFastSpritebatch and Strip (wip)
2016-07-21 01:57:39 -04:00
Pete Baron
aecbd7c267
Add width/height to debug log for new layers.
2016-07-21 17:13:12 +12:00
Pete Baron
29c77e10d7
Send layer width/height to PIXI.Tilemap (previously these were ignored and forgotten after the c'tor).
...
Modify resize to set displayWidth/displayHeight only.
2016-07-21 17:12:46 +12:00
Pete Baron
008de253ce
Add displaywidth/height parameters to PIXI.Tilemap c'tor and save them.
...
Clean up _initWebGL to remove unused GL buffers.
Clean up _renderBatch to remove unused srcWide/srcHigh variables.
Set new Tile Shader's clipping uniform using displayWidth/Height.
2016-07-21 17:10:51 +12:00
Pete Baron
5f55fb095e
Tile shader uses clipping dimensions when drawing.
2016-07-21 17:07:50 +12:00
Pete Baron
42a2608036
Fix createInternalLayer to use the 'base layer' rather than assume this.layers[0] was the base layer for each new one. This makes the multi-tileset, multi-layer demos work correctly.
2016-07-21 16:27:35 +12:00
Pete Baron
37a9f4fa01
Remove console warn for invalid tile index as it was firing incorrectly (when processing a base layer which only uses tiles from another tileset).
2016-07-21 16:26:32 +12:00
Pete Baron
f958567a48
Remove more dead code.
2016-07-21 15:24:05 +12:00
Pete Baron
7454eb0aa0
Add console warning when invalid tile index is used.
2016-07-21 15:23:37 +12:00
Pete Baron
70f95d2558
Remove dead code (commented out).
...
Add flag to detect when an 'internal layer' is not needed (none of the specified tileset is used in the parent layer) and skip creating one.
2016-07-21 14:58:25 +12:00
Pete Baron
f9ff1d10c5
Apply rendersession.offset to the TilemapShader (fixes screen shake).
2016-07-21 14:16:17 +12:00
Richard Davey
5ecdee86c2
Merging in flipped tile support.
2016-07-21 02:32:08 +01:00
Richard Davey
79e135087f
ScaleManager.hasPhaserSetFullScreen is a new boolean that identifies if the browser is in full screen mode or not, and if Phaser was the one that requested it. As it's possible to enter full screen mode outside of Phaser, and it then gets confused about what bounding parent to use.
2016-07-21 02:11:16 +01:00
Filip Nedyalkov
d18f303d28
Fixed formatting to match the general formatting of the code
2016-07-21 03:38:41 +03:00
Filip Nedyalkov
7206453126
Just removed some whitespace I don't remember adding it...
2016-07-21 03:32:41 +03:00
Leopoldo Brines
1e7cd986ee
Check if hidden is available first
2016-07-20 20:04:25 -04:00
Richard Davey
b90d7b28f8
Merge pull request #2654 from leopoldobrines7/fix-function
...
Fix 'TypeError: target.center is undefined'
2016-07-21 00:26:16 +01:00
Filip Nedyalkov
4f21e70852
Fix for PIXI's DisplayObject/DisplayObjectContainer - getting correct dimensions and bounds
...
With the previous fix what the getBounds did was:
1) if targetCoordinateSpace is the same instance as the caller of
getBounds(), then it will return the bounds of the caller without any
transformations;
2) if targetCoordinateSpace is null/undefined it will return the global
bounds of the caller.
3) if targetCoordinateSpace is any valid DisplayObject it will return
the local bounds of the caller.
What this fix does is fixing 3) along with other obsolete code that
wasn't necessary so I reverted it.
So now if the targetCoordinateSpace is a valid DisplayObject:
- if it's a parent of the caller at some level it will return the bounds
relative to it
- if it's not parenting the caller at all it will get global bounds of
it and the caller and will calculate the x and y bounds of the caller
relative to the targetCoordinateSpace DisplayObject
Also I have fixed how empty groups are treated when they have no other
children except groups, so now calculations are correct. They obviously
have 0 width and height but are still being positioned and other things
could possibly relate to that bounds and it didn't make sense to me to
ignore them.
Also added a DisplayObjectContainer.contains(child) method which
determines whether the specified display object is a child of the
DisplayObjectContainer instance or the instance itself. This method is
used in the new getBounds function.
Corrected DisplayObject's default _bounds rect from (0, 0, 1, 1), to (0,
0, 0, 0) - it doesn't seem to break anything and also in the getBounds
before the fix, when there were no children it assigned a (0, 0, 0, 0)
rectangle to it so I am pretty sure it's safe to correct it.
2016-07-21 02:14:10 +03:00
Richard Davey
b9d34ca843
Added debug object back in.
2016-07-20 23:44:41 +01:00
Leopoldo Brines
18472f5998
Fix 'TypeError: target.center is undefined'
2016-07-20 18:34:02 -04:00
Richard Davey
d982003760
Lots more tidying up and adding jsdocs.
2016-07-20 20:06:59 +01:00
Richard Davey
ca6985e2f2
Removed lots of redundant code and tidied up bad formatting.
2016-07-20 19:27:32 +01:00
Richard Davey
7645e773dc
More tidying and jshint fixing.
2016-07-20 17:28:19 +01:00
Richard Davey
82fb296b2a
Code formatting issues.
2016-07-20 17:00:00 +01:00
Richard Davey
49fb798f60
Fixed createInternalLayer loop.
2016-07-20 16:24:06 +01:00
Richard Davey
cff28860fa
The Loader.headers object has a new property requestedWith. By default this is set to false, but it can be used to set the X-Requested-With header to XMLHttpRequest (or any other value you need). To enable this do this.load.headers.requestedWith = 'XMLHttpRequest' before adding anything to the Loader #2398
2016-07-20 12:45:11 +01:00
Richard Davey
60b8d78ab8
Group.align updates.
2016-07-20 12:29:30 +01:00
Richard Davey
0e24b1b946
Docs update.
2016-07-20 12:21:16 +01:00
Richard Davey
b8429b683e
Docs update.
2016-07-20 12:21:16 +01:00
Richard Davey
bd6c91f924
Merge pull request #2651 from calvindavis/dev
...
Fixed optional seeds parameter in RandomDataGenerator's constructor.
2016-07-20 12:11:17 +01:00
Richard Davey
8139d484a3
Merge pull request #2649 from boniatillo-com/boniatillo-com-patch-jsdoc-intersectsRectangle
...
jsdoc fix: complete the Phaser.Line.intersectsRectangle @method tag
2016-07-20 12:10:47 +01:00
Richard Davey
29a2f65922
Merge pull request #2648 from boniatillo-com/jsdoc-fixes
...
jsdoc fix: replace #onTop for #onCeiling
2016-07-20 12:10:20 +01:00
Richard Davey
dc6d3e2680
Merge pull request #2643 from deargle/group-align-documentation-fix
...
fix documentation for group.align -- row and column were swapped
2016-07-20 12:08:22 +01:00
Richard Davey
418c87ea1a
Weapon.autofire wouldn't fire after the first bullet, or until fire was called, neither of which are requirements. If you now set this boolean the Weapon will fire continuously until you toggle it back to false (thanks @alverLopez #2647 )
2016-07-20 11:52:48 +01:00
Richard Davey
1105e4821d
Added more info to console.warn.
2016-07-20 04:53:21 +01:00
Felipe Alfonso
6d21a4ca18
First working example of multi texture support
2016-07-19 23:17:13 -04:00
