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

610 commits

Author SHA1 Message Date
photonstorm
a2b2d558a5 jsdoc and jshint fixes. 2014-04-11 03:02:19 +01:00
photonstorm
fab18dd80d Modified Phaser.Animation.generateFrameNames to make it a static function (fix #701) 2014-04-10 04:31:27 +01:00
Richard Davey
d05ac487c6 Merge pull request #698 from clark-stevenson/patch-1 
generateFrameNames returns string[]
 2014-04-10 04:28:54 +01:00
photonstorm
8c434a83ab Fixed issue with Particles not being updated by the Emitter and rebuilt the dist files. 2014-04-10 04:19:43 +01:00
photonstorm
2f46a9c274 Removed un-used builds. 2014-04-10 01:54:52 +01:00
photonstorm
523a3c5632 Tidied up the Grunt tasks a little to name them more accurately. 
Renamed phaser-no-physics to phaser-arcade-physics, which is far more accurate.
 2014-04-10 01:54:30 +01:00
clark-stevenson
5137834886 generateFrameNames returns string[] 
#697
 2014-04-09 21:05:07 +01:00
photonstorm
50981fd729 Emitter now has minParticleAlpha and maxParticleAlpha values for setting a random alpha on emitted particles. 
Emitter.particleAnchor allows you to control the anchor of emitted Particles. Defaults to 0.5 (same as before) but now under your control.
Emitter now emits Phaser.Particle objects instead of Phaser.Sprites, which can be extended as required.
Emitter has had various local properties removed that were already declared in Phaser.Group which it extends.
 2014-04-09 14:29:23 +01:00
photonstorm
8fc2a465cd New Phaser package, small docs updates and preparing P2.World for new bounds code and v0.5.0 migration. 2014-04-08 03:31:13 +01:00
photonstorm
451f68be96 Updated p2 to 6abc900ff9 (which has probably broken stuff, but we'll test it tomorrow). 2014-04-08 03:30:45 +01:00
clark-stevenson
d319cd8cb3 Update phaser.d.ts 
Updated for last week of dev.
 2014-04-03 20:13:35 +01:00
photonstorm
4d06298e64 Fixed silly SoundManager bug :) 2014-04-01 19:51:48 +01:00
photonstorm
f4dc686028 New build files for testing. 2014-04-01 16:13:00 +01:00
photonstorm
fca1bd97fd New build to test state change in. Also various Gruntfile fixes that arose from the tasks split. 2014-04-01 03:02:36 +01:00
clark-stevenson
6041c137af Small additions from the past week. 2014-03-28 16:58:23 +00:00
photonstorm
5b73bb21bb Sprite would glitch if it had an ArcadePhysics Body that was re-positioned out of loop. 
Sprite would "fly off" if it had an ArcadePhysics Body that was re-positioned during an input handler.
Newly generated docs
 2014-03-28 01:42:49 +00:00
photonstorm
953ae83350 Updated TS defs (fix #650) 2014-03-26 13:24:11 +00:00
photonstorm
75cc6a7365 Added World.setBounds to the TypeScript defs (fix #649) 2014-03-26 11:00:15 +00:00
keyle
163d8fa964 Fixed typo in typescript defs 2014-03-26 19:05:36 +10:00
photonstorm
344ab46d78 Line.fromSprite now sets "fromCenter" to false by default as Sprite.center is deprecated in 2.x. Documentation and Examples updated to reflect this. 2014-03-25 12:44:20 +00:00
photonstorm
87a0fb86b8 All Timer events are now increased by the game time on start. 2014-03-24 12:15:14 +00:00
photonstorm
622957c9b0 Timer objects incorrectly set the first tick value on events if you added the events prior to starting them. 2014-03-24 02:25:35 +00:00
photonstorm
26a89f0b84 New build files with tilemap callback fixes in. 2014-03-24 01:39:09 +00:00
photonstorm
49bcd2edd2 Tilemap fixes. 2014-03-24 00:30:05 +00:00
clark-stevenson
daaa99216f Few updates 2014-03-21 23:59:44 +00:00
clark-stevenson
1f37a4e1f5 Update phaser.d.ts 
Final one, I went through the source code this time so I know its 99% matching your latest commit brining it upto par with 2 completely.

Congratulations on reaching 2! Phaser is amazing, and without the well documented code, I would be stumped.
 2014-03-20 11:07:37 +00:00
photonstorm
634b1d1093 Emitter.friction property removed and replaced with Emitter.particleDrag, which is now correctly applied. 
ArcadePhysics.Body.reset incorrectly set the Body.rotation to Sprite.rotation instead of angle.
Emitter.emitParticle resets the rotation on the particle to zero before emitting it.
Lots of fixes to the TypeScript definitions file (thanks as always to clark-stevenson for his tireless work on these)
Emitters now bring the particle they are about to emit to the top of the Group before doing so. Avoids particles hidden behind others.
ArcadePhysics.Body.setSize corrected to take the parameters as positive, not negative values.
ArcadePhysics.Body now checks the Sprite scale automatically and adjusts the body size accordingly (fix #608)
Emitter.particleClass can now be set to any object that extends Phaser.Sprite, which will be emitted instead of a regular Sprite.
 2014-03-20 03:48:54 +00:00
Richard Davey
c3778be394 Merge pull request #607 from clark-stevenson/patch-1 
Update phaser.d.ts
 2014-03-20 00:21:05 +00:00
photonstorm
684ee9c064 ArcadePhysics.Body has a deltaMax object, which allows you to cap the delta applied to the position to +- this value. 
ArcadePhysics.Body now checks the Sprite scale automatically and adjusts the body size accordingly (fix #608)
 2014-03-20 00:20:02 +00:00
clark-stevenson
7ab37a82f4 Update phaser.d.ts 
SAT removed
Physics modules should all be updated correctly #599 
Misc updates from the last week of dev. 

So the TS is upto date and it should be easy to maintain with the latest changes. 

The only thing that bothers me is the historic references to <2.0 and the pre-pixi "any". That kind of thing will be my next update.

My final questions though are these!

1) displayObject: any  can this now be considered PIXI.DisplayObject or should I keep "any"?

2) When an argument can either be a string or a number. Are you stuck with "any" or is there a concept I am missing in TypeScript? It is the same with stuff like "p2.Constraint". In this situation, is it wise to create an IConstraint which all constraints implement, rather than having "any" or is that just even more confusing?

I would like my next pass through to be as acceptable as possible.
 2014-03-19 15:09:44 +00:00
photonstorm
22b472ba4d Removed rogue console.log 2014-03-19 13:23:46 +00:00
photonstorm
2d08fab48e When creating a Sprite (via Group.create or directly) with exists = false and a P2 body, the body is not added to the world. 
Every Input class now checks to see if it has already been started. If so it doesn't add the listeners again unless they have been nulled.
 2014-03-19 13:22:04 +00:00
photonstorm
4bfbd4dc96 2.0.1-19 build files. 2014-03-19 12:12:59 +00:00
photonstorm
5d40365b87 InputHandler.dragFromCenter will now work regardless of the anchor point of the Sprite. 2014-03-19 05:21:26 +00:00
photonstorm
84df7bf320 Sprite.events.onEnterBounds added. This is dispatched if the Sprite leaves the bounds but then returns. The opposite of onOutOfBounds. 2014-03-19 04:17:37 +00:00
photonstorm
2cc1a45f9a Fixed SpriteBounds camera placement in Debug (again). 
Removed un-needed cache vars from ArcadePhysics.World.
Tidied up ArcadePhysics.Body and fixed rotation parameters.
Every single Arcade Physics Example now runs perfectly under this release.
 2014-03-19 03:55:44 +00:00
photonstorm
9490041c79 ArcadePhysics.separate doesn't pass over to seperateX/Y if overlapOnly is true (fix #604) 
ArcadePhysics.collideSpriteVsSprite checks if both objects have bodies before processing.
 2014-03-19 02:05:29 +00:00
photonstorm
df4debf2a6 Build update for testing. 2014-03-19 00:57:10 +00:00
photonstorm
8010d245f1 Fixed Grunt script that stopped the P2 constraint classes from building properly. 2014-03-18 18:36:46 +00:00
photonstorm
eec9f70c1c Math.removeRandom allows you to remove (and return) a random object from an array. 
Updated TypeScript defs to fix getRandom (fix #583)
 2014-03-18 16:51:58 +00:00
photonstorm
a7ff5f884c Added basic Webcam plugin. 
Added Device.getUserMedia detection.
Updated config.php so you can toggle physics engines on/off via flags.
Updated Gruntfile.js so it builds a Phaser + Pixi but no Physics libs.
 2014-03-18 15:14:28 +00:00
photonstorm
89cdaef84d New build files. 2014-03-18 00:01:39 +00:00
photonstorm
f32dce8cdd New build files. 2014-03-17 21:18:02 +00:00
clark-stevenson
868f128978 Basic p2 added 
Will maybe be sketchy (a few Any's - p2.Shape or p2.Constraint etc). Also I may have messed up a couple of types (Phaser.Physics.p2.Body vs p2.Body).

Also fixed #585
 2014-03-17 12:35:14 +00:00
clark-stevenson
1152fe6ee2 Ninja Physics Added 2014-03-16 15:21:22 +00:00
photonstorm
44a5741148 Fixed games. Updated Body.moves handling. 2014-03-14 04:49:55 +00:00
alvinsight
726c42310a Yeaah, 242 examples working, only 7 missing 2014-03-13 17:32:55 +00:00
alvinsight
8a4d5ab8fd Updated all the examples that were using the old physicsEnabled 2014-03-13 17:32:54 +00:00
photonstorm
c2d38fe16b jshint passed all the p2 physics and fixed Debug.spriteBounds. 2014-03-13 16:16:14 +00:00
alvinsight
c9f89f5a3b New examples for ninja physics, bitmap text, and documented the map function 2014-03-13 13:25:39 +00:00
photonstorm
87684bb15f Revolute Constraint done. 2014-03-13 12:14:14 +00:00
photonstorm
6b55fea953 Distance and Gear constraints done. 2014-03-13 11:13:22 +00:00
qdrj
33215dce6c fixed lots of "nummber" typos 2014-03-12 14:48:49 +04:00
qdrj
0c3ad8acf4 tiny fix 2014-03-12 13:49:18 +04:00
qdrj
709c4a8111 fix Phaser.Utils.Debug definitions 2014-03-12 13:10:42 +04:00
photonstorm
83e197772d Moved Time update back into core loop. 2014-03-11 20:30:26 +00:00
photonstorm
6ef9e30753 Added z property to remaining game objects and updated TypeScript defs. 2014-03-10 23:16:49 +00:00
clark-stevenson
c2a71cc01c Reviewed for 10/03/2014 
This includes the latest changes made to Phaser.d.ts today.  (Body)

I am pretty lost in the whole Physics Body definitions stuff so generally only do limited edits there.
 2014-03-10 16:58:12 +00:00
photonstorm
13ff8985e1 Merged @georgiee p2 BodyDebug and reformatted for jshint pass. Looks awesome :) #536 2014-03-10 15:25:43 +00:00
photonstorm
982823d875 Updated TypeScript defs which now compiles against 1.2 (but still missing quite a few areas). 
New build files that match them.
 2014-03-10 11:08:07 +00:00
photonstorm
8fff38618d Tidied up the Examples, fixed Arcade Physics Body, added Body enable support to Group and fixed QuadTree. 2014-03-10 03:06:28 +00:00
photonstorm
45ab4673cc ScaleManager.fullScreenTarget allows you to change the DOM element that the fullscreen API is called on (feature request #526) 2014-03-10 01:13:01 +00:00
photonstorm
ab6a9aab41 Fresh builds for the weekend. 2014-03-07 15:17:13 +00:00
photonstorm
4db1fc0079 Restored Phaser.QuadTree - should get all remaining Arcade Physics examples working again. 2014-03-07 15:14:53 +00:00
Richard Davey
a6b05f4d02 Merge pull request #519 from clark-stevenson/patch-1 
Phaser.Image extends PIXI.Sprite
 2014-03-06 16:57:38 +00:00
photonstorm
d75f6e163f Updated tilemap type to string (fixes #516) 2014-03-06 16:53:52 +00:00
clark-stevenson
83091b7647 Phaser.Image extends PIXI.Sprite 2014-03-06 11:44:26 +00:00
photonstorm
3e93f24583 New split physics system is implemented. Still tidying-up, but ArcadePhysics, P2 and Ninja Physics are in and configured. Lots more examples required, and tilemap collision mostly broken in Arcade at the moment. Time to implement in Ninja. 2014-03-06 06:29:19 +00:00
photonstorm
22b1ce9b9d Added Phasers new Physics Manager and restored the pre-1.1.4 ArcadePhysics system. The new manager can handle multiple physics systems running in parallel, which could be extremely useful for lots of games. 2014-03-05 02:36:08 +00:00
Richard Davey
b5df53b4f6 Merge pull request #507 from clark-stevenson/patch-1 
PIXI + Phaser Definitions
 2014-03-04 02:05:45 +00:00
photonstorm
a30c2c87a9 New build files. 2014-03-04 01:29:04 +00:00
clark-stevenson
700d8d5258 PIXI + Phaser Definitions 
Thanks to @natelong for Maintaining the original PIXI definitions.

Updated to 1.5.2 PIXI. 

Needs testing. May be missing updates from the dev branch of Phaser 1.2 that occurred in the last few days.  

Warning! I made Phaser.point extend PIXI.Point. It was the only way I could get this to work. 

If class property position is PIXI.Point
And you try to overlay position with Phaser.Point

I get "X cannot extend Y type mismatch" for a whole bunch of classes. Only when I extend PIXI.Point does the errors dissapear. 

Also was not sure to include PIXI in this file or a separate one.
 2014-03-03 23:46:24 +00:00
photonstorm
7183322259 Renamed Phaser.BitmapFont to Phaser.RetroFont because I believe it will cause confusion otherwise. Also tidied up the asset fonts folder. 2014-03-03 17:05:28 +00:00
photonstorm
76040d303e Added in the Gestures support contribution for testing. 2014-03-03 01:42:11 +00:00
photonstorm
664d5b3e2c Fixed issue where Image, Sprite, etc wouldn't call preUpdate or postUpdate of its children. 
Fixed issue where renderOrderID wasn't being assigned correctly, causing the Input Handler to be unable to select the "top" item on a display list (would all default to zero)
Fixed issue where Stage would assign renderOrderIDs in reverse, should be in sequence.
Fixed issue where objects where checking World for the currentRenderOrderID by mistake instead of Stage.
Basically, input handling works a lot better now for Groups and nested objects :)
 2014-02-28 19:45:15 +00:00
photonstorm
8dcfef8db0 Updated to latest Pixi build (can do away with our own local patch now). 
Group.sendToBottom(child) is the handy opposite of Group.bringToTop()
Group.moveUp(child) will move a child up the display list, swapping with the child above it.
Group.moveDown(child) will move a child down the display list, swapping with the child below it.
 2014-02-28 18:55:07 +00:00
photonstorm
8662cd2fd4 Brand new Grunt task - creates each core library as its own file and a combined phaser.js. 
New build script now cleanly splits Phaser, Pixi and p2 so they are each UMD wrapped and each available in the global scope (now more requireJS friendly!).
phaser-no-libs.js allows you to use your own version of p2.js or pixi.js with Phaser. Warning: This is totally unsupported. If you hit bugs, you fix them yourself.
Fixed silly instanceof bug in game objects (sorry guys).
 2014-02-28 09:30:53 +00:00
photonstorm
09d4a35b7f Fixed issue where Phaser.Canvas.create would always make a screencanvas for CocoonJS, but that should only happen once. New parameter toggles it. 2014-02-28 03:55:06 +00:00
photonstorm
53c10ca31f The grunt task now creates an optional version of Phaser without any Physics support built in. Quite a bit smaller now. 
The grunt task now has a new `noUmd` option which builds Phaser without the UMD wrapper.
 2014-02-27 17:00:14 +00:00
photonstorm
4a97861ff8 Updated p2 2014-02-26 06:27:44 +00:00
photonstorm
1aea08d0f7 AnimationParser.spriteSheet wasn't taking the margin or spacing into account when calculating the numbers of sprites per row/column, nor was it allowing for extra power-of-two padding at the end (fix #482, thanks yig) 
AnimationManager.add documentation said that 'frames' could be null, but the code couldn't handle this so it defaults to an empty array if none given (thanks yig)
Also updated TypeScript definitions and StateManager.add docs.
 2014-02-26 01:32:38 +00:00
photonstorm
d958b34f43 New build. 2014-02-25 23:20:06 +00:00
photonstorm
13c99f3491 Phaser.StageScaleMode has been renamed to ScaleManager and moved from the system folder to the core folder. It's still available under game.scale. 
If your game references the old Phaser.StageScaleMode consts like SHOW_ALL you need to update them to Phaser.ScaleManager, i.e. Phaser.ScaleManager.SHOW_ALL.
All of the Project Templates have been updated to reflect the above change.
 2014-02-25 14:46:48 +00:00
photonstorm
fdde4cb7e6 Sorry, removing console.logs :) 2014-02-25 11:58:17 +00:00
photonstorm
b4dbaf9950 StateManager.start can now have as many parameters as you like. The order is: start(key, clearWorld, clearCache, ...) - they are passed to State.init() (NOT create!) 2014-02-25 11:56:57 +00:00
photonstorm
07af06fc4e Fixing up documentation, missing functions, examples and alpha masks. 2014-02-21 14:50:18 +00:00
photonstorm
dd8a393bc9 Updated version of p2 2014-02-21 12:40:49 +00:00
photonstorm
7394403bb6 Fresh build. Updated docs and re-built phaser.js. 2014-02-19 05:28:19 +00:00
photonstorm
7373db6e8c Upgraded p2 to latest build. 2014-02-19 03:58:24 +00:00
photonstorm
14646e811c QuadTree deprecated and moved to plugins. Body.collideWorldBounds added back and working. CollisionGroups pretty much finished. 2014-02-19 02:12:27 +00:00
photonstorm
5968dd053b CollisionGroup and collision masks working. Need to refine a little, but all the essentials are there. 2014-02-19 01:51:14 +00:00
photonstorm
15be3f86f3 Added ContactMaterial support. 2014-02-18 15:28:42 +00:00
photonstorm
3d0b5bde75 Updated World vastly. No longer extends p2.World due to a few vars we can't alias cleanly, adds in lots of new helper methods. 
Ready for Materials and Constraints.
InversePointProxy is for aliasing a p2 typed array when the values need reversing before applying (gravity for example).
 2014-02-18 15:16:26 +00:00
photonstorm
5d5c64d22f Tilemap.createCollisionObjects will parse Tiled data for objectgroups and convert polyline instances into physics objects you can collide with in the world. 
After defining tiles that collide on a Tilemap, you need to call Tilemap.generateCollisionData(layer) to populate the physics world with the data required.
Debug.renderPhysicsBody updated to take camera location and body rotation into account.
Body movement functions put back to velocity :)
Updated to latest dev version of pixi and latest p2.js
Updated docs
 2014-02-18 03:01:51 +00:00
photonstorm
cad14848e8 Removed input handler from Graphics as it's just meant to be used as a texture really, if you need input events you can apply Graphics to a Sprite. 
You can now create a Physics Body directly via game.physics.createBody(), and Body has been updated so it's no longer always bound to a Sprite.
Debug.renderPhysicsBody now works with Rectangles, Lines and multiple Convex shapes.
Starting to get the Tiled polyline parsing working nicely. Not too far off a complete tilemap collision.
 2014-02-17 17:54:10 +00:00
photonstorm
78bf874888 Fresh build. Added pre/post update hooks to Graphics. 2014-02-17 11:27:31 +00:00
photonstorm
cfa2c96637 Updated to latest pixi and p2.js 2014-02-16 14:32:16 +00:00
photonstorm
e5812710cc Added Spring class. Fixed reason why World wasn't pre and post updating (Stage didn't have an exists property). 2014-02-15 02:19:37 +00:00
photonstorm
e922bbdfd3 New build files 2014-02-15 01:36:07 +00:00
photonstorm
1cb40b6df1 Packaged builds for anyone wanting to test this weekend :) 2014-02-14 18:07:17 +00:00
photonstorm
15b83e1c88 Added the new BitmapFont class. This is for rendering retro style fixed-width bitmap fonts into an Image object. 2014-02-14 06:04:29 +00:00
photonstorm
58e44f75e3 SpriteBatch converted. It's an extended Group and Batch merged and works amazingly :) Ported over the maggots demo to test and wow! 2014-02-14 01:39:01 +00:00
photonstorm
c6cc2c9d71 Updated p2.js to latest build. Checked tests. Added Debug draw (needs rotation support). 2014-02-12 05:34:31 +00:00
photonstorm
ab5c07dfe8 Updated to Pixi 1.5 final. 
InputHandler.pixelPerfectOver - performs a pixel perfect check to see if any pointer is over the current object (warning: very expensive!)
InputHandler.pixelPerfectClick - performs a pixel perfect check but only when the pointer touches/clicks on the current object.
 2014-02-12 01:25:36 +00:00
photonstorm
da878b2181 Updated the Gruntfile. Also: 
InputHandler.pixelPerfectOver - performs a pixel perfect check to see if any pointer is over the current object (warning: very expensive!)
InputHandler.pixelPerfectClick - performs a pixel perfect check but only when the pointer touches/clicks on the current object.
Previously using a Pixel Perfect check didn't work if the Sprite was rotated or had a non-zero anchor point, now works under all conditions + atlas frames.
 2014-02-11 13:23:54 +00:00
photonstorm
1184d8bd76 PointProxy added to allow for easy setting of force and velocity. More p2 tests done. World update done. 2014-02-10 22:54:56 +00:00
photonstorm
47e23096bd Integrating p2.js. 2014-02-10 16:01:30 +00:00
photonstorm
6f835d7696 Added Tileset to TypeScript defs. 2014-02-10 02:42:28 +00:00
photonstorm
d44775c095 Phaser.Ellipse added. A fully compatible port of the PIXI.Ellipse class, can be used in Sprite/Image hitArea tests. 
Phaser.Polygon added. A fully compatible port of the PIXI.Polygon class, can be used in Sprite/Image hitArea tests.
 2014-02-10 01:37:50 +00:00
photonstorm
f9f2f2a9ae Converted the Pixi.Ellipse class. 2014-02-10 01:18:53 +00:00
photonstorm
9ee5cdaded Merge branch 'origin/dev' 2014-02-09 19:59:03 +00:00
clark-stevenson
e9ab2d30b6 Update phaser.d.ts 
Sprite was missing height property
 2014-02-09 17:00:07 +00:00
clark-stevenson
27bca6a8c2 Update phaser.d.ts 
atlasJSONArray, atlasJSONHash should have optional parameters when it comes to URL/Object? Please disregard this if this is incorrect.
 2014-02-09 16:15:10 +00:00
photonstorm
d583b364bd Game.add.renderTexture now has the addToCache parameter. If set the texture will be stored in Game.Cache and can be retrieved with Cache.getTexture(key). 
Game.add.bitmapData now has the addToCache parameter. If set the texture will be stored in Game.Cache and can be retrieved with Cache.getBitmapData(key).
 2014-02-07 06:25:28 +00:00
photonstorm
773b4d5ed1 More animation tests. 2014-02-07 04:12:23 +00:00
photonstorm
6958ac73d3 Added the SAT class to the TypeScript defs file. Also this fixes #369. 2014-02-07 04:12:04 +00:00
photonstorm
e11cae5373 Added the SAT class to the TypeScript defs file. Also this fixes #369. 2014-02-07 02:50:36 +00:00
photonstorm
4b7fc8d506 Change to boot order to try and resolve short-TTL timers. 2014-02-06 22:42:35 +00:00
photonstorm
7ba1196c0d Fixed TypeScript defs on lines 1741-1748 (thanks wombatbuddy) 2014-02-06 22:42:35 +00:00
photonstorm
9e5e30bb12 Fixed TypeScript defs on lines 1741-1748 (thanks wombatbuddy) 2014-02-06 19:36:33 +00:00
photonstorm
3748811d11 Testing new Image object. 2014-02-06 19:34:05 +00:00
photonstorm
e88b10323a Updated Phaser geometry classes so they over-ride the PIXI native ones, means we can do away with a whole bunch of over-rides and object changes in Sprite, etc. 2014-02-06 12:29:07 +00:00
photonstorm
8eae8feecc More Group fixes to the new format. Updated list of included Pixi files to remove un-needed ones. 2014-02-06 03:34:27 +00:00
photonstorm
4cfce8b4d2 Group now extends PIXI.DisplayObjectContainer, rather than owning a _container property, which makes life a whole lot easier re: nesting. 2014-02-06 02:31:36 +00:00
photonstorm
e7a9b96d27 Final release 1.1.4 examples finished. 2014-02-05 16:55:02 +00:00
photonstorm
8e77e8cedb Lots of TypeScript defs updates for the new Physics / Body classes. 2014-02-05 16:54:58 +00:00
photonstorm
846e9c5061 Removed debug info and tidying up ready for release. 2014-02-05 16:54:58 +00:00
Richard Davey
4502ca1bf6 Merge pull request #359 from qdrj/patch-7 
Update phaser.d.ts
 2014-02-05 12:33:30 +00:00
qdrj
a1ccddcd7e Update phaser.d.ts 
Added BitmapText definitions
 2014-02-05 01:19:04 -08:00
qdrj
82c39d0866 Update phaser.d.ts 
It is a bit confusing that AnimationManager.getAnimation can return animation object or false. Maybe it will better if this method will be returning null instead of false.
 2014-02-04 23:24:28 -08:00
qdrj
09d4b2bb8b Update phaser.d.ts 2014-02-04 01:32:06 -08:00
Richard Davey
33d47cf9e9 Merge pull request #344 from qdrj/patch-1 
Update phaser.d.ts
 2014-01-31 10:28:21 -08:00
qdrj
30af712d6a Update phaser.d.ts 
Fix typo StageScaleMode.pageAlignVeritcally
 2014-01-31 07:32:17 -08:00
qdrj
e5dc16b68d Update phaser.d.ts 
Fix incorrect Loader.checkKeyExists declaration
 2014-01-31 04:53:19 -08:00
photonstorm
27fc447928 New polygon collision object examples and Body scale fixes. 2014-01-31 10:34:18 +00:00
photonstorm
d51a37211c Phaser.Line added to the group of geometry classes, with full point on line/segment and intersection tests (see new examples) 2014-01-29 00:21:28 +00:00
qdrj
e5f52e8ae8 Update phaser.d.ts 
GameObjectFactory.add.existing should return added object
 2014-01-27 23:57:28 -08:00
Richard Davey
4432d37e6e Merge pull request #312 from miguelangelgonzalez/dev 
Added missing Typescript definitions
 2014-01-27 07:40:45 -08:00
Richard Davey
511858e3f5 Merge pull request #340 from qdrj/patch-2 
Update phaser.d.ts
 2014-01-27 07:40:25 -08:00
Richard Davey
d37ec40d72 Merge pull request #339 from qdrj/patch-1 
Update phaser.d.ts
 2014-01-27 07:39:54 -08:00
Richard Davey
912551a45d Merge pull request #323 from hstolte/patch-1 
removed duplicate line in Timer class
 2014-01-27 07:37:55 -08:00
photonstorm
4505aa50f6 Integrated SAT. Fixed lots of examples. Fixed documentation. Added new examples and built new phaser.js file for testing. 2014-01-27 06:29:26 +00:00
qdrj
3fb2eb23cd Update phaser.d.ts 
Incorrect TilemapLayer constructor
 2014-01-24 01:13:09 -08:00
qdrj
8b06f9cd86 Update phaser.d.ts 
Remove duplicated Timer.create signature
 2014-01-23 22:50:02 -08:00
hstolte
971e17fabe removed duplicate line in Timer class 
The method create(...) was defined twice (line 1357 and line 1360). I removed line 1360.
 2014-01-18 22:34:28 +01:00
Richard Davey
2532df8793 Merge pull request #317 from gareththegeek/patch-3 
Allow Text.style to be any type
 2014-01-16 07:28:37 -08:00
Richard Davey
c5840f4f6f Merge pull request #316 from gareththegeek/patch-2 
Add missing addKey method to Keyboard
 2014-01-16 07:28:17 -08:00
gareththegeek
47ee5a2c88 Allow Text.style to be any type 
To allow a configuration object to be used rather than a string
 2014-01-16 14:48:13 +00:00
gareththegeek
ca1f24868a Add missing addKey method to Keyboard 2014-01-16 14:46:12 +00:00
gareththegeek
1f9df6e3f4 Fix typescript compile error in 0.9.5 
Explicitly specify type for parameters array
 2014-01-16 14:43:28 +00:00
Miguel Angel Gonzalez
ac310ab881 Added missing Typescript definitions 2014-01-15 12:15:59 -03:00
photonstorm
32f5a2fa36 More examples updates. Fixed Starstruck tilemap code, removed un-needed ArcadePhysics methods and rebuilt the js files for testing. 2014-01-14 03:33:03 +00:00
photonstorm
c6fa2cb7b6 Added the new Timer, TimerEvent and Time methods to the TypeScript definitions files. 2014-01-13 14:18:15 +00:00
photonstorm
35cef4e529 Updated Body file and compiled + minified builds for those wanting to test. 2014-01-09 18:24:12 +00:00
Richard Davey
5f9acdca4b Merge pull request #299 from Niondir/dev 
Phaser Definitions Update
 2014-01-08 17:02:59 -08:00
photonstorm
c6c579e6b3 Phaser.Timer is now feature complete and fully documented. You can create Phaser.TimerEvents on a Timer and lots of new examples have been provided. 2014-01-09 00:59:37 +00:00
Tarion
c21365703d Phaser Definitions Update 
Added "GetCurrentState" to StateManager
 2014-01-08 22:57:13 +01:00
niondir
1aabb6b93d World is a Group. Needed to remove stuff again e.g. a "BitmapText" 2014-01-07 19:54:04 +01:00
niondir
77a8dc321f phaser.d.ts corrections 2014-01-07 10:58:00 +01:00
photonstorm
29d7cc36a0 Merge branch 'gamepadsupport' of https://github.com/karlmacklin/phaser into karlmacklin-gamepadsupport 
Conflicts:
	README.md
 2013-12-31 00:44:11 +00:00
photonstorm
ce4cf531d4 Added class constructors, fixed Stripshader, added relative Tween example and updated Tween source. 2013-12-30 16:54:00 +00:00
inductible.dev
9a968bc5bb TypeScript defs: TileSprite now extends Sprite, and added 'fixedToCamera' property to Sprite definition 2013-12-23 09:48:07 +00:00
inductible.dev
6be31e0f69 added TypeScript definitions for Key and CursorKeys object 2013-12-22 13:34:52 +00:00
photonstorm
5cf7ed4fdb More TypeScript updates. 2013-12-18 16:56:14 +00:00
photonstorm
50eee95c99 Improved TilemapLayer rendering and debug rendering significantly. Cleared out some old assets and added a new map. 2013-12-18 00:44:04 +00:00
photonstorm
a361a18616 Updated IE11 check, forces IE11 to use Canvas renderer even in AUTO mode. 2013-12-13 14:04:14 +00:00
photonstorm
19759699df More TypeScript definitions fixes (for Easing and Animation data). 2013-12-10 14:34:22 +00:00
photonstorm
669570c701 Tidying up the examples and more Tilemap work. 2013-12-10 12:23:42 +00:00
photonstorm
13a03f3620 TypeScript file updated, now compiles without error in VS and FlashDevelop. 2013-12-06 13:48:40 +00:00
photonstorm
d9ffd6afd4 Final version of the Getting Started guide. 2013-11-29 18:28:55 +00:00
photonstorm
b2fc6c422a Fixed filters for new shader code. 2013-11-28 21:29:16 +00:00
photonstorm
f22159e257 Updated documentation. 2013-11-28 15:57:09 +00:00
photonstorm
a9a46bfbbf Lots of documentation updates and new Loader examples. 2013-11-27 16:33:49 +00:00
photonstorm
141337bed9 Heavily optimised PixiShader. 2013-11-26 05:13:56 +00:00
photonstorm
86584a636c Added new Phaser.HEADLESS render mode (doesn't output anything). 2013-11-25 14:53:30 +00:00
photonstorm
06a17b4b26 Fixed an issue in Text. Fixed the background color issue with Canvas games. Updated the Examples viewer so the side-by-side focuses the iframe now. Added new "Extend Group" example. 2013-11-25 13:12:03 +00:00
Richard Davey
373b97648d Documentation updates 2013-11-24 23:52:31 +00:00
photonstorm
155c863d69 New Timer class and scale event updates. 2013-11-24 11:04:58 +00:00
photonstorm
496639ff25 Added Phaser.Filter and started moving the shaders over into their own filter classes, so they won't all get bundled in unless needed. 2013-11-21 05:00:07 +00:00
photonstorm
b63bd14172 ScaleMode fix, BitmapData change and Device updates. 2013-11-18 20:27:40 +00:00
Louis Tovar
4d80d6c9b2 Merge remote-tracking branch 'photonstorm_phaser/dev' into dev 2013-11-15 14:21:00 -08:00
Louis Tovar
0dab85c853 latest version of typescript definitions, manual changes to get it to code hint properly. 2013-11-15 13:50:16 -08:00
photonstorm
83cacb93a0 More updates to BitmapData. 2013-11-15 20:40:55 +00:00
Richard Davey
ebe441666c BitmapData object added 2013-11-13 20:57:09 +00:00
Louis Tovar
f71b8d4df1 Manual fixes for TypeScript definitions file. Not Complete, more to come 2013-11-13 01:24:26 -08:00
photonstorm
3f99b691c9 Added in a Group.sort demo, also updated the documentation and build files. 2013-11-07 06:10:15 +00:00
photonstorm
8b793cd8d7 Updated to latest version of Pixi.js. Lovely new WebGL filters now working happily :) 2013-11-06 04:51:23 +00:00
photonstorm
3e9777e6f4 Updated docs for 1.1.2 release. 2013-11-01 18:16:52 +00:00
photonstorm
6f93a2ec94 Multiple Anims update, Tilemap fixes and some new examples. 2013-10-31 15:45:19 +00:00
photonstorm
9261160571 1.1.1 release with fix for Phaser.AUTO and a new text example. 2013-10-26 19:14:13 +01:00
photonstorm
6994e4be5e Merge branch 'dev' 2013-10-25 18:50:14 +01:00
photonstorm
34736fbde5 Final 1.1 release. Here goes nothing :) 2013-10-25 18:35:49 +01:00
Tomas Morris
d30f709208 Manually created a more accurate TypeScript definition file 2013-10-24 21:24:35 -06:00
photonstorm
4a51ac4671 Updated README and sorting out folder case issue. 2013-10-23 13:30:23 +01:00
photonstorm
cab3b53cf0 SideView example viewer finished. 2013-10-23 02:14:51 +01:00
photonstorm
07724e5001 Revamping the examples area. 2013-10-22 03:58:20 +01:00
photonstorm
8ed783802e New examples page 2013-10-18 15:12:32 +01:00
photonstorm
dabda516c2 Compiled build. 2013-10-17 22:56:20 +01:00
photonstorm
9c1fdb371c Nearly finished Tilemap integration into the core. 2013-10-16 06:33:39 +01:00
photonstorm
31018b9295 Star Struck game back and working again, plus finished the level design. 2013-10-16 03:37:15 +01:00
photonstorm
a97f271de7 Fixed Animation index 0 issue and hooked TilemapLayer to camera. 2013-10-16 02:09:12 +01:00
photonstorm
dd695e066f More tilemap tweaks. 2013-10-14 19:37:52 +01:00
photonstorm
b868c2cb1b Started revamp of the Tilemap system. Also removed old 'Advanced Physics' and dropped in p2.js which is what I hope we'll eventually use. 2013-10-11 04:42:11 +01:00
photonstorm
a7230aa769 Sprite.loadTexture added. 2013-10-10 09:03:38 +01:00
Richard Davey
e85643abf4 Yet more documentation done. 2013-10-02 20:18:24 +01:00
Richard Davey
480d90b009 * Removed the callbackContext parameter from Group.callAll because it's no longer needed. 
* Updated Group.forEach, forEachAlive and forEachDead so you can now pass as many parameters as you want, which will all be given to the callback after the child.
* Updated build script so it can be run from the command-line and includes UMD wrappers (thanks iaincarsberg)
 2013-10-01 02:19:08 +01:00
Richard Davey
8668b82ef6 * Fixed issue causing Keyboard.justPressed to always fire (thanks stemkoski) 
* Added Keyboard.addKey() which creates a new Phaser.Key object that can be polled for updates, pressed states, etc. See the 2 new examples showing use.
 2013-10-01 01:18:29 +01:00
Richard Davey
fa1ed04aa8 Build 2013-09-30 19:54:43 +01:00
Richard Davey
31bbf05ace * Fixed small bug stopping Tween.pause / resume from resuming correctly when called directly. 
* Fixed an issue where Tweens.removeAll wasn't clearing tweens in the addition queue.
* Change: When you swap State all active tweens are now purged.
 2013-09-30 11:15:50 +01:00
Richard Davey
9642d4994a 1.0.6a release to fix an issue in the StateManager. 2013-09-26 11:49:58 +01:00
Richard Davey
c29fcfb510 1.0.6 release to fix a few important issues and prepare for the dev branch. 2013-09-24 15:53:20 +01:00
Richard Davey
891369b197 Preparing for 1.0.6 release, but moving physics changes to dev. 2013-09-24 15:28:29 +01:00
Richard Davey
b69b3db486 1.0.6a 2013-09-22 23:07:12 +01:00
TheJare
4b6147d3e3 Fix bug in StateManager where a state's update function might not get called if it has an empty preload function 2013-09-20 22:42:04 +01:00
Richard Davey
8c41b3253c 1.0.5 package 2013-09-20 14:00:49 +01:00
Richard Davey
c5fc5e3394 Fixed various issues in the TweenManager, added length property to Group and improved the build script. 2013-09-19 04:45:08 +01:00
Richard Davey
d9a49797c4 1.0.4 release 2013-09-18 06:34:56 +01:00
Richard Davey
17e208a95e 1.0.2 build 2013-09-16 01:53:53 +01:00
Richard Davey
f069107e55 1.0.1 release - fixes issues in tile map collision, additional Animation stop checks and updated package license. 2013-09-15 03:58:38 +01:00
Richard Davey
48161f5c24 1.0 release versions ready. 2013-09-13 17:52:01 +01:00
Richard Davey
62d77e7038 Small new demo and refactored collision list - now far less comparisons to perform! 2013-09-13 04:22:12 +01:00
Richard Davey
79dc3566f4 Fixed some issues in Tilemap collision, updated the Emitter so x/y controls the point of emission (to stop collision getting out of whack) and fixed the postUpdate in body. 2013-09-12 20:59:56 +01:00
Richard Davey
92e86494e3 Tilemap Collision in and working :) Needs testing against Groups now. 2013-09-12 15:39:52 +01:00
Richard Davey
9b6c819e0e Input Component done and new Button object done and included. Also finished the build script. 2013-09-09 00:30:44 +01:00
Richard Davey
09def364c3 Farewell TypeScript, see you on the other side. 2013-08-28 07:02:57 +01:00
Richard Davey
8a85155c08 Fixed the tilemap pre/post update hooks. 2013-08-25 10:35:58 +01:00
Richard Davey
ecf61fc80c Updated Game.switchState to accept state objects and fixed the OrientationScreen. 2013-08-25 09:59:23 +01:00
Richard Davey
c884bab7ec Fixed instance check issue in Game and tidied up the stageScaleMode inner loop. 2013-08-16 02:18:12 +01:00
Richard Davey
f76ba6840f Animation and Input related fixes 2013-08-16 00:14:57 +01:00
Richard Davey
619b8415ed Reverting back to the only version of TypeScript that really works :( 2013-08-13 04:22:24 +01:00
Richard Davey
91dc7a4acf Tidying up and trying to fix more stupid TypeScript errors. 2013-08-12 04:08:15 +01:00
Richard Davey
142348f70b Updates 2013-08-11 21:31:35 +01:00
Richard Davey
7aa82a1cb0 All physics projections added. 2013-08-11 19:02:10 +01:00
Richard Davey
c2d7fb7fab Merged N+ physics in and tidied up the Docs folder and logos. 2013-08-11 12:15:53 +01:00
Richard Davey
aff7d99a8a Fixed bug where children of Groups wouldn't have their preUpdate methods called. 2013-08-09 20:03:36 +01:00
Richard Davey
0b1bcaf270 Set the default camera to direct itself to the Stage. 2013-08-09 18:44:45 +01:00
Richard Davey
f9776f30fc Added the CanvasUtils class and moved some stuff out of Stage into it. 2013-08-09 17:47:08 +01:00
Richard Davey
2d49a31ecd yuidoc scripts added. Tidied up the Docs folder. Added back in the Emitter and fixed the Tests that weren't compiling. 2013-08-09 05:08:54 +01:00
Richard Davey
9bf7d070f5 Added in the JS source files for doc generation and the definitions to csproj XML script. 2013-08-09 03:12:33 +01:00
Richard Davey
1248a6c06e Whole codebase updated to TypeScript 0.9.1, phew! 2013-08-08 19:16:47 +01:00
Richard Davey
73745e5720 Fixed a few things in Tilemap and optimised the renderer a little bit. 2013-08-08 06:29:21 +01:00
Richard Davey
48f6d850c8 Fixed bug where a Tween with both yoyo and loop enabled would get out of sync. 2013-08-08 06:08:53 +01:00
Richard Davey
ab7e55ef27 Added ability for the TimeManager to monitor the pause duration. This is then applied to tweens and other game services, meaning the tweens now restart properly after a pause resumes. 2013-08-08 05:43:22 +01:00
Richard Davey
5768336150 Tidied up the Loader so it now starts automatically, added required Signals and removed the old-style callbacks. 2013-08-08 04:35:13 +01:00
Richard Davey
04dcb29c88 WorldView now takes camera placement into account, so Buttons now work across multiple camera set-ups. 2013-08-08 03:24:26 +01:00
Richard Davey
a174bbc6b3 Vastly optimised InputManager and Pointer is now aware of which camera it is over. 2013-08-08 03:05:59 +01:00
Richard Davey
bc77c3f84e Updated Renderer system, now much easier to expand and maintain. 2013-08-08 01:07:22 +01:00
Richard Davey
d7205992a5 Fixed some issues in dragging sprites with snap-to-center and world coordinates. 2013-08-07 00:00:12 +01:00
Richard Davey
77cc3858d9 Fixed the world drag issue across Sprite and Button. 2013-08-06 04:34:52 +01:00
Richard Davey
a7873a3b74 Removed the FX project as it's no longer needed and tidied up the build folder. 2013-08-06 03:43:53 +01:00
Richard Davey
11954812c6 Clearing down the To Do list. 2013-08-06 03:14:48 +01:00
Richard Davey
d1da4cbdef Fixed Firefox audio issue with the Loader and added defined functions for anonymous callbacks 2013-08-05 03:43:20 +01:00
Richard Davey
84ef32e62a Fixed Camera FX: Mirror and Scanlines and updated the tests. 2013-08-02 20:03:53 +01:00
Richard Davey
f3dcd3e831 Plugin Support added and CameraFX re-enabled 2013-08-02 19:37:43 +01:00
Richard Davey
982faeedb8 Updating and fixing tests 2013-08-02 18:32:26 +01:00
Richard Davey
4c9c50584e Tidying up the physics libraries 2013-08-02 12:38:56 +01:00
Richard Davey
955909979d Preparing for 1.0 branch 2013-08-01 22:21:29 +01:00
Richard Davey
3038f6fcf8 Added optimised point in circle test to CircleUtils 2013-07-27 10:57:54 +01:00
Richard Davey
a5343b4bc0 Quick commit before I merge the new tests 2013-07-19 16:53:47 +01:00
Richard Davey
3c123293ba New CSS3 Filters component and Net class. 2013-07-19 04:57:14 +01:00
Richard Davey
9827e7522f Multiple fixes to remove the use of reserved words, making the YUI compressor work again. 2013-07-19 02:59:23 +01:00
Richard Davey
a2c756e37f Added ability for full Audio tag playback and iOS touch lock load support. 2013-07-16 23:32:47 +01:00
Richard Davey
72eb22128f SoundManager overhaul nearly finished. Proper Web Audio / Audio tag split, working across desktop and mobile. Includes iOS touch unlock restriction handling, auto decoding, global volume management, audio sprite support (for both web audio and audio tags) and playhead monitoring. 2013-07-16 14:45:08 +01:00
Richard Davey
b3fff37faf Added todo items to repo 2013-07-13 12:38:59 +01:00
Richard Davey
dcce99ec60 Added the new Button game object and various other input and tilemap fixes. 2013-07-12 03:28:46 +01:00
Richard Davey
c81cf0c882 Lots of Tilemap updates, moved the renderer out, added components and new tests. 2013-07-02 23:41:25 +01:00
Richard Davey
c647792c12 Physics updates 2013-06-26 14:18:48 +01:00
Richard Davey
d19ad4976d Merged Advanced Physics with core. 2013-06-26 05:44:56 +01:00
Richard Davey
0591c7f2bd Doing one final commit before the task of merging physics with core. 2013-06-25 15:35:45 +01:00
Richard Davey
ec845155eb After hours and hours of debugging, polygon to polygon collision is now working perfectly :) 2013-06-21 23:39:29 +01:00
Richard Davey
829a1b00e4 Brand new physics system finally (mostly) working. Some poly issues to resolve, but it's running well. 2013-06-18 19:37:09 +01:00
Richard Davey
0a7513240a Refactor completed. Now to tie the physics and sprites together. 2013-06-14 18:54:12 +01:00
Richard Davey
533a4c2e30 Commiting before a small refactor of Shapes and Joints 2013-06-14 17:55:07 +01:00
Richard Davey
dd8962d4b5 After a mammoth debugging session we now have advanced physics colliding and responding accurately :) 2013-06-14 15:18:41 +01:00
Richard Davey
114d1d2fbf Compiling, but not yet running correctly. Need to add body renderer next. 2013-06-14 04:13:00 +01:00
Richard Davey
232c96cc54 Space and Joints interface added. 2013-06-14 03:20:47 +01:00
Richard Davey
461f7ee54d Added lots more classes into the Advanced Physics package 2013-06-14 02:42:51 +01:00
Richard Davey
038cb213e8 Starting merge of the Advanced Physics classes and splitting off Flixel physics into ArcadePhysics. 2013-06-13 17:15:16 +01:00
Richard Davey
7dac2b6506 Added Group.bringToTop and updated Input component to use sprite getXY handler. 2013-06-13 01:55:32 +01:00
Richard Davey
2389c6c231 Added ability to detect if a given point is within a sprite or not, taking rotation and scaling into account. 2013-06-12 19:53:48 +01:00
Richard Davey
c2533d1146 Finally a fully working bounding box that respects scale and rotation - the "in camera" check is now 100% accurate :) 2013-06-11 23:30:35 +01:00
Richard Davey
c5f6817c4c Working sprite bounds / vertices regardless of scale or rotation 2013-06-11 21:30:15 +01:00
Richard Davey
1f8c809f53 cameraView working for center rotated sprites, just need to handle any point of rotation. 2013-06-07 19:18:39 +01:00
Richard Davey
3b9386727e Small refactoring and massively optimised the canvas renderer, also added new Mat3 class. 2013-06-07 16:27:33 +01:00
Richard Davey
a30762ed8c Fixed world drag support and other input modifications. 2013-06-07 07:35:28 +01:00
Richard Davey
730594835a New Texture and Transform components which are now used by Sprite, Group and Camera. 2013-06-06 02:47:08 +01:00
Richard Davey
2f03f5fc43 Updated Loader component and fixed a few Pointer issues. 2013-06-05 02:58:16 +01:00
Richard Davey
d42f396ba0 Lots of tweaks and fixes to the orientation and fullscreen classes 2013-06-05 01:49:08 +01:00
Richard Davey
82d4ba4538 Re-done the pointer handler so it respects the top-most rendered sprite in priority to anything below it, for both mouse over and click events. 2013-06-03 12:03:34 +01:00
Richard Davey
1c37cd1a96 Created DebugUtils class and started moving renderInfo methods to it. 2013-06-03 03:08:24 +01:00
Richard Davey
2de70d07a5 Fixed issue in Camera.inCamera check where it wouldn't take into consideration the Sprites scrollFactor. 2013-06-03 02:38:08 +01:00
Richard Davey
b951b02de8 Input priority IDs working properly for drag events. 2013-06-03 01:22:14 +01:00
Richard Davey
2270da2479 Fixed drag sprite + offsets and center locking 2013-06-02 21:41:00 +01:00
Richard Davey
f9f17ad353 Multi point input handler working 2013-06-02 14:19:12 +01:00
Richard Davey
49fe5ee65f Added Group IDs and references to Sprites, Group sorting, z-index values and child swapping. Also added all of the drag and bounds methods to Input. 2013-06-02 03:47:54 +01:00
Richard Davey
5b532ab2e4 Sprite.Input component added and working nicely. 2013-06-01 02:49:41 +01:00
Richard Davey
b20a6ff85a Working my way through putting all the Tests back in and fixing issues as I go. 2013-06-01 01:30:36 +01:00
Richard Davey
31c4d8cb14 Adding in missing tests and fixing as we go 2013-05-31 19:28:16 +01:00
Richard Davey
d510b785b1 Putting everything back together again :) 2013-05-31 18:21:32 +01:00
Richard Davey
fe372af453 Commit before tidying up redundant files 2013-05-31 15:13:03 +01:00