Skip to content

Commit

Permalink
adventure-composer -> adventure-editor name refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
bladecoder committed Nov 9, 2015
1 parent 305cca9 commit 52db2dc
Show file tree
Hide file tree
Showing 392 changed files with 266 additions and 253 deletions.
40 changes: 20 additions & 20 deletions CHANGELOG.md
Expand Up @@ -16,7 +16,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
## [0.8.9]

### Added
- Editor: Added input panels for text input.
- EDITOR: Added input panels for text input.
- Better aspect ratio support. Correct support for 4:3, 16:9 and 16:10.
- Pause the game when an exception/error is thrown and debug mode is
activated.
Expand All @@ -38,7 +38,7 @@ activated.
- Compute BBox in renderer Refactor to allow recompute bbox when animation complete.
- Fix animationTime when reverse animation in SpineRenderer
- Fix save/game screen slot size
- Composer: fix when generating world keys for i18n + doesn't remove ui.* keys.
- EDITOR: fix when generating world keys for i18n + doesn't remove ui.* keys.

## [0.8.7]

Expand Down Expand Up @@ -88,11 +88,11 @@ activated.
- Added configurable align (top, down, left, right, center)
- Added configurable autosize behaviour
- Added arrow icon for exits when showing hotspots
- Composer: Added several config properties in the Game Properties tab
- EDITOR: Added several config properties in the Game Properties tab

### Fixed

-composer: fix world width and height was not recalculated when loading
-EDITOR: fix world width and height was not recalculated when loading

## [0.8.1]

Expand All @@ -107,13 +107,13 @@ activated.
- Spine atlas in animations

### Fixed
- COMPOSER: Dialog editing fix
- EDITOR: Dialog editing fix

## [0.7.2]
### Added
- libgdx v1.5.6 update
- update to the latest spine libgdx runtime
- Composer: Enable/disable actions
- EDITOR: Enable/disable actions
- Backround images must be inside atlas now
- Added control actions
- Added ActorAttrAction
Expand All @@ -123,18 +123,18 @@ activated.
- PositionAction now works with BaseActors (no animation)

### Fixed
- Composer: fixes to inputpanels
- EDITOR: fixes to inputpanels
- fix OptionInputPanel when mandatory
- Reset testScene when changing current scene
- ActorProps: Show pos for BaseActors
- Composer: change some edit defaults
- EDITOR: change some edit defaults
- walkzone fix when dinamic obstacles
- fill animation/actor list when setText()

## [0.7.1]
- Action refactor
- Composer: Undo support
- Composer: Fake depth vector can be setting dragging ui markers
- EDITOR: Undo support
- EDITOR: Fake depth vector can be setting dragging ui markers
- Actor ZIndex
- RunVerb now allows iterating over a list of verbs
- Scene cache
Expand All @@ -153,7 +153,7 @@ activated.
## [0.6.8]

### Fixed
- Composer only release: Fix bug when saving project
- Editor only release: Fix bug when saving project

## [0.6.7]

Expand Down Expand Up @@ -191,9 +191,9 @@ activated.
- Transition moved to World

## [0.6.2]
- i18n workflow in composer working
- i18n workflow in Editor working
- Added event handling in Spine plugin
- composer dialog tree: edit and delete fixes
- Editor dialog tree: edit and delete fixes
- fix CameraAction when no selecting any target
- fix enter/leave verb conflicts name. Rename to enter/exit
- fix xml action loading
Expand All @@ -207,8 +207,8 @@ activated.
## [0.6.0]
- Created Spine plugin and set as optional when creating a project.
- Refactor: FrameAnimation -> AnimationDesc, SpriteRenderer -> ActorRenderer
- COMPOSER: fix several IOS related bugs. IOS Ipad/Iphone testing and working fine.
- COMPOSER: fix create resolution. Now atlas upacking/packing is supported
- EDITOR: fix several IOS related bugs. IOS Ipad/Iphone testing and working fine.
- EDITOR: fix create resolution. Now atlas upacking/packing is supported

## [0.5.0]
- Updated to libgdx 1.4.1
Expand All @@ -219,10 +219,10 @@ activated.
- ENGINE: Custom game UI Screen support

## [0.3.2]
- COMPOSER: Fixed bug when running project without console
- EDITOR: Fixed bug when running project without console

## [0.3.1]
- COMPOSER: Fixed accessing opengl context issue when creating project in the new thread.
- EDITOR: Fixed accessing opengl context issue when creating project in the new thread.

## [0.3.0]
- ENGINE: Action refactoring. WARNING: Names have changed. All previous games are not compatible.
Expand All @@ -231,9 +231,9 @@ activated.
- ENGINE: The blade-engine.jar are now in Maven Central. When creating a new game, the Maven dependency is added instead of adding the engine jar in libs folder.

## [0.2.0]
- COMPOSER: Fixed NullPointer error when creating project
- COMPOSER: Threads for long tasks to show UI message status
- COMPOSER: FIXED packaging with embedded JRE.
- EDITOR: Fixed NullPointer error when creating project
- EDITOR: Threads for long tasks to show UI message status
- EDITOR: FIXED packaging with embedded JRE.
- ENGINE: CreditsScreen fonts now obtained from Skin

## [0.1.0]
Expand Down
18 changes: 9 additions & 9 deletions README.md
Expand Up @@ -9,15 +9,15 @@ By creating the **Bladecoder Adventure Engine**, I want to create a platform to

The **Bladecoder Adventure Engine** is composed of the following subprojects:

* **adventure-composer**: the graphical editor for creating point and click games.
* **blade-engine**: the engine to run the games created with `adventure-composer`.
* **adventure-editor**: the graphical editor for creating point and click games.
* **blade-engine**: the engine to run the games created with `adventure-editor`.

The **Bladecoder Adventure Engine** has been developed using the [LibGDX](http://libgdx.badlogicgames.com/) framework and the project generates a layout similar to any LibGDX project. This lowers the learning curve and eases development and deploy on several platforms.

### Adventure Composer
The **Adventure Composer** is a graphical editor to create full point and click games with minimal programming.
### Adventure Editor
The **Adventure Editor** is a graphical editor to create full point and click games with minimal programming.

![adventure composer 2014-09-26](https://cloud.githubusercontent.com/assets/6229260/4420346/1d3a1b8a-4578-11e4-8eec-415f5e27c005.png)
![adventure editor 2014-09-26](https://cloud.githubusercontent.com/assets/6229260/4420346/1d3a1b8a-4578-11e4-8eec-415f5e27c005.png)

### Blade Engine
The Engine has the following features:
Expand All @@ -31,7 +31,7 @@ The Engine has the following features:

The **Bladecoder Adventure Engine** is currently under continuous development and it's almost ready for production. **The Goddess Robbery** is a test game created to show the features of the Engine.

The source of **The Goddess Robbery** can be downloaded [here](https://github.com/bladecoder/bladecoder-adventure-tests/tree/master/venus) and it's useful to learn how to use the **Adventure Composer**.
The source of **The Goddess Robbery** can be downloaded [here](https://github.com/bladecoder/bladecoder-adventure-tests/tree/master/venus) and it's useful to learn how to use the **Adventure Editor**.

**The Goddess Robbery** is also available for Android devices at the Google Play Store.

Expand All @@ -44,15 +44,15 @@ Build:

$ ./gradlew build

Run the Adventure Composer:
Run the Adventure Editor:

$ ./gradlew run

Create a distribution package for the Adventure Composer:
Create a distribution package for the Adventure Editor:

$ ./gradlew distZip

A zip package ready for distribution is created in the folder 'bladecoder-adventure-engine/adventure-composer/build/distributions'
A zip package ready for distribution is created in the folder 'bladecoder-adventure-engine/adventure-editor/build/distributions'

### License
The **Bladecoder Adventure Engine** is licensed under the [Apache 2 License](http://www.apache.org/licenses/LICENSE-2.0.html), meaning you
Expand Down
Binary file not shown.
134 changes: 0 additions & 134 deletions adventure-composer/assets-raw/editor/icons-atlas/title.svg

This file was deleted.

Binary file not shown.

This file was deleted.

File renamed without changes.
158 changes: 158 additions & 0 deletions adventure-editor/assets-raw/editor/icons-atlas/title.svg

Large diffs are not rendered by default.

File renamed without changes.
@@ -1,4 +1,4 @@
name=AdventureComposer
name=AdventureEditor
main.class=com.bladecoder.engineeditor.ui.Main
version=0.1.0
icon=./package-files/icon.ico
File renamed without changes.
File renamed without changes.
Expand Up @@ -40,18 +40,10 @@
import com.bladecoder.engineeditor.ui.ScenePanel;
import com.bladecoder.engineeditor.utils.EditorLogger;
import com.bladecoder.engineeditor.utils.Message;
import com.bladecoder.engineeditor.utils.Versions;

//TODO: Show COPYRIGHT_STR + VERSION_STR
//TODO: Set TITLE in window bar. Set '*' in the title when modified

public class Editor implements ApplicationListener {
public static final String VERSION_STR = Versions.getVersion();
public static final String COPYRIGHT_STR = "2013 - Rafael García\nhttp://bladecoder.blogspot.com";
public static final String TITLE = "Adventure Composer";

// public static final String SKIN = "skin/HoloSkin/Holo-dark-ldpi.json";
// public static final String SKIN = "skin/uiskin.json";
public static final String SKIN = "skin/BladeSkin/BladeSkin-ldpi.json";

Stage stage;
Expand Down Expand Up @@ -81,23 +73,22 @@ public void create() {

Table rightPanel = new Table();
rightPanel.top().left();
// rightPanel.add(scenePanel).expand().fill();
// rightPanel.row();
rightPanel.add(actorPanel).expand().fill();

SplitPane splitPaneRight = new SplitPane(scnEditor, rightPanel,
false, skin);

splitPaneRight.setSplitAmount(0.75f);

// LEFT PANEL
ProjectPanel projectPanel = new ProjectPanel(skin);
// AssetPanel assetPanel = new AssetPanel(skin);
Image img = new Image(Ctx.assetManager.getIcon("title"));
img.setScaling(Scaling.none);
img.setAlign(Align.left);

Table leftPanel = new Table();
leftPanel.top().left().padLeft(10);
leftPanel.add(img).expand().fill().padBottom(20).padTop(20).padLeft(20);
leftPanel.add(img).expand().fill().padBottom(20).padTop(20).padLeft(0);
leftPanel.row();
leftPanel.add(new ProjectToolbar(skin)).expandX().fill();
leftPanel.row();
Expand All @@ -108,7 +99,7 @@ public void create() {
SplitPane splitPaneLeft = new SplitPane(leftPanel, splitPaneRight,
false, skin);
splitPaneLeft.setFillParent(true);
splitPaneLeft.setSplitAmount(0.3f);
splitPaneLeft.setSplitAmount(0.25f);
stage.addActor(splitPaneLeft);

// LOAD LAST OPEN PROJECT
Expand Down
Expand Up @@ -20,6 +20,7 @@
import com.badlogic.gdx.Files.FileType;
import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;
import com.bladecoder.engineeditor.utils.Versions;

import javafx.embed.swing.JFXPanel;

Expand All @@ -31,7 +32,7 @@ public static void main(final String[] args) {

LwjglApplicationConfiguration cfg = new LwjglApplicationConfiguration();

cfg.title = "Adventure Composer";
cfg.title = "Adventure Editor v" + Versions.getVersion();
cfg.width = 1920 / 2;
cfg.height = 1080 / 2;

Expand Down
Expand Up @@ -78,7 +78,7 @@ public class Project extends PropertyChange {
public static final int DEFAULT_WIDTH = 1920;
public static final int DEFAULT_HEIGHT = 1080;

private static final String CONFIG_DIR = System.getProperty("user.home") + "/.AdventureComposer";
private static final String CONFIG_DIR = System.getProperty("user.home") + "/.AdventureEditor";
private static final String CONFIG_FILENAME = "config.properties";

public static final String LAST_PROJECT_PROP = "last_project";
Expand Down

0 comments on commit 52db2dc

Please sign in to comment.