Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebaseing my fork #1

Merged
merged 292 commits into from
Nov 16, 2019
Merged

Rebaseing my fork #1

merged 292 commits into from
Nov 16, 2019

Conversation

BearFather
Copy link
Owner

No description provided.

JamzTheMan and others added 30 commits September 6, 2019 21:56
Fix for ConcurrentModificationException
 * Closes #665 and Closes #663
 * Added abeille-maptool-forms.jfpr project file to buil-resources
Add new Server Option for GM to Reveal FoW for Unowned Tokens.  Add option plus hosting status to output of getInfo("server").
- Add playStream(uri, cycleCount, volume) to play audio from url or local file.
- cycleCount: number of times to play the resource. -1 for infinite loop. Default: 1.
- volume: volume value from 0-1. Default: 1.
- Add stopStream(uri, remove) to stop a stream. If remove is set to 1, unload the stream from memory. Default: 1. If no uri specified, stop all sounds.
- Add editStream(uri, cycleCount, volume) to change the cycleCount or volume of stream.
- Add AppPreference playStreams to enable/disable playing streams
- Ex:

[playStream("https://www.fesliyanstudios.com/musicfiles/2019-05-01_-_Undercover_Spy_Agent_-_David_Fesliyan.mp3", -1, 0.8)]
- Fix access HashMap to be thread safe (now accessed solely from the JavaFX app single thread)
- Fix so that disabling streams in settings also stops all streams
Add playStream, stopStream, and editStream macro functions for playing/streaming audio.
- Move streaming methods to class MediaPlayerAdapter, as discussed in #668
- Add new parameters: startTime and stopTime to playStream & editStream
- playStream with cycleCount 0 preloads the stream but does not play it
- Add function getStreamProperties as suggested in #667
- Add support for volume slider through setGlobalVolume, but the slider needs to be created
Add features to playStream functions
- Fix getStreamProperties to return status "STOPPED" after song finished playing
- Change parameters startTime and stopTime to take seconds instead of ms
Fix streams that had finished returning "PLAYING" in getStreamProperties() , change input in ms for start/stop time to secs.
- Icons provided by @JamzTheMan

Co-Authored-By: Jamz <jamz@nerps.net>
- Add optional fadeout (in seconds) before closing a stream
- 0: no fadeout (default)
- Stream will stop once the fadeout period is over
- Suggested by @dorpond in #615
Add optional fadeout to stopStream().
- Add back,forward,next,pause,play,previous,record,record_on,repeat,shuffle,shuffle_on, and stop icons
- Move mute & volume icons to correct directory
- Icons will be used for #615
- Icons provided by @JamzTheMan

Co-Authored-By: Jamz <jamz@nerps.net>
Add sound icons to the github directory
- Add conversion of string to uri, replacing space into %20
- Add "FILE/:" at the start of uri if it is missing
- Fix issues raised in #667
- Change to using jitpack for clientserver
- Fix #679
Change to using jitpack for clientserver.  Should fix PR's failing in Travis test.
Now supports Windows file paths (and should support Mac & Linux as well) through URLDecoder class.
…682)

- Add special case so that "*" isn't modified
- Fix regression created by #678
- Fix #681
- Add new option "propertyType" to conditions in getTokens()
- Value can be a single type as string, or an array of types
- Simplify getTokens() code by removing the second loop. Now include/exclude is a filter property ("match")
- Improve performance of getTokens() by trimming the list continuously instead of constantly filtering the list of all tokens
- Close #676
…ernally (#672)

* jsonify "null", "true" and "false" into null true and false

* fix null handling, using the library Null object

* jsonify should be static and public
- Change so overlap is computed explicitely instead of using A*
- Much better performance
- Solves #683 for "area" but not for "range"
- Request only images in view from ImageManager
- Trigger repaint() from paint-affecting properties only if property
actually changes
- Calculate truncated caption heuristically
- Improve spacing
- Include caption in mouse capture area
- Antialias text
- Use interpolation when rendering scaled images
- Fix manhattan distance while moving tokens & in distance functions
- Fix getDistance, getDistanceToXY, getTokens ignoring metric parameter for isometric maps
- Close #688
Phergus and others added 29 commits October 30, 2019 06:38
- Add optional mapname parameters (defaults to current map)
- Add error message for incorrect number of parameters for FindToken functions
- Close #867
Add mapname parameter to getTokens and getTokenNames
- Change so that getTokens/getTokenNames parameter "mapName" added by #868 is instead specified as a condition
- Discussed in #867
Change getTokens "mapName" parameter to condition
Signed-off-by: JamzTheMan <JamzTheMan@gmail.com>
It now accepts body/payload.

This changes the signature of the macro a bit so Wiki update is needed as it no long follows REST.get signature.
This fixes an issue where some API's (like GitHub API) require data to be posted in the body.

Signed-off-by: JamzTheMan <JamzTheMan@gmail.com>
Signed-off-by: JamzTheMan <JamzTheMan@gmail.com>
Signed-off-by: JamzTheMan <JamzTheMan@gmail.com>
Add metadata to getMacroProps function
Signed-off-by: Lee Foster <Jamz@Nerps.net>
Changed REST.delete to follow post, patch, put format, fixes #874
Signed-off-by: JamzTheMan <JamzTheMan@gmail.com>
Adds ISO Formatted time with UTC offset
Fixes #775.  Strings were being returned with quotes.
* Update CHANGE_LOG.md

* Update CHANGE_LOG.md

Added info on 831 and 883.  Cleanup.
* Fix for #831 - numbers being returned as strings.

json.path.read() was returning numbers as strings.  Fixed.

* Forgot to run spotless

Gotta have that space in there. lol
Release 1.5.7 back to master.
@BearFather BearFather merged commit f008c3d into BearFather:master Nov 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants