Commit graph

3981 commits

Author SHA1 Message Date
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
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
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
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
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