Live Weather and Styling #10

GammaGames · 2016-01-24T21:49:55Z

Added the option to get live weather using weather underground, from #5
Added alternate icons that change between play and pause to indicate #6 (not in options, just happens by default, could be added)
CSS to make the range, radio, and checkbox inpuits look nicer, renamed the css file to reflect this
town tune page has colors
Volume slider now goes in increments of 0.05 instead of 0.1

Stuff in ignore file: Now ignores .mp3 Stuff in css file: Modified width of pitch boxes so the text was more centered Added CSS for range sliders (to color the actual slider thumb later) Stuff in editor js file: Now makes the pitch box be the note color Modified default tune to match new notes Changed flash color to white Added function to get hex color from pitch Stuff in player js file: Changed available pitches Fixed typo

This reverts commit def1bfe.

This reverts commit 06e56a9.

Changes in extension.js: Add option for automatic pausing Add option for using current weather (using my api key, should add option for custom key) Icon image changes when pausing or unpausing Change default tune to new format Add function to check if tabs are audible (showing mic) Add function to fade music in from silence Add function to set current weather condtions Changes in manifest.json: Add openweathermap to permissions (hopefully it works) Changes in options.html: Fix radio buttons and checkboxes for css styling Add beta section for WIP features Add option for new features Changes in tune_editor.css: Add css for radio, checkboxes, text input, buttons, and default sliders

Fixed town tune editor colors

Changes in extension.js: Added local weather variable for live weather (no longer synced in options) updateWeatherCond no longer requires url If weather setting was just updated/extension just started set timeout (updateWeatherCond is asynchronous)

Add option to show current weather as badge text

Move to new OOP approach Add styling for input: radio, checkbox, text, range Add option to show live weather using a zip and country code from openweathermap's api Add option to hide text on badge Icon now uses pause/play pictures Add pitch colors to Town Tune editor Change available pitch to fit game editor more

Un comment out town tune setting Update default town tune Not sure what's causing the issue so the town tune isn't playing anymore...

Town tune now correctly plays for hour changes Add function to utilities, get correct audiosrc file depending on game Fix text box background from gross yellow color

Updating to kylechu's latest commit

There are now 20 possible values for volume instead of 10.

Removed some stuff I had commented out that no longer worked

kowsen · 2016-01-24T22:04:28Z

I'm not a git expert, but I think if you rebase this pull request based on the current state of the JdotCarver repo, it'll make the changes easier to see and should fix the conflicts.

kowsen · 2016-01-24T22:13:33Z

scripts/AudioManager.js

+
+	addEventListener("hourMusic", playHourlyMusic);
+
+	addEventListener("weatherMusic", playWeatherMusic);


I feel like it would be better to handle determining what weather's music we want to play in StateManager rather than AudioManager. For example, if it is snowing and we're on the live weather option, just send "new-leaf-snowing" as the game in a normal hourMusic message. This setup clutters the system with two new events, and means if we want to change the way music plays, we would need to do it in multiple places - and I don't see any advantages to determining what music should be played in AudioManager that offset this.

This is a very good point, and it would work a lot nicer if there were the WeatherManager object like you referenced later. To get the weather working I was modifying it like I had before, this is a much better solution

Fixed functions in badgeManager being in global namespace Fixed AudioManager having control over the badge, now all contained in BadgeManager Moved several functions from Utility to a more appropriate location

# Conflicts: # css/tune_editor.css # manifest.json # options.html # scripts/AudioManager.js # scripts/BadgeManager.js # scripts/NotificationManager.js # scripts/StateManager.js # scripts/TownTuneManager.js # scripts/main.js # scripts/options.js

And re-add fixes from ec294bb

GammaGames · 2016-01-24T23:08:47Z

Thanks for the tips kylechu! I've done some of them, you can see over at ec294bb.

Unfortunately I've got to work on classes right now, so I won't be able to work on the WeatherManager object for the next couple days at least, though I do agree it would go a long way with simplifying this.

JdotCarver · 2016-01-25T04:33:22Z

Geez, so many additions! I have got to try them out! Possibly enough for the next release now.

kowsen · 2016-01-25T08:23:47Z

I just remembered that I started trying to write a WeatherManager object when I first saw your code. I just fixed some bugs in it and I think got everything working - you can check it out here and take whatever ideas you want from it - e78a6d5.

JdotCarver · 2016-01-25T18:14:49Z

Just tell me when you're ready for the merge and I'll implement it. :)

JdotCarver · 2016-01-25T18:15:35Z

Btw Please reply under what name you'd wish to appear in the credits. :)

mherndon6 · 2016-01-25T20:58:19Z

Hey, I've been working on a couple features on kylechu's branch. I added some styling to the options page and added the mix all option. I'll make it compatible with GammaGames's changes and submit another pull request tonight.

Borrowed ideas from e78a6d5 to fit the OOP format better

Fixed town tune sliders not updating color

# Conflicts: # manifest.json # scripts/AudioManager.js # scripts/StateManager.js # scripts/Utility.js

Merged with master again, new looping options should still work

GammaGames · 2016-01-26T00:17:02Z

I merged twice on accident, the first automatic one added some <<<<<HEAD lines in places and I had to go through and check to make sure all the looping options were still working.
Might need to be modified a bit, I'm still using playPause(true) to star the audio

Should all be working now! I've updated adding a WeatherManager. The object checks for new weather every 10 minutes
For credit I'd like "Jesse Lieberg", thanks!

kowsen · 2016-01-26T00:34:29Z

scripts/StateManager.js

+	}
+
+	// get current weather conditions using openweathermap: http://openweathermap.org/current
+	function updateWeatherCond(zip, country, cb) {


updateWeatherCond is redundant and should be deleted if we have a weatherManager object

Removed old functions from AudioManager Made KK icon show during his time Re-add easier support for other games to do live music in StateManager WeatherManager doesn't change on same category change

GammaGames · 2016-01-26T02:18:11Z

Thanks for the tips again, you've been incredibly helpful in getting this clean and nice to work with :)
As far as I can see the features are working, but you should probably wait for kylechu's go ahead first since he obviously knows his stuff!

kowsen · 2016-01-26T02:27:32Z

scripts/BadgeManager.js

 	});
+
+	function play(kk) {


I'm not the biggest fan of the functions being called "play" and "pause", since that makes them sound like they're controlling the music. Maybe have one function called changeIcon that takes two variables - isPlaying and isKK?

This is just a minor nitpick though.

kowsen · 2016-01-26T02:30:00Z

You're absolutely welcome, always happy to help and grateful for the confidence you've put in me! I'm happy with this pull request - everything's looking really nice! I haven't tested it thoroughly, but I will over the next few days, and it sounds like Gamma's done some tests.

The comment on the diff I made a few minutes ago is just a super minor nitpick. If Gamma agrees and wants to change it, it would make me happy, but I think it's good as-is.

Moves change badge icon to one function

Updated play/pause icons Badge icon now has 100% opacity when playing, 50% when paused instead of play/pause symbols Included 50% opaque version for mherndon's branch Changed icon files from "-01" and "-02" to "_paused" and "_playing"

GammaGames · 2016-01-29T21:10:57Z

The play/pause badge icons always bugged me, so I took some inspiration from mherdon6's branch. I've only changed a few things in the latest commit:

I removed some extra icons that were never used (19 and 128 versions for most of them)
Changed the icons to the more New Leaf color, with 50% opacity when paused and 100% when playing.
Renamed the png files to make more sense

I've also included a 50% opacity icon of KK for mherdon6's alternate icon branch, because his work over there is pretty cool!
These changes should not have broken anything, I'm still running it regularly and haven't found any issues.

BordenJardine · 2016-01-30T00:03:55Z

scripts/StateManager.js

+	function getMusic() {
+		if(isLive()) {
+			if(weatherManager.getWeather() == "Rain")
+				return "new-leaf-raining";


only works in new leaf?

The extension doesn't have any audio files for WW/CF raining, at least that I saw. It could always be added later though

I'll get / upload them today.

JdotCarver · 2016-01-31T19:05:40Z

Got the files in mp3 format, I'll reencode them in ogg with Audition when I come back to my main rig. (With the reduced bitrate and I'll update looping times with it too)

GammaGames added 13 commits January 4, 2016 17:28

Revert "Town Tune Editor Changes"

06e56a9

This reverts commit def1bfe.

Revert "Revert "Town Tune Editor Changes""

e080ed2

This reverts commit 06e56a9.

Town Tune Fix

cfaacda

Fixed town tune editor colors

Make Weather Music Automatically Play

c795ce0

Changes in extension.js: Added local weather variable for live weather (no longer synced in options) updateWeatherCond no longer requires url If weather setting was just updated/extension just started set timeout (updateWeatherCond is asynchronous)

Weather Badge Text

a0af393

Add option to show current weather as badge text

Hourly Weather Music

7963041

Un comment out town tune setting Update default town tune Not sure what's causing the issue so the town tune isn't playing anymore...

Fix Town Tune and various CSS

e50c9f9

Town tune now correctly plays for hour changes Add function to utilities, get correct audiosrc file depending on game Fix text box background from gross yellow color

Fix pause listener

6d2fb19

Updating to kylechu's latest commit

Increase options for volume range

b7f34a4

There are now 20 possible values for volume instead of 10.

Remove hidden autoplay settings

8efe67b

Removed some stuff I had commented out that no longer worked

kowsen reviewed Jan 24, 2016
View reviewed changes

GammaGames added 3 commits January 24, 2016 15:56

Fixes suggested

ec294bb

Fixed functions in badgeManager being in global namespace Fixed AudioManager having control over the badge, now all contained in BadgeManager Moved several functions from Utility to a more appropriate location

Update from JdotCarver branch

4254af2

And re-add fixes from ec294bb

GammaGames added 2 commits January 25, 2016 16:41

Moved live weather to object

83e3232

Borrowed ideas from e78a6d5 to fit the OOP format better

Set DEBUG_FLAG to false

dd0ad48

GammaGames added 3 commits January 25, 2016 16:59

Town Tune Colors

f5d6500

Fixed town tune sliders not updating color

Merge remote-tracking branch 'refs/remotes/JdotCarver/master'

0186680

# Conflicts: # manifest.json # scripts/AudioManager.js # scripts/StateManager.js # scripts/Utility.js

Merge with master

0e4bd82

Merged with master again, new looping options should still work

kowsen reviewed Jan 26, 2016
View reviewed changes

Removing legacy and fixes

0edc9d8

Removed old functions from AudioManager Made KK icon show during his time Re-add easier support for other games to do live music in StateManager WeatherManager doesn't change on same category change

kowsen reviewed Jan 26, 2016
View reviewed changes

GammaGames added 2 commits January 25, 2016 19:56

Change badge icon

643fc1a

Moves change badge icon to one function

Update icons

a5b90bb

Updated play/pause icons Badge icon now has 100% opacity when playing, 50% when paused instead of play/pause symbols Included 50% opaque version for mherndon's branch Changed icon files from "-01" and "-02" to "_paused" and "_playing"

BordenJardine reviewed Jan 30, 2016
View reviewed changes

JdotCarver added a commit that referenced this pull request Jan 31, 2016

Merge pull request #10 from GammaGames/master

a7d853c

JdotCarver merged commit a7d853c into animal-crossing-music-extension:master Jan 31, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Live Weather and Styling #10

Live Weather and Styling #10

GammaGames commented Jan 24, 2016

kowsen commented Jan 24, 2016

kowsen Jan 24, 2016

GammaGames Jan 24, 2016

GammaGames commented Jan 24, 2016

JdotCarver commented Jan 25, 2016

kowsen commented Jan 25, 2016

JdotCarver commented Jan 25, 2016

JdotCarver commented Jan 25, 2016

mherndon6 commented Jan 25, 2016

GammaGames commented Jan 26, 2016

kowsen Jan 26, 2016

GammaGames commented Jan 26, 2016

kowsen Jan 26, 2016

kowsen commented Jan 26, 2016

GammaGames commented Jan 29, 2016

BordenJardine Jan 30, 2016

GammaGames Jan 30, 2016

JdotCarver Jan 30, 2016

JdotCarver commented Jan 31, 2016


		addEventListener("hourMusic", playHourlyMusic);

		addEventListener("weatherMusic", playWeatherMusic);

Live Weather and Styling #10

Live Weather and Styling #10

Conversation

GammaGames commented Jan 24, 2016

kowsen commented Jan 24, 2016

kowsen Jan 24, 2016

Choose a reason for hiding this comment

GammaGames Jan 24, 2016

Choose a reason for hiding this comment

GammaGames commented Jan 24, 2016

JdotCarver commented Jan 25, 2016

kowsen commented Jan 25, 2016

JdotCarver commented Jan 25, 2016

JdotCarver commented Jan 25, 2016

mherndon6 commented Jan 25, 2016

GammaGames commented Jan 26, 2016

kowsen Jan 26, 2016

Choose a reason for hiding this comment

GammaGames commented Jan 26, 2016

kowsen Jan 26, 2016

Choose a reason for hiding this comment

kowsen commented Jan 26, 2016

GammaGames commented Jan 29, 2016

BordenJardine Jan 30, 2016

Choose a reason for hiding this comment

GammaGames Jan 30, 2016

Choose a reason for hiding this comment

JdotCarver Jan 30, 2016

Choose a reason for hiding this comment

JdotCarver commented Jan 31, 2016