Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-12-29 22:43:08 +00:00
Code Issues Projects Releases Packages Wiki Activity
8650 commits 10 branches 177 tags 1 GiB
Commit graph

4455 commits

Author SHA1 Message Date
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
faf89ea78a getTextureKeys method added to return all loaded textures. 2018-01-19 16:30:05 +00:00
Richard Davey
25089f66fd Scene will now be made active as soon as it has init'd, not after the load is complete. This allows a scene to render while loading assets. 2018-01-19 16:30:05 +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
Richard Davey
13ed054d79 Removed display of checksum. 2018-01-19 16:30:03 +00:00
Pavle Goloskokovic
ac7be301f1 Reverting previous commit since it did not fix the issue 2018-01-19 17:12:49 +01:00
Pavle Goloskokovic
d50c04e9f8 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/loader/filetypes/AudioFile.js
 2018-01-19 16:30:43 +01:00
Pavle Goloskokovic
999b7d96df skipping looping and ending logic if current time is 0 since some HTML5 Audio implementations set currentTime value to 0 when changing playback rate or performing any other operation on an audio tag object 2018-01-19 16:24:26 +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
b58814e8d7
Merge pull request #3172 from Antriel/master 
Added missing require for Point.
 2018-01-19 14:05:55 +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
Richard Davey
fd4cae12fc Removed un-used file. 2018-01-19 13:29:24 +00:00
Antriel
df7bc2e841 Added missing require for Point. 2018-01-19 14:20:45 +01:00
Michael Hadley
a6365c5339 Removing es6 'let' from AP vs tilemap 2018-01-19 06:56:52 -06:00
Pavle Goloskokovic
f7b0dcf56a Inverted condition to prevent nesting 2018-01-19 12:19:02 +01:00
Pavle Goloskokovic
ff8c039cf7 Inverted condition to prevent nesting 2018-01-19 12:17:34 +01:00
Pavle Goloskokovic
f019b8ad75 Merge remote-tracking branch 'origin/master' 2018-01-19 12:08:40 +01:00
Pavle Goloskokovic
fb96aeccd6 Removed game reference 2018-01-19 12:06:41 +01:00
Pavle Goloskokovic
4bb8557081 Updated reference to the game object 2018-01-19 12:06:11 +01:00
Felipe Alfonso
f388391c25 Merge branch 'master' into rendering-cleanup 2018-01-18 14:28:02 -03: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
d46662cd46 Swapped to using Number.MAX_VALUE so repeat -1 now works properly in IE11 and below. 2018-01-18 14:59:32 +00:00
Richard Davey
86fe054c63 Game boot sequence is now split-up to allow time for non-blocking, but time sensitive plugins (like the Texture Manager) to complete starting up before the main loop begins. Texture Manager now checks on state of default images before telling Game it is ready. 2018-01-18 14:01:29 +00: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
Richard Davey
69dbe38c9f Scene.Systems keeps track of it's booted, so plugins know how to respond to the boot event (or not). You can now also load a plugin into a Scene at runtime. 2018-01-18 13:59:37 +00:00
Pavle Goloskokovic
8968044d8f Removed ready event 2018-01-18 14:15:15 +01:00
Pavle Goloskokovic
ca614166b1 Using playCatchPromise for delayed sound playback 2018-01-18 14:14:14 +01:00
Pavle Goloskokovic
3a7d06b48a Using playCatchPromise when starting sound playback 2018-01-18 14:13:57 +01:00
Pavle Goloskokovic
ef98de7258 Added playCatchPromise method to handle possible exceptions thrown form audio tag play method 2018-01-18 14:13:29 +01:00
Pavle Goloskokovic
c1cb3c3ab2 Removing touchmove event listener on successful unlock 2018-01-18 14:12:32 +01:00
Pavle Goloskokovic
336f5b9028 Skipping unlocking if touchmove event occurred before touchend event 2018-01-18 14:11:49 +01:00
Pavle Goloskokovic
b036eecd9f Added detectMove method as touchmove event listener 2018-01-18 14:10:51 +01:00
Pavle Goloskokovic
01c246ac0b Added variable and method for keeping track of touch move events 2018-01-18 14:10:03 +01:00
Pavle Goloskokovic
718dce88b8 Setting correct totalDuration property value for all sounds when audio gets unlocked 2018-01-18 14:08:49 +01:00
Pavle Goloskokovic
9400c7ea93 Setting correct duration property value for all sounds when audio gets unlocked 2018-01-18 14:08:33 +01:00
Pavle Goloskokovic
c296ef2eb3 Emitting ready event when sound manager gets unlocked 2018-01-18 14:07:35 +01:00
Pavle Goloskokovic
58d6ab9a56 Emitting ready event if sound manager is not locked 2018-01-18 14:06:29 +01: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
3bb6099c6d Fixed key issue 2018-01-18 05:33:54 +00:00
Richard Davey
5461471bf3 Added ucfirst equivalent 2018-01-18 05:33:42 +00:00
Richard Davey
92e62b9368 Updated PluginManager to support installation and injection of global and local plugins 2018-01-18 05:21:14 +00:00
Richard Davey
c8d859c6a4 Systems now does everything based on events and config files, no more creation of its own plugins 2018-01-18 05:20:57 +00:00
Richard Davey
43d7e0fa0e Exposed the global and core plugins and updated the injection map 2018-01-18 05:20:33 +00:00
Richard Davey
53ec770696 Renamed to the correct class name: ScenePlugin 2018-01-18 05:20:00 +00:00
Richard Davey
0a523062f5 Exposed the Scene files via their own export 2018-01-18 05:19:42 +00:00
Richard Davey
dc3093ef56 Removed trailing slash 2018-01-18 05:19:17 +00:00
Richard Davey
abdbe2d1ee EE registered as a plugin 2018-01-18 05:19:00 +00:00
Richard Davey
776d178b38 Scene settings now checks for a plugins array 2018-01-18 05:18:45 +00:00
Richard Davey
5a333bc2fd Updated to new Plugin format, removed injection and mapping 2018-01-18 05:18:09 +00:00
Richard Davey
e017a71f32 Game emits a boot event, which its managers listen for 2018-01-18 05:16:52 +00:00
Richard Davey
3ba774997d Config now gets the DefaultScenePlugins 2018-01-18 05:16:02 +00:00
Richard Davey
31882e5b48 Method returns array of objects instead of array of arrays 2018-01-18 01:03:15 +00:00
Richard Davey
9cdd359327 Constructors no longer call setTo and getPointAB return object properties updated to x/y 2018-01-18 01:02:51 +00:00
Richard Davey
7458574d35 Merge branch 'master' of https://github.com/photonstorm/phaser 2018-01-18 00:59:41 +00:00
Richard Davey
dbfd73dea1 Pointer.reset no longer resets the isDown state or buttons 2018-01-18 00:59:38 +00:00
Michael Hadley
fd8cad1fb6 Add Impact method for loading collision map from Weltmeister file 2018-01-17 18:50:00 -06:00
Michael Hadley
821eae6eee Bug fix: weltmeister parser 2018-01-17 18:38:55 -06: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
Richard Davey
80fd5d9845 Moved camera controls to their own namespace 2018-01-18 00:08:38 +00:00
Felipe Alfonso
4983b393e3 Merge with master 2018-01-17 18:30:39 -03:00
Felipe Alfonso
cfe07706e6 Cleaning up WebGLRenderer 2018-01-17 18:25:43 -03:00
Pavle Goloskokovic
6be1406b8b Renamed locked action name property to prop 2018-01-17 19:16:21 +01:00
Pavle Goloskokovic
252b577ab4 Using manager.isLocked instead of removed checkTouchLocked method for loop property 2018-01-17 19:15:09 +01:00
Pavle Goloskokovic
25f22533fd Using manager.isLocked instead of removed checkTouchLocked method for seek property 2018-01-17 19:14:55 +01:00
Pavle Goloskokovic
216bde9577 Using manager.isLocked instead of removed checkTouchLocked method for detune property 2018-01-17 19:14:43 +01:00
Pavle Goloskokovic
99c9b786c8 Using manager.isLocked instead of removed checkTouchLocked method for rate property 2018-01-17 19:14:33 +01:00
Pavle Goloskokovic
94d7fb7d4f Using manager.isLocked instead of removed checkTouchLocked method for volume property 2018-01-17 19:14:18 +01:00
Pavle Goloskokovic
941b4f5ac8 Using manager.isLocked instead of removed checkTouchLocked method for mute property 2018-01-17 19:14:06 +01:00
Pavle Goloskokovic
4b6287c4cd Using manager.isLocked instead of removed checkTouchLocked method for stop method 2018-01-17 19:13:47 +01:00
Pavle Goloskokovic
5c0c89022e Using manager.isLocked instead of removed checkTouchLocked method for resume method 2018-01-17 19:13:36 +01:00
Pavle Goloskokovic
fb775d4063 Using manager.isLocked instead of removed checkTouchLocked method for pause method 2018-01-17 19:13:21 +01:00
Pavle Goloskokovic
ce6f3400e2 Using manager.isLocked instead of removed checkTouchLocked method for play method 2018-01-17 19:13:09 +01:00
Pavle Goloskokovic
cee22b158c Removed checkTouchLocked from HTML5AudioSound class 2018-01-17 19:11:50 +01:00
Pavle Goloskokovic
da56f97580 Removed touchLockedActionQueue from HTML5AudioSound class 2018-01-17 19:11:28 +01:00
Pavle Goloskokovic
913f388535 Added isLocked method to handle locked actions 2018-01-17 19:10:24 +01:00
Pavle Goloskokovic
b25af58495 Resetting lockedActionsQueue after performing all locked actions 2018-01-17 19:09:36 +01:00
Pavle Goloskokovic
88d26607ec Updated and simplified logic for performing locked actions 2018-01-17 19:07:52 +01:00
Pavle Goloskokovic
aacd7a972d Setting lockedActionsQueue value based on locked property value 2018-01-17 19:03:16 +01:00
Pavle Goloskokovic
19ec0fb735 Added lockedActionsQueue property to HTML5AudioSoundManager class for internal use 2018-01-17 19:02:10 +01:00
Michael Hadley
5bc09a2c5c Update AP physics to handle tiles where tileSize !== baseTileSize 2018-01-17 11:27:29 -06:00
Pavle Goloskokovic
bcb11d5c4e Moved queued sound actions logic from update method to unlocked event handler 2018-01-17 18:24:03 +01:00
Pavle Goloskokovic
fb52e3d490 Setting unlocked property to true when audio tags are ready 2018-01-17 18:19:51 +01:00
Pavle Goloskokovic
5f035c80e2 Removed condition since it is already performed in base class constructor 2018-01-17 18:19:26 +01:00
Pavle Goloskokovic
d388c827e4 Added a TODO for setting correct duration value when available 2018-01-17 18:18:22 +01:00
Pavle Goloskokovic
fdbda3cffa Setting locked property to value set in subclass if available 2018-01-17 18:17:31 +01:00
Pavle Goloskokovic
0f6f0ab45e Setting locked property for HTML5AudioSoundManager class 2018-01-17 18:17:01 +01:00
Pavle Goloskokovic
ff4e9616f3 Removed touchUnlocked property form HTML5AudioSoundManager class 2018-01-17 18:16:14 +01:00
Pavle Goloskokovic
6b1b7a1342 Removed touchLocked property form HTML5AudioSoundManager class 2018-01-17 18:15:50 +01:00
Pavle Goloskokovic
c6c3f1da79 Setting unlocked property to true when audio context resumes 2018-01-17 18:14:28 +01:00
Pavle Goloskokovic
bf0c868bf3 Removed condition since it is already performed in base class constructor 2018-01-17 18:13:52 +01:00
Pavle Goloskokovic
a90760f8df Setting locked property for WebAudioSoundManager 2018-01-17 18:13:04 +01:00
Pavle Goloskokovic
8ec82c3a4d Setting locked property to false after unlocking 2018-01-17 18:12:03 +01:00
Pavle Goloskokovic
28b098348b Handling unlocking in update method 2018-01-17 18:11:27 +01:00
Pavle Goloskokovic
fbb1388f2d Added unlocked property to BaseSoundManager class for internal use 2018-01-17 18:10:40 +01:00
Pavle Goloskokovic
9ed999fada Calling unlocked method only if locked property is set to true 2018-01-17 18:09:33 +01:00
Pavle Goloskokovic
31cd229bf2 Added locked property to BaseSoundManager class 2018-01-17 18:09:00 +01:00
Pavle Goloskokovic
94cefc9621 Resetting sound's touchLockedActionQueue 2018-01-17 17:35:54 +01:00
Pavle Goloskokovic
04b9996ac7 Sorting actions to be performed in chronological order 2018-01-17 17:35:33 +01:00
Pavle Goloskokovic
d8e36615e7 Gathering all actions and performing them sequentially 2018-01-17 17:35:08 +01:00
Pavle Goloskokovic
dc3938e8ff Added update method to handle unlocking 2018-01-17 17:32:41 +01:00
Pavle Goloskokovic
5916d9f423 Setting last audio tag event listener to set touchUnlocked when it is ready for playback 2018-01-17 17:31:56 +01:00
Pavle Goloskokovic
644a28cb3c Pushing all tags in an array before loading them 2018-01-17 17:31:01 +01:00
Pavle Goloskokovic
38e59f6f4b Using touchLocked value as condition 2018-01-17 17:29:18 +01:00
Pavle Goloskokovic
f52cfee58a Added touchUnlocked property to HTML5AudioSoundManager class 2018-01-17 17:27:59 +01:00
Pavle Goloskokovic
b9b5489ab3 Added touchLocked property to HTML5AudioSoundManager class 2018-01-17 17:27:28 +01:00
Pavle Goloskokovic
84a20395e6 Using checkTouchLocked with loop property 2018-01-17 17:25:43 +01:00
Pavle Goloskokovic
33bc3d8d5c Using checkTouchLocked with seek property 2018-01-17 17:23:20 +01:00
Pavle Goloskokovic
874b3d5bc1 Defined detune property getter 2018-01-17 17:23:04 +01:00
Pavle Goloskokovic
3ff214da59 Defined rate property getter 2018-01-17 17:22:54 +01:00
Pavle Goloskokovic
eb5be4c75d Defined detune property setter to be able to use checkTouchLocked with it 2018-01-17 17:22:30 +01:00
Pavle Goloskokovic
865f8d06ad Defined rate property setter to be able to use checkTouchLocked with it 2018-01-17 17:22:03 +01:00
Pavle Goloskokovic
c2f7795a98 Using checkTouchLocked with volume property 2018-01-17 17:21:07 +01:00
Pavle Goloskokovic
a9a3c3c2a2 Using checkTouchLocked with mute property 2018-01-17 17:20:44 +01:00
Pavle Goloskokovic
22154ceace Using checkTouchLocked with stop method 2018-01-17 17:19:39 +01:00
Pavle Goloskokovic
796f3657ac Using checkTouchLocked with resume method 2018-01-17 17:19:25 +01:00
Pavle Goloskokovic
893882fe95 Using checkTouchLocked with pause method 2018-01-17 17:19:15 +01:00
Pavle Goloskokovic
300ac5b859 Using checkTouchLocked with play method 2018-01-17 17:19:04 +01:00
Pavle Goloskokovic
093f295389 Added touchLockedActionQueue property to HTML5AudioSound class 2018-01-17 17:06:55 +01: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
Richard Davey
108b6bd2a3 Events call the world directly, avoids an unnecessary function jump. 2018-01-17 15:28:53 +00:00
Richard Davey
f41d016c9f Moved Matter over to use the plugin system. 2018-01-17 15:22:16 +00:00
Richard Davey
bae63901d7 fillPoint draws the rect in the center of the x/y coordinates instead of the top-left 2018-01-17 15:01:24 +00:00
Pavle Goloskokovic
be7741ed89 Resetting already started sounds before unlocking 2018-01-17 14:13:44 +01:00
Pavle Goloskokovic
0b4a8b8b2d Removed touchstart event listeners since they don't work for unlocking audio 2018-01-17 14:13:13 +01:00
Richard Davey
695a88b1c3
Merge pull request #3167 from Antriel/ellipse-fixes 
Few bug fixes for Ellipse methods.
 2018-01-17 13:12:54 +00:00
Pavle Goloskokovic
f510f71213 Implemented unlock method for HTML5AudioSoundManager class 2018-01-17 14:12:04 +01:00
Pavle Goloskokovic
4ca73ae362 Removing unlock call since it is now done in BaseSoundManager class 2018-01-17 14:10:54 +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
Pavle Goloskokovic
b33af6d2aa Calling unlock method in BaseSoundManager class constructor 2018-01-17 14:03:34 +01:00
Pavle Goloskokovic
377ab5a4e9 Defined unlock method on BaseSoundManager class as both implementations use it 2018-01-17 14:03:04 +01:00
Antriel
ca24bce499 Few bug fixes for Ellipse methods. 2018-01-17 11:43:34 +01:00
Antriel
3348f5bd16 Added support for drawing filled ellipse to Graphics. 2018-01-17 11:36:28 +01:00
Richard Davey
b17744df61 Merge branch 'master' of https://github.com/photonstorm/phaser 2018-01-17 03:42:03 +00:00
Richard Davey
ddba95873d Moved Arcade and Impact Physics over to the new plugin system 2018-01-17 03:41:58 +00:00
Michael Hadley
e9ab1725f3 Make tileset the source of truth for texture in both tilemap layers 2018-01-16 19:48:17 -06:00
Michael Hadley
814e5af815 Remove recalculation of tile bounds from arcade physics 2018-01-16 19:03:13 -06:00
Richard Davey
d1cd5cbc1d Tidied up destroy 2018-01-17 00:29:23 +00:00
Richard Davey
ad49a01271 Fixed rogue input reference and hitTest signature 2018-01-16 23:50:01 +00:00
Richard Davey
a7bd9482fd Fixed input injection 2018-01-16 23:18:02 +00: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
Felipe Alfonso
a41681c21a Merge branch 'master' into rendering-cleanup 2018-01-16 16:33:13 -03:00
Felipe Alfonso
fd4f441146 DynamicBitmapText WebGL renderer updated 2018-01-16 16:32:27 -03:00
Richard Davey
ca7550aa6f Moved plugins 2018-01-16 18:38:29 +00:00
Richard Davey
cd780604e5 Merge branch 'master' of https://github.com/photonstorm/phaser 2018-01-16 18:34:50 +00:00
Richard Davey
674c1b5ba8 Moving plugins to their own locations 2018-01-16 18:34:37 +00:00
Dan Flettre
36de5e8805 Pass event to ProcessKeyCombo 2018-01-16 11:24:40 -06:00
Richard Davey
7e5163adf0 Merged source. 2018-01-16 16:43:38 +00:00
Richard Davey
9a2eb0eb58 Merged source. 2018-01-16 16:37:34 +00:00
Richard Davey
570cbde7da Renamed SceneManager. 2018-01-16 16:33:30 +00:00
Richard Davey
d6a1abcd2a Renamed to CacheManager. 2018-01-16 16:30:11 +00:00
Richard Davey
17336a20de Merged source. 2018-01-16 16:29:58 +00:00
Felipe Alfonso
5c782c8f7d Merge branch 'master' into rendering-cleanup 2018-01-16 13:17:39 -03:00
Richard Davey
26fd3ee661 Renamed input manager files and refs. 2018-01-16 16:14:21 +00:00
Richard Davey
b4a01bb877 Moved file. 2018-01-16 16:02:11 +00:00
Richard Davey
08f3e70b6d Merged Input Manager source and updated paths. 2018-01-16 16:00:37 +00:00
Richard Davey
2c5405b7e3 Moved GIM 2018-01-16 15:47:53 +00:00
Richard Davey
42409762e9 Merged Input Manager source. 2018-01-16 15:46:49 +00:00
Richard Davey
89c04fc193 Merged Animation component. 2018-01-16 15:39:18 +00:00
Richard Davey
b0f22127d2 Merged Path source. 2018-01-16 15:29:36 +00:00
Richard Davey
b63586588a Merged Curve class. 2018-01-16 15:20:54 +00:00
Richard Davey
c60871a541 Removed incomplete files. 2018-01-16 15:10:30 +00:00
Richard Davey
be756ed7fc Renamed folder camera to cameras and split up the contents into proper namespaces. Merged inc files back into classes. 2018-01-16 15:07:04 +00:00
Richard Davey
c77c412183 Updated paths. 2018-01-16 13:04:35 +00:00
Richard Davey
df26c96438 Moved Animation files. 2018-01-16 13:00:55 +00:00
Richard Davey
8b66bdb331 Pre-RC source code merge and tidy-up. 2018-01-16 12:59:17 +00:00
Antriel
be39bd4260 Fixed rectangle/Union. 2018-01-16 11:04:14 +01:00
Antriel
44a2919774 Fixed rectangle/GetCenter. 2018-01-16 09:22:51 +01:00
Antriel
e342480ca4 Fixed rectangle/FitOutside. 2018-01-16 07:38:41 +01:00
Richard Davey
4240f6c4af Converted to use the new plugin format 2018-01-16 02:08:22 +00:00
Richard Davey
9fabd000b5 Updated the PluginManager to be a global level instance that belongs to Game and registers all plugins 2018-01-16 02:08:04 +00:00
Felipe Alfonso
77d4493f43 Merge branch 'master' into rendering-cleanup 2018-01-15 21:44:47 -03:00
Antriel
c11920ab1b Fixed rectangle/FitInside. 2018-01-15 13:38:14 +01:00
Pavle Goloskokovic
63c402517c Handling when WebGL context is falsy and not just null 2018-01-15 12:05:11 +01:00
Pavle Goloskokovic
3664e84e19 Merge remote-tracking branch 'origin/master' 2018-01-15 11:29:55 +01:00
Pavle Goloskokovic
2e60619218 Fixed detecting WebGL support 2018-01-15 11:29:38 +01:00
Michael Hadley
f86298b8d2 Tilemap layers now initialize their alpha from LayerData 
This makes it easy to import layer alphas from Tiled
 2018-01-14 16:16:47 -06:00
Richard Davey
696643051a Fixed drag events 2018-01-14 21:26:14 +00:00
Pavle Goloskokovic
e8e4a5633d Removed completed TODO 2018-01-14 17:39:29 +01:00
Pavle Goloskokovic
9a4811df32 Emitting loop event when sound loop setting value changes 2018-01-14 17:39:10 +01:00
Pavle Goloskokovic
8b676cf743 Renamed loop event to looped for emitting event when sound has looped 2018-01-14 17:38:59 +01:00
Pavle Goloskokovic
846aefd7c1 Emitting loop event when sound loop setting value changes 2018-01-14 17:38:33 +01:00
Pavle Goloskokovic
8f692b8fb9 Renamed loop event to looped for emitting event when sound has looped 2018-01-14 17:37:52 +01:00
Pavle Goloskokovic
1fe58bc1ef Refactored update method looping and ending logic a bit 2018-01-14 17:32:19 +01:00
Pavle Goloskokovic
2a70eb9c09 Removed completed TODO 2018-01-14 17:23:24 +01:00
Pavle Goloskokovic
ab02e843f3 Checking for loop between two update calls only if loop setting is set to true 2018-01-14 17:23:09 +01:00
Pavle Goloskokovic
4b9c94ebbe Added a TODO to change loop event to looped and emit loop event when loop value changes 2018-01-14 17:22:32 +01:00
Pavle Goloskokovic
919d2d658a Using EventEmitter emit method to dispatch seek update event 2018-01-14 17:21:24 +01:00
Pavle Goloskokovic
dd2bd9695d Using EventEmitter emit method to dispatch volume update event 2018-01-14 17:20:31 +01:00
Pavle Goloskokovic
913c93eca1 Using EventEmitter emit method to dispatch mute update event 2018-01-14 17:20:20 +01:00
Pavle Goloskokovic
1912dd98df Using EventEmitter emit method to dispatch loop event 2018-01-14 17:19:57 +01:00
Pavle Goloskokovic
8ba0c3d39e Using EventEmitter emit method to dispatch ended event 2018-01-14 17:19:37 +01:00
Pavle Goloskokovic
14e7cb4b75 Using EventEmitter emit method to dispatch stop event 2018-01-14 17:18:53 +01:00
Pavle Goloskokovic
ac04061478 Using EventEmitter emit method to dispatch resume event 2018-01-14 17:18:39 +01:00
Pavle Goloskokovic
be03100765 Using EventEmitter emit method to dispatch pause event 2018-01-14 17:18:26 +01:00
Pavle Goloskokovic
d5ffad06aa Using EventEmitter emit method to dispatch play event 2018-01-14 17:18:02 +01:00
Pavle Goloskokovic
cbb055f15c Using EventEmitter emit method to dispatch volume update event 2018-01-14 16:54:11 +01:00
Pavle Goloskokovic
209b0caed3 Using EventEmitter emit method to dispatch mute update event 2018-01-14 16:53:48 +01:00
Pavle Goloskokovic
45eed34095 Passing reference to sound object when emitting volume event 2018-01-14 16:48:55 +01:00
Pavle Goloskokovic
452f9a13ab Passing reference to sound object when emitting mute event 2018-01-14 16:48:25 +01:00
Pavle Goloskokovic
8cfe7bce4e Added a todo to document events 2018-01-14 16:38:01 +01:00
Pavle Goloskokovic
39c35f15f9 Passing reference to sound manager when emitting detune event 2018-01-14 16:37:37 +01:00
Pavle Goloskokovic
f2049195c1 Pasing reference to sound manager when emitting rate event 2018-01-14 16:37:12 +01:00
Pavle Goloskokovic
c715a8a031 Pasing reference to sound manager when emitting stopall event 2018-01-14 16:36:56 +01:00
Pavle Goloskokovic
6cb35024de Pasing reference to sound manager when emitting resumeall event 2018-01-14 16:36:44 +01:00
Pavle Goloskokovic
8c9ba8ce2c Pasing reference to sound manager when emitting pauseall event 2018-01-14 16:36:29 +01:00
Pavle Goloskokovic
a76a721969 Using EventEmitter emit method to dispatch detune update event 2018-01-14 16:13:09 +01:00
Pavle Goloskokovic
7b2ed7f5a9 Using EventEmitter emit method to dispatch rate update event 2018-01-14 16:12:48 +01: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
Pavle Goloskokovic
8b67797252 Simplified delay calculation logic on focus loose 2018-01-14 15:45:32 +01:00
Pavle Goloskokovic
b0ec0edbbc Calling sound's onFocus method instead of resume when sounds resume on game focus gain 2018-01-14 15:38:11 +01:00
Pavle Goloskokovic
ff885e2ead Added onFocus method to be used when sound resumes when game gains focus 2018-01-14 15:37:38 +01:00
Pavle Goloskokovic
381799b040 Calling sound's onBlur method instead of pause when sounds stop on game focus loss 2018-01-14 15:36:39 +01:00
Pavle Goloskokovic
5c5df3f582 Marking sound as paused on blur to avoid update logic being run on it 2018-01-14 15:35:21 +01:00
Pavle Goloskokovic
bf77380814 Added onBlur method to be used when sound pauses on loose of focus 
Saving sound state and stopping it
 2018-01-14 15:34:23 +01:00
Pavle Goloskokovic
a6ec0af472 Using loopEndOffset when checking if sound looped 2018-01-14 15:32:30 +01:00
Pavle Goloskokovic
042f778167 Defining loopEndOffset property for HTML5AudioSoundManager class 2018-01-14 15:31:24 +01:00
Pavle Goloskokovic
60693d6da8 Using audioPlayDelay when checking for delay end for delayed playback 2018-01-14 15:30:27 +01:00
Pavle Goloskokovic
7384d9abcb Defining audioPlayDelay property for HTML5AudioSoundManager class 2018-01-14 15:29:27 +01:00
Pavle Goloskokovic
2d20759df9 Fixed ms to s conversion for delay value when setting start time for delayed playback 2018-01-14 15:28:16 +01:00
Pavle Goloskokovic
65538e3408 Properly setting currentTime variable value when detecting missed looping in update method 2018-01-14 15:24:55 +01:00
Pavle Goloskokovic
5b0cf55bfc Properly setting currentTime variable value when detecting looping in update method 2018-01-14 15:24:06 +01:00
Pavle Goloskokovic
f832c35de4 Properly setting previousTime value when setting seek value 2018-01-14 15:22:49 +01:00
Pavle Goloskokovic
de08ac36d5 Properly setting previousTime value when handling delayed playback in update method 2018-01-14 15:22:18 +01:00
Pavle Goloskokovic
ab6c924ccf Properly setting previousTime value when picking and playing audio tag 2018-01-14 15:21:06 +01:00
Felipe Alfonso
ad1701d0ed Changed Image gl pipeline 2018-01-12 21:20:41 -03:00
Felipe Alfonso
79805ac04f Merge branch 'master' into rendering-cleanup 2018-01-12 21:15:06 -03:00
Felipe Alfonso
8bb9b1309f SpriteBatch pipeline re-implementation 2018-01-12 21:13:41 -03:00
Michael Hadley
bf413ea604 Implemented tile & layer callbacks in arcade physics 2018-01-12 15:00:37 -06:00
Michael Hadley
ef58640026 Arcade: tilemap collisions/overlaps now emit appropriate events 2018-01-12 14:23:36 -06:00
Michael Hadley
8f0b428209 Bug fix in events: overlap used where collide should be 2018-01-12 14:20:48 -06:00
Richard Davey
f00f467eec Matter now using new EventEmitter. 2018-01-12 18:59:11 +00:00
Richard Davey
36b4d79369 Removed the old events folder contents and added in an EventEmitter alias for user-land event creation. 2018-01-12 18:59:01 +00:00
Pavle Goloskokovic
0efa048015 Taking into account marker start time when calculating seek 2018-01-12 18:23:07 +01:00
Richard Davey
f9a1e27334 Removed un-used event files and references. 2018-01-12 17:20:16 +00:00
Richard Davey
874a174af7 Fixed lint issue. 2018-01-12 17:20:00 +00:00
Pavle Goloskokovic
f941cabe07 Completed a TODO to clean up html5 audio stuff when calling destroy 2018-01-12 18:16:27 +01:00
Pavle Goloskokovic
44acc440f4 When hijacking audio form other sounds, sorting them by progress rather than just seek, so that we favorize longer sounds to continue their playback 2018-01-12 18:15:52 +01:00
Felipe Alfonso
3282ead8a7 Merge branch 'master' into rendering-cleanup 2018-01-12 14:11:18 -03: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
Richard Davey
296efe0e07 Removed input callbacks as all handled via events now. 2018-01-12 17:09:20 +00:00
Richard Davey
bca6bd692e You can now specify a defaultTextureKey for animation configurations, to avoid having it inside of every frame object. 2018-01-12 17:09:20 +00:00
Michael Hadley
15825eacb3 Add note about circle bodies not currently being supported in Arcade tile intersection 2018-01-12 10:53:36 -06:00
Pavle Goloskokovic
aa820b08ea Setting audio tag name to contain index number, useful for debugging 2018-01-12 17:49:25 +01:00
Felipe Alfonso
5ca2805dbc Fixed issue with blitter batch incorrect instruction order and forced unsigned int result for color tint operation 2018-01-12 13:46:46 -03:00
Pavle Goloskokovic
9bb138f40d Dispatching event when setting HTML5AudioSoundManager volume property 2018-01-12 17:26:16 +01:00
Pavle Goloskokovic
30027af69e Dispatching event when setting HTML5AudioSoundManager mute property 2018-01-12 17:25:59 +01:00
Pavle Goloskokovic
8f3f88c24d Checking for set audio property instead of isPlaying flag 2018-01-12 17:19:03 +01:00
Pavle Goloskokovic
919665dd96 Fixed scope issue 2018-01-12 17:11:12 +01:00
Felipe Alfonso
40262eb0cb Merge branch 'master' into rendering-cleanup 2018-01-12 12:42:45 -03:00
Pavle Goloskokovic
95d0b5f784 Merge remote-tracking branch 'origin/master' 2018-01-12 16:12:23 +01:00
Pavle Goloskokovic
4038291373 Changed the order of defining startTime and previousTime properties 2018-01-12 16:12:15 +01:00
Pavle Goloskokovic
b2eef5b96e Added a todo 2018-01-12 16:03:15 +01:00
Pavle Goloskokovic
2a76c6eff5 Updating previousTime property when setting seek value 2018-01-12 16:01:19 +01:00
Pavle Goloskokovic
1cdebc80c3 Updating previousTime when picking and playing audio for sound 2018-01-12 16:00:37 +01:00
Pavle Goloskokovic
1180d82c27 Updating previousTime when starting sound with delayed playback 2018-01-12 15:59:40 +01:00
Pavle Goloskokovic
398b337da9 Resetting previousTime property when stopping sound or hijacking audio from another sound 2018-01-12 15:58:43 +01:00
Pavle Goloskokovic
de9e5a0d1f Updating currentTime to new audio currentTime value while handling looping before assigning that value to previousTime property 2018-01-12 15:57:55 +01:00
Pavle Goloskokovic
a51a0bd543 Setting previousTime property to currentTime value at the end of update method 
Using condition when current time is less then previous time to indicate sound looping and dispatch an event
 2018-01-12 15:39:58 +01:00
Pavle Goloskokovic
1ec66f644f Added previousTime property to keep track of audio tag's playback position recorded on previous update method call 2018-01-12 15:32:30 +01:00
Pavle Goloskokovic
9ec4d9a829 Fixing sound position if sound loops and starts from the beginning between two update calls 2018-01-12 15:30:11 +01:00
Pavle Goloskokovic
735cf10a3f Dispatching SOUND_ENDED event when sound ends, obviously :) 2018-01-12 15:28:06 +01:00
Pavle Goloskokovic
72955bfe30 Handling sound ending in update method 2018-01-12 15:27:25 +01:00
Pavle Goloskokovic
0d0df1900b Added logic for handling looping in update method 2018-01-12 15:23:39 +01:00
Pavle Goloskokovic
81d794b4c6 Setting audio to correct state when starting it since it might be playing already when hijacked form another sound 2018-01-12 15:18:31 +01:00
Richard Davey
d554d61319
Merge pull request #3158 from Flet/KeyComboMatchEvent-fix 
set data to KeyCombo for KeyComboMatchEvent
 2018-01-12 10:31:51 +00:00
yp
242471beb9 Renamed no longer existing Vector2/3 .sub and .len to .subtract and .length where still used 2018-01-12 02:18:36 +02:00
Dan Flettre
16b672e291 set data to KeyCombo for KeyComboMatchEvent 2018-01-11 18:14:45 -06:00
Michael Hadley
bab399a02e Made CollideHandler consistent by returning value from logic branches 
Each branch should return true/false based on whether a collision happened
 2018-01-11 14:13:42 -06:00
Michael Hadley
00cebf8eae CollideGroupVsTilemapLayer implementation 2018-01-11 14:03:34 -06:00
Pavle Goloskokovic
e68ff2b18a Saving current position of the sound and stopping and releasing audio tag when calling pause method 2018-01-11 18:55:42 +01:00
Pavle Goloskokovic
f6de613fd0 Added stopAndReleaseAudioTag method to stop sound playback and mark audio tag as unused and release it for other sounds to use 2018-01-11 18:53:54 +01:00
Pavle Goloskokovic
8578319171 requiring SoundEvent class 2018-01-11 18:51:02 +01:00
Pavle Goloskokovic
40b2bf79b7 Calling pickAndPlayAudioTag from resume method 2018-01-11 18:50:25 +01:00
Pavle Goloskokovic
9e7ccb1503 Added helpful flags comment 2018-01-11 18:49:44 +01:00
Pavle Goloskokovic
a6b4066468 Moved logic for setting up and playing audio tag so it can be reused 2018-01-11 18:45:34 +01:00
Pavle Goloskokovic
f9093a2d7e Disabling setting seek property on a delayed sound 2018-01-11 18:41:43 +01:00
Pavle Goloskokovic
81e8542af7 Resetting startTime property of a hijacked sound 2018-01-11 18:40:36 +01:00
Pavle Goloskokovic
fb29afedae Preventing resume calls on delayed sounds 2018-01-11 18:39:45 +01:00
Pavle Goloskokovic
c1b24c4adb Preventing pause calls on delayed sounds 2018-01-11 18:39:19 +01:00
Pavle Goloskokovic
fb6b989035 Handling delayed playback in update method 2018-01-11 18:31:36 +01:00
Pavle Goloskokovic
3388fd018f Setting startTime based on delay config when calling play method 2018-01-11 18:30:16 +01:00
Pavle Goloskokovic
d6256c47c5 Defined startTime property 2018-01-11 18:23:28 +01:00
Pavle Goloskokovic
82819ec782 Setting sound position, applying config and starting playback if delay is set to 0 when calling play method 2018-01-11 18:20:18 +01:00
Pavle Goloskokovic
11923621ad Finding available audio tag when calling play method and resetting and returning false if it was not successful 2018-01-11 18:17:50 +01:00
Pavle Goloskokovic
af8666f611 Added reset method that calls super stop method in order to reset sounds state 
Calling reset method and setting audio to null after hijacking audio tag from another sound
 2018-01-11 18:15:42 +01:00
Pavle Goloskokovic
106e32499f Sorting sounds to hijack audio from by loop and seek properties values 2018-01-11 18:12:52 +01:00
Pavle Goloskokovic
f377b4fa85 Finding another sound to hijack audio tag from if there are no free audio tags and override setting is set to true 2018-01-11 18:11:10 +01:00
Pavle Goloskokovic
fc19a05f0b Returning false if override setting of sound manager is set to false 2018-01-11 18:05:12 +01:00
Pavle Goloskokovic
935ef78102 Added method for finding unused audio tag for playing sound 2018-01-11 18:04:17 +01:00
Pavle Goloskokovic
6730b3b314 Defined seek property for HTML5AudioSound class 2018-01-11 18:00:42 +01:00
Pavle Goloskokovic
d6b11e2fdb Defined seek property's setter for HTML5AudioSound class 2018-01-11 17:59:36 +01:00
Pavle Goloskokovic
afb8075379 Defined seek property's setter for HTML5AudioSound class 2018-01-11 17:58:26 +01:00
Pavle Goloskokovic
110c6891dd Defined volume property for HTML5AudioSound class 2018-01-11 17:57:04 +01:00
Pavle Goloskokovic
8f9eafd315 Defined mute property for HTML5AudioSound class 2018-01-11 17:55:05 +01:00
Pavle Goloskokovic
495a79d4bf Implemented setRate method 2018-01-11 17:51:58 +01:00
Pavle Goloskokovic
91f9629ed2 Implemented setVolume method 2018-01-11 17:50:20 +01:00
Pavle Goloskokovic
162a063f03 Implemented setMute method 2018-01-11 17:49:40 +01:00
Pavle Goloskokovic
ede81f2a03 Added destroy method 2018-01-11 17:48:23 +01:00
Pavle Goloskokovic
0223019290 Added blank update method 2018-01-11 17:47:01 +01:00
Pavle Goloskokovic
d51156fe94 Added stop method implementation that calls super method and dispatches stop event 2018-01-11 17:45:02 +01:00
Pavle Goloskokovic
196258b8ac Added resume method implementation that calls super method and dispatches resume event 2018-01-11 17:43:56 +01:00
Pavle Goloskokovic
5e8d0dcaee Added pause method implementation that calls super method and dispatches pause event 2018-01-11 17:42:18 +01:00
Pavle Goloskokovic
d3c034e5cc Added play method implementation that calls super method and dispatches play event 2018-01-11 17:40:59 +01:00
Pavle Goloskokovic
b452859b78 Assigning duration and totalDuration values to audio tag duration 2018-01-11 17:38:47 +01:00
Pavle Goloskokovic
1d925105bd Audio property docs update 2018-01-11 17:37:28 +01:00
Pavle Goloskokovic
ad858d1475 Throwing an error if no sound with given key was loaded 2018-01-11 17:36:51 +01:00
Pavle Goloskokovic
cf83880fb0 Defined tags property that holds reference to audio tags array 2018-01-11 17:35:25 +01:00
Pavle Goloskokovic
b22116e1f8 Updated override property docs 2018-01-11 17:32:49 +01:00
Pavle Goloskokovic
2372fdd812 Completed a TODO to return HTML5AudioSoundManager instance when necessary 2018-01-11 17:29:57 +01:00
Pavle Goloskokovic
7c715f1ba0 Removed detune property since it is already implemented in BaseSound class 2018-01-11 17:28:52 +01:00
Pavle Goloskokovic
be713af155 Removed rate property since it is already implemented in BaseSound class 2018-01-11 17:28:25 +01:00
Pavle Goloskokovic
98700ffff2 Updating play method to return boolean indicating if play call was done successfully 2018-01-11 17:27:19 +01:00
Pavle Goloskokovic
15562a70e3 Updated override property docs 2018-01-11 17:25:55 +01:00
Pavle Goloskokovic
ef60c16551 Marking audio tags as unused when creating them 2018-01-11 17:25:27 +01:00
Pavle Goloskokovic
2903417798 Defining detune property on a BaseSound class since it's the shared behaviour between subclasses 2018-01-11 17:24:53 +01:00
Pavle Goloskokovic
15f2717e9b Defining rate property on a BaseSound class since it's the shared behaviour between subclasses 2018-01-11 17:24:26 +01:00
Pavle Goloskokovic
c0c6e39ccd Updating play method to return boolean indicating if play call was done successfully 2018-01-11 17:22:57 +01:00
Pavle Goloskokovic
5aec2e45e4 Merge remote-tracking branch 'origin/master' 2018-01-11 16:51:11 +01:00
Pavle Goloskokovic
e75871adec Added override property to HTML5AudioSoundManager 2018-01-11 16:50:50 +01:00
Richard Davey
829747370c Merge branch 'master' of https://github.com/photonstorm/phaser 2018-01-11 14:48:46 +00:00
Richard Davey
e601f4060a Exposed SoundManager via Scene Systems 2018-01-11 14:48:43 +00:00
Michael Hadley
5241798ab3 Pass TILE_BIAS from arcade world into tile colliding functions 2018-01-11 08:32:07 -06:00
Richard Davey
718859b02e Moved the depth sorting functions into the DisplayList class, as it's really the one responsible for it, not System. 2018-01-11 13:59:06 +00:00
Michael Hadley
98ae8009e0 Arcade rect vs tilemap layer collision handling 2018-01-10 20:47:25 -06:00
Michael Hadley
fdc1af0cd2 Install isTilemap prop used by physics system for fast type checking 2018-01-10 20:45:28 -06:00
Michael Hadley
32788d6eb6 Stub arcade collide vs tilemap methods 2018-01-10 20:43:11 -06:00
Michael Hadley
e3699aaea0 Remove unnecessary Arcade Body#tilePadding 2018-01-10 19:34:22 -06:00
Felipe Alfonso
8e66cf9f98 Merge branch 'master' into rendering-cleanup 2018-01-10 17:05:32 -03:00
Felipe Alfonso
54274b782a BlitterBatch pipeline working 2018-01-10 17:03:01 -03:00
Richard Davey
04b8f4203e Started moving plugins to their own folders. 2018-01-10 16:29:46 +00:00
Pavle Goloskokovic
9fc3aaa0da Moved HTML5AudioSoundManager.js 2018-01-10 16:50:21 +01:00