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

550 commits

Author SHA1 Message Date
Richard Davey
9a974514ff Added new LinkFile class and updated other file types to use it. 2018-04-27 18:44:12 +01:00
iamchristopher
68687162b5 Fixed JSONFile loader doesn't pass loader to JSONFile 2018-04-26 20:31:32 -04:00
Chris Wright
ed51affded
Merge branch 'master' into feature-multi-image-loader 2018-04-25 20:48:06 -04:00
Richard Davey
038bbcc7bc Fixed the remaining file types. 2018-04-25 23:16:17 +01:00
Richard Davey
0f0f099326 eslint fixes 2018-04-25 17:18:16 +01:00
Richard Davey
074fcbcf2b null references 2018-04-25 17:16:39 +01:00
Richard Davey
9843da1053 Check file cache and pass processing of the file off to the file itself 2018-04-25 17:16:09 +01:00
Richard Davey
83a1965cb8 Files types updated to support new cache config value 2018-04-25 17:13:43 +01:00
Richard Davey
75a49d284c Added hasCacheConflict and addToCache methods/ 2018-04-25 17:13:06 +01:00
iamchristopher
85a9014b28 Merge remote-tracking branch 'upstream/master' into feature-multi-image-loader 2018-04-21 16:15:19 -04:00
Richard Davey
a6c430674a # not . 2018-04-19 13:31:21 +01:00
Richard Davey
eb1990d061 jsdoc fix 2018-04-19 13:30:19 +01:00
Richard Davey
32ce8d7947 jsdoc fixes and removed un-used ResetKey file. 2018-04-19 12:30:38 +01:00
Richard Davey
b0544c73b8 jsdoc fixes 2018-04-18 13:29:22 +01:00
NemoStein
2c3f13246d Updated jsdocs (all XHR parameters are optional in Phaser.Loader.FileTypes) 2018-04-17 10:31:52 -03:00
Richard Davey
1be486fab4 destroy only called once, no matter how many times the Scene restarts. Fix #3581 2018-04-17 12:25:45 +01:00
Richard Davey
07a55e5d1f Removed debug call and merged Scene Systems boot and start sequences. Fix #3579 2018-04-17 02:34:07 +01:00
Richard Davey
52c6a3cdb5 Updated jsdocs 2018-04-16 15:17:10 +01:00
iamchristopher
8e15d3ca31 Merge branch 'master' into feature-multi-image-loader 2018-04-15 19:35:41 -04:00
Pavle Goloskokovic
fa07dc76e9 Removed unused argument from the docs 2018-04-14 18:49:14 +02:00
Pavle Goloskokovic
f8ebcf0588 Removed unnecessary argument 2018-04-14 18:48:22 +02:00
Pavle Goloskokovic
b4aaf81db7 Storing data on each audio tag if it is locked (ont yet loaded) 2018-04-14 18:46:09 +02:00
Pavle Goloskokovic
1c294d5921 Calculating locally if audio is locked instead of getting that data passed as a constructor argument 2018-04-14 18:44:47 +02:00
Richard Davey
6b2307594a Scene plugin flow overhaul 
Every Plugin has been updated to correctly follow the same flow through the Scene lifecycle. Instead of listening for the Scene 'boot' event, which is only dispatched once (when the Scene is first created), they will now listen for the Scene 'start' event, which occurs every time the Scene is started. All plugins now consistently follow the same Shutdown and Destroy patterns too, meaning they tidy-up after themselves on a shutdown, not just a destroy. Overall, this change means that there should be less issues when returning to previously closed Scenes, as the plugins will restart themselves properly.
 2018-04-13 17:12:17 +01:00
iamchristopher
135db3089e Fixed linting issue 2018-04-11 15:03:18 -04:00
iamchristopher
95e44527c5 Merge remote-tracking branch 'upstream/master' into feature-multi-image-loader 2018-04-11 14:03:18 -04:00
Richard Davey
5f9972c791 LoaderPlugin.isReady referenced a constant that no longer exists. Fix #3503 2018-04-09 13:55:41 +01:00
iamchristopher
e538a597b3 Updated ImageFile argument types 2018-04-05 20:42:32 -04:00
iamchristopher
a65cd41852 Added ImageFile argument descriptions 2018-04-05 20:34:49 -04:00
iamchristopher
9155149012 Added example multi image load 2018-04-05 20:15:56 -04:00
iamchristopher
661f9fd29e Fixed loading normals with multi image load 2018-04-05 20:12:58 -04:00
Richard Davey
747f09af86 jsdoc fixes 2018-03-28 15:04:09 +01:00
orblazer
f42f1bf132 Change structs for generic types 2018-03-23 16:54:12 +01:00
orblazer
ed1f2a7011 Fix wrong types 2018-03-22 13:51:30 +01:00
Richard Davey
0ef92e1172 Merge branch 'pr/3439' 2018-03-21 16:06:56 +00:00
Richard Davey
13f5608cbe Added XHRSettings Conf 2018-03-21 14:41:04 +00:00
orblazer
0c1ced8d86 Fix "object" types on Loader 2018-03-21 13:03:14 +01:00
orblazer
7fba122321 Fix "any" types 2018-03-20 17:15:49 +01:00
orblazer
44103dc475 Fix remaining multiple types 2018-03-20 16:12:42 +01:00
Richard Davey
8d7ed97d38 Removed const because already merged into namespace (#3417) 2018-03-20 00:37:10 +00:00
Richard Davey
3591edcb73
Merge pull request #3417 from rexrainbow/master 
Bug fix: font might not sync to context
 2018-03-20 00:34:51 +00:00
orblazer
fa13b597e3 Add more callbacks 2018-03-19 23:08:05 +01:00
Richard Davey
620bcc6ae5 jsdoc fixes and additions 2018-03-19 13:45:00 +00:00
Hua
1dc98b586f Expose FILE_CONST 
Expose FILE_CONST for 3rd party developer
 2018-03-19 13:46:16 +08:00
orblazer
449506db87 Update JSDoc on Loader 2018-03-19 01:54:19 +01:00
Richard Davey
625394a24c Don't reset the callbacks unless xhrLoader is set 2018-03-16 17:00:45 +00:00
Richard Davey
b2d062b0bd LoaderPlugin.progress and the corresponding event now factor in both the list size and the inflight size when calculating the percentage complete. Fix #3384 2018-03-16 15:01:39 +00:00
Richard Davey
a524dc44b0 Expose constants. Fix #3387 2018-03-16 13:29:30 +00:00
Richard Davey
1fea31bac8 Fixed package names 2018-03-16 00:46:39 +00:00
Tom Catshoek
5c64404608 Fixed style issues 2018-03-09 15:31:07 +01:00
Tom Catshoek
57d82d9a28 Fixed object based atlas loading 2018-03-09 15:05:01 +01:00
Richard Davey
c74ad8dee2
Merge pull request #3292 from CodeAndWeb/master 
Support MultiAtlas with TexturePackers "Phaser 3" atlas format
 2018-03-05 12:17:24 +00:00
Richard Davey
ae1c91cf6a eslint fixes 2018-03-05 01:40:11 +00:00
Richard Davey
de9cfb6ee2
Merge pull request #3234 from nkholski/master 
load.plugin now accepts class as an argument besides an url-string
 2018-02-28 20:50:32 +00:00
Joachim Grill
22ecd23f09 fixed multiatlas loader to support new TexturePacker atlas format introduced for Phaser 3 2018-02-27 14:48:45 +01:00
samme
2b309c06e5 Elevate console message for loading data URIs 2018-02-22 09:28:02 -08:00
samme
bb23b19ef7 Correct method name in LoaderPlugin#spritesheet 2018-02-21 09:43:49 -08:00
Richard Davey
3c65121cb3 eslint fixes 2018-02-16 19:17:49 +00:00
Richard Davey
50dac412be eslint fixes and console removal 2018-02-16 19:08:50 +00:00
Niklas Berg
6dde7002dc fixed formatting 2018-02-15 18:11:55 +01:00
Niklas Berg
6a77790aef load.plugin now accepts class as an argument besides an url-string 2018-02-14 23:35:05 +01:00
samme
633acec058
Fix wrong Extend target in MergeXHRSettings 2018-02-14 09:52:52 -08:00
Richard Davey
26403aa84f Added setCORS method. 2018-02-13 05:54:43 +00:00
Richard Davey
8f4a1012fd Updated jsdocs. 2018-02-13 01:39:22 +00:00
Richard Davey
2813ac8162 Moved PluginManager and merged configs into single root file for easier changing. 2018-02-12 23:03:48 +00:00
Richard Davey
d578e89828 Moved Mesh out of core and into its own Graphics extension. 2018-02-12 16:59:27 +00:00
Richard Davey
d1f5f8a82b Added jsdocs 2018-02-12 16:01:21 +00:00
Richard Davey
0ca8390ecb Optionally retain listeners. 2018-02-12 13:48:50 +00:00
Richard Davey
cbb0f236f5 Added jsdocs 2018-02-09 17:56:43 +00:00
Richard Davey
91887815f6 Merged Arcade Physics methods and added jsdocs 2018-02-09 01:40:41 +00:00
Richard Davey
e5f32ef546 Added jsdocs and moved FileTypes to their own namespace 2018-02-08 17:00:14 +00:00
Richard Davey
10193c181a Fixed require paths. 2018-02-07 17:10:01 +00:00
Richard Davey
40689d1e35 Updated jsdocs. 2018-02-07 15:27:21 +00:00
Richard Davey
65e5b14276 Merge branch 'master' of https://github.com/photonstorm/phaser 2018-01-31 13:54:48 +00:00
Richard Davey
2a86400a28 Added in jsdocs 2018-01-31 13:54:44 +00:00
Pavle Goloskokovic
6bfb0d21ce Releasing audio context reference 2018-01-31 14:07:03 +01:00
Richard Davey
f0726d4060 Added the ability to provide a data source image to go with a standard image 
This allows you to load a normal map, specular map, or other format of image based data alongside a regular image and have them bound together internally, without creating duplicate entries in the Texture Manager or loader
 2018-01-29 23:38:27 +00:00
Richard Davey
a4e9ae5fdd Added jsdocs. 2018-01-26 14:23:00 +00:00
Richard Davey
2d0e27cd63 Fixed use of Object.assign (doesn't work on IE11) 2018-01-25 23:19:23 +00:00
Richard Davey
cb2891db8a Added jsdocs to the Device inspector, removed out-dated properties and changed case of Device access 2018-01-25 17:03:35 +00:00
Richard Davey
8fe16e5506 Moved removal of listeners to the loadComplete section (re: #3184) 2018-01-24 14:26:17 +00:00
Pavle Goloskokovic
07bbe80fca Merge remote-tracking branch 'origin/master' 2018-01-23 19:03:11 +01:00
Pavle Goloskokovic
924247c04d Fixes #3182 2018-01-23 19:02:58 +01:00
Michael Hadley
568b04cedb Loader typo in new loader structure 2018-01-21 15:28:04 -06:00
Pavle Goloskokovic
c604fd9a5e Removed updating loading properties if audio is locked 2018-01-21 15:14:46 +01:00
Pavle Goloskokovic
f917c94d93 Emitting fileprogress event 2018-01-21 15:13:48 +01:00
Pavle Goloskokovic
bdf38448ea Calling loader nextFile method instead of callback 2018-01-21 15:13:02 +01:00
Pavle Goloskokovic
d743ac82c1 Added loaded flag to prevent multiple calls to onLoad method 2018-01-21 15:12:34 +01:00
Pavle Goloskokovic
e1c5969bd4 Calling loader nextFile method instead of callback 2018-01-21 15:11:30 +01:00
Pavle Goloskokovic
4160d738bc Passing loader reference to load method 2018-01-21 15:10:08 +01:00
Richard Davey
864fa638af Added LoadArray back in and sorted out callback passing. 2018-01-19 19:13:27 +00:00
Richard Davey
1d22f5a59a File has a reference to its Loader, will also now emit progress events on itself. 2018-01-19 19:13:02 +00:00
Richard Davey
7577f470ae You can now pass in a JS object to the JSON Loader instead of a URL. It will use the object to populate the data with. This impacts any loader type that uses json, so atlas, tilemap, audio sprite, etc. Closes #3147. 2018-01-19 17:53:07 +00:00
Richard Davey
76c7639b20 If a file load 404s then handle this case, as it'll return the 404 page as the response type which will then try to be parsed. 2018-01-19 17:29:14 +00:00
Richard Davey
f3d9f145a6 Fixed flow error when the Loader would never complete if every single file failed. 2018-01-19 17:28:48 +00:00
Richard Davey
8c3422f2b4 BaseURL adds trailing slash if missing. 2018-01-19 17:10:23 +00:00
Richard Davey
7c7336dd30 Loader.reset gets path and baseURL again. 2018-01-19 17:07:38 +00:00
Richard Davey
7e0b04df70 You can now specify Loader settings (baseURL, path, xhr settings, etc) in either the Game Config, the Scene Config or a File Config. Game config is used as the defaults. Scene config overrides those, and a File config overrides the Scene config. This fixes #3168. 2018-01-19 16:56:41 +00:00
Richard Davey
57444596e5 Loader now emits a progress event which can be used for progress bar loaders, etc. Also added setBasePath and removed console logs. 2018-01-19 16:30:04 +00:00
Pavle Goloskokovic
d50c04e9f8 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/loader/filetypes/AudioFile.js
 2018-01-19 16:30:43 +01:00
Richard Davey
e2d71e2c6d BaseLoader renamed LoaderPlugin, const updated, index updated. 2018-01-19 14:54:50 +00:00
Richard Davey
4aa6e931f1 Merging Loader into BaseLoader 2018-01-19 14:47:25 +00:00
Richard Davey
e18858010c Tidying up before merging with BaseLoader. 2018-01-19 13:52:03 +00:00
Richard Davey
f5462146e2 Added MultiAtlas loader. 2018-01-19 13:51:53 +00:00
Richard Davey
8983c93fc6 Added AudioSprite loader. 2018-01-19 13:51:12 +00:00
Richard Davey
db515d8724 All FileTypes now register themselves with the FileTypesManager, allowing devs to specify which loaders are included in their builds. 2018-01-19 13:29:26 +00:00
Richard Davey
676c5be1da Added global FileTypes manager. 2018-01-19 13:29:25 +00:00
Pavle Goloskokovic
f019b8ad75 Merge remote-tracking branch 'origin/master' 2018-01-19 12:08:40 +01:00
Pavle Goloskokovic
4bb8557081 Updated reference to the game object 2018-01-19 12:06:11 +01:00
Richard Davey
fb7cdbf29b Added ability to load plugins from external files and have them register with the PluginManager. 2018-01-18 16:48:25 +00:00
Pavle Goloskokovic
e889de2c20 Merge remote-tracking branch 'origin/master' 2018-01-18 16:09:29 +01:00
Richard Davey
2deb9edc9e Plugins now check to see if the Scene is already booted and adapt accordingly. 2018-01-18 14:00:31 +00:00
Pavle Goloskokovic
345f112ff8 Renamed touchLocked to locked 2018-01-18 14:05:20 +01:00
Pavle Goloskokovic
b61a4dec66 Passing sound manager locked property value instead of touchLocked to HTML5AudioFile constructor 2018-01-18 14:04:41 +01:00
Richard Davey
5a333bc2fd Updated to new Plugin format, removed injection and mapping 2018-01-18 05:18:09 +00:00
Michael Hadley
2e68f2507d Added Weltmeister support to Loader & Tilemap API 2018-01-17 18:34:00 -06:00
Michael Hadley
72a14df466 Shortened Tilemap format names 2018-01-17 18:34:00 -06:00
Pavle Goloskokovic
c4f4fbc79d Passing sound manager touchLocked value to HTML5AudioFile constructor 2018-01-17 17:04:55 +01:00
Pavle Goloskokovic
541cd83688 Using object property instead of local var 2018-01-17 17:04:06 +01:00
Pavle Goloskokovic
81f3b56b0a Added touchLocked argument to HTML5AudioFile class constructor 2018-01-17 17:01:50 +01:00
Pavle Goloskokovic
5c118a3a94 audio tag does not support name attribute so setting that value to dataset 2018-01-17 14:10:03 +01:00
Pavle Goloskokovic
196018d04a Updating load progress properties when sound is locked 2018-01-17 14:09:20 +01:00
Pavle Goloskokovic
5720dff5dc onLoad needs to be called from timeout callback in order to not cause issues 2018-01-17 14:08:38 +01:00
Pavle Goloskokovic
e75731df87 Calling onLoad directly if device sound is locked since we are skipping actual loading 2018-01-17 14:07:50 +01:00
Pavle Goloskokovic
ae36cf5729 Skipping calling load method on an audio tag on mobile devices 2018-01-17 14:06:46 +01:00
Pavle Goloskokovic
402aa27ff3 Skipping setting preload attribute and events on an audio tag on mobile devices 2018-01-17 14:05:35 +01:00
Richard Davey
f9a7939812 Lots of work migrating to the new plugin system, fixing references and exposing on the namespace 2018-01-16 22:28:29 +00:00
Richard Davey
8e07320596 Migrating to plugins 2018-01-16 19:49:13 +00:00
Richard Davey
674c1b5ba8 Moving plugins to their own locations 2018-01-16 18:34:37 +00:00
Pavle Goloskokovic
4be42c3edc Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/sound/BaseSound.js
#	src/sound/webaudio/WebAudioSound.js
 2018-01-14 15:50:55 +01:00
Richard Davey
f9a1e27334 Removed un-used event files and references. 2018-01-12 17:20:16 +00:00
Richard Davey
c625b8735b Updated to using Event Emitter for all key managers and game objects. Events are now dispatched directly using arguments instead of Event objects, all managers updated to emit directly. 2018-01-12 17:09:21 +00:00
Pavle Goloskokovic
aa820b08ea Setting audio tag name to contain index number, useful for debugging 2018-01-12 17:49:25 +01:00
Pavle Goloskokovic
ef60c16551 Marking audio tags as unused when creating them 2018-01-11 17:25:27 +01:00
Pavle Goloskokovic
0a10240c61 Moved HTML5AudioFile 2018-01-10 16:49:56 +01:00
Pavle Goloskokovic
d0d3a6473d Merge remote-tracking branch 'origin/master' 2018-01-10 16:20:13 +01:00
Richard Davey
d8f1ba03e9 Moved repository location 2018-01-09 21:43:56 +00:00
Richard Davey
0d90f75b5f Splitting the dev branch up into versions. 2016-11-22 01:36:56 +00:00
Richard Davey
d568d2bede Moved _sys to a StateSystems class to keep things much cleaner, and avoid setter inheritance mess. 2016-11-06 12:18:08 +00:00
Richard Davey
f9745bbce3 States now own a Loader instance, rather than it being a Phaser global. 2016-11-04 03:21:04 +00:00
Richard Davey
a366ef8f3c New State Manager up and running. 2016-11-04 02:08:17 +00:00
Richard Davey
322f711f58 Enabled the default and missing images again. 2016-10-30 22:56:17 +00:00
photonstorm
4f8e509f91 Fixed JSON Hash parsing. 2016-10-19 14:29:52 +01:00
photonstorm
18b12dfc3e Huge amount of work getting the WebGL renderer sorted out, tidied up and merged with the latest Texture and Transform components. 2016-10-18 17:03:25 +01:00
Richard Davey
35854ea58d Cache now adds in Default and Missing images to the new Texture Manager. 2016-10-13 00:08:11 +01:00
Richard Davey
a2ac0a2c58 Multi-atlas loader support complete, adding to the Texture Manager properly. 2016-10-11 22:11:54 +01:00
Richard Davey
65ce4928d9 Expanded multi-atlas support in the Loader. Fixing ESLint errors too. 2016-10-11 19:50:36 +01:00
photonstorm
775dee029d Added Loader.multiatlas - for multi-atlas textures. 2016-10-11 16:48:12 +01:00
photonstorm
ce3308ea1d Hooking the Loader and Cache into the new Texture Manager. 2016-10-11 14:52:17 +01:00
Richard Davey
e0ef9cab8b Hooked the Texture Manager into the Cache. 2016-10-10 23:57:51 +01:00