Skip to content

Commit

Permalink
Merge tag '1.0.2' into develop
Browse files Browse the repository at this point in the history
1.0.2
  • Loading branch information
Bam4d committed Apr 21, 2021
2 parents ce0e53f + 80d69b5 commit a0c8d0a
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. mac/linux/windows]
- Version [e.g. 1.0.1]
- Version [e.g. 1.0.2]

**Additional context**
Add any other context about the problem here.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.10.0)
project(Griddly VERSION 1.0.1)
project(Griddly VERSION 1.0.2)

set(BINARY ${CMAKE_PROJECT_NAME})

Expand Down
2 changes: 1 addition & 1 deletion bindings/python.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace griddly {

PYBIND11_MODULE(python_griddly, m) {
m.doc() = "Griddly python bindings";
m.attr("version") = "1.0.1";
m.attr("version") = "1.0.2";

#ifndef NDEBUG
spdlog::set_level(spdlog::level::debug);
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
author = 'Chris Bamford'

# The full version, including alpha/beta/rc tags
release = '1.0.1'
release = '1.0.2'


# -- General configuration ---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def griddly_package_data(config='Debug'):

setup(
name='griddly',
version="1.0.1",
version="1.0.2",
author_email="[email protected]",
description="Griddly Python Libraries",
long_description=long_description,
Expand Down
2 changes: 1 addition & 1 deletion src/Griddly/Core/Observers/SpriteObserver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ vk::SpriteData SpriteObserver::loadImage(std::string imageFilename) {
stbi_uc* pixels = stbi_load(absoluteFilePath.c_str(), &width, &height, &channels, STBI_rgb_alpha);

if (!pixels) {
throw std::runtime_error("Failed to load texture image.");
throw std::runtime_error(fmt::format("Failed to load texture image {0}.",imageFilename));
}

int outputWidth = observerConfig_.tileSize.x;
Expand Down

0 comments on commit a0c8d0a

Please sign in to comment.