Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
raeleus committed Mar 22, 2019
2 parents c401536 + dd8203f commit 35b49eb
Show file tree
Hide file tree
Showing 45 changed files with 2,650 additions and 1,133 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ dist/
nbdist/
nbactions.xml
nb-configuration.xml
/.nb-gradle/

## Gradle

Expand All @@ -65,3 +66,5 @@ build/
/.nb-gradle/
core/assets/temp/
core/assets/imagefont/
desktop/jpackage/
desktop/samples/
21 changes: 21 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
### Skin Composer Version 28 ###
* BREAKING CHANGE: Bitmap/Freetype Font settings files may not be compatible with this version of Skin Composer unless converted to UTF-8.

* Skin Composer now has a wiki: https://github.com/raeleus/skin-composer/wiki
* Resolved release issues with Mac and Windows.
* Dialogs now highlight which field needs to be completed in order to continue.
* Added option to not show warnings when exporting a skin.
* Added option to import/export colors in a skin JSON as hexadecimal.
* Default export path is now a per project setting to prevent unfortunate accidents.
* Allow loading characters from a text file (UTF-8) in Font dialogs. This allows for any Unicode characters to be included in your fonts.
* Added detail view to Drawables dialog.
* Improved Image Font dialog's calculation of default baseline.
* Fixed pressing enter while typing in the preview dismisses the Image Font dialog.
* Fixed Create Bitmap Font dialog not closing file stream.
* Fixed errors when creating new font that overrides existing drawables.
* Fixed errors when opening a project with missing assets on Mac.
* Fixed unable to import FreeType fonts when importing a skin.
* Fixed filter error in native dialogs on Mac.
* Changes to texture packer settings no longer influence internal rendering of assets. This prevents "useIndexes" from crashing skin composer.
* Minor bug fixes and interface improvements.

### Skin Composer Version 27 ###
* Added filter option for Drawables dialog. Click the filter button or type text directly in the dialog.
* Allow drag and drop of folders into Drawables and Fonts dialogs.
Expand Down
12 changes: 3 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
### ![Logo](docs/images/logo.png) ###

* Use Skin Composer to create skins for LibGDX's Scene2d.UI!
* Version 27
* Version 28
* Live preview of all widgets with configurable options
* Specify tinted, tiled, and custom created Drawables right in the editor
* Includes BitmapFont editor and Image font generator like Shoebox
Expand All @@ -24,14 +24,8 @@ See more examples and sample code at [Ray3k](https://ray3k.wordpress.com/artwork

### Notes ###

To run Skin Composer on OSX, use the executable Mac release. If that fails, download the skin_composer_mac.jar version of the app and run it via terminal with the following command: **java -XstartOnFirstThread -jar skin_composer_mac.jar**

To run/build the project in Idea/Android Studio, do the following:

* In 'File/Project Structure...' set the project language level to 10
* Update run configuration with the following VM Option: -XstartOnFirstThread

Thanks to contributer RaimundWege for this information.
Skin Composer has now has wiki: [start here](https://github.com/raeleus/skin-composer/wiki) to begin learning!
To run Skin Composer on OSX, please see the [wiki](https://github.com/raeleus/skin-composer/wiki/Getting-Started-With-Mac "Getting Started With Mac") for details.

### License ###
MIT License
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ allprojects {
apply plugin: "eclipse"
apply plugin: "idea"

version = '27'
version = '28'
ext {
appName = "SkinComposer"
gdxVersion = '1.9.10-SNAPSHOT'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
rotation: false,
minWidth: 16,
minHeight: 16,
maxWidth: 1024,
maxHeight: 1024,
maxWidth: 2048,
maxHeight: 2048,
square: true,
stripWhitespaceX: false,
stripWhitespaceY: false,
Expand Down
37 changes: 37 additions & 0 deletions core/assets/atlas-internal-settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
pot: true,
paddingX: 2,
paddingY: 2,
bleed: true,
edgePadding: true,
duplicatePadding: true,
rotation: false,
minWidth: 16,
minHeight: 16,
maxWidth: 2048,
maxHeight: 2048,
square: true,
stripWhitespaceX: false,
stripWhitespaceY: false,
alphaThreshold: 0,
filterMin: Linear,
filterMag: Linear,
wrapX: ClampToEdge,
wrapY: ClampToEdge,
format: RGBA8888,
alias: true,
outputFormat: png,
jpegQuality: 0.9,
ignoreBlankImages: true,
fast: true,
debug: false,
combineSubdirectories: false,
flattenPaths: true,
silent: true,
premultiplyAlpha: false,
useIndexes: false,
limitMemory: true,
grid: false,
scale: [ 1 ],
scaleSuffix: [ "" ]
}
Binary file added core/assets/skin-composer-ui/MPLUS1p-Bold.ttf
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 35b49eb

Please sign in to comment.