Skip to content

Commit

Permalink
Merge branch 'release/1.4.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Bam4d committed Jul 15, 2022
2 parents 01c6d97 + 754b15d commit 24c21c3
Show file tree
Hide file tree
Showing 1,170 changed files with 50,469 additions and 9,901 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.3.9]
- Version [e.g. 1.4.0]

**Additional context**
Add any other context about the problem here.
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.0)
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment version")
project(Griddly VERSION 1.3.9)
project(Griddly VERSION 1.4.0)

set(BINARY ${CMAKE_PROJECT_NAME})

Expand Down Expand Up @@ -133,12 +133,12 @@ if(WASM)

file(GLOB_RECURSE JIDDLY_SOURCES "js/bindings/*.cpp")

add_executable(jiddly ${JIDDLY_SOURCES} )
target_link_libraries(jiddly PRIVATE ${BINARY} yaml-cpp glm)
add_executable(griddlyjs ${JIDDLY_SOURCES} )
target_link_libraries(griddlyjs PRIVATE ${BINARY} yaml-cpp glm)

# These properties specify what kind of Emscripten build to perform and are assigned to our 'a-simple-triangle' executable target.
set_target_properties(
jiddly
griddlyjs
PROPERTIES
LINK_FLAGS
"-lembind -fexceptions -s ENVIRONMENT=web -s ALLOW_MEMORY_GROWTH=1 -sNO_DISABLE_EXCEPTION_THROWING -sASYNCIFY -sMODULARIZE=1"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# <p align="center">![Griddly Bear](resources/images/gvgai/oryx/bear2.png) Griddly ![Griddly Bear](resources/images/gvgai/oryx/bear2.png)</p>
# <p align="center">![Griddly](resources/logo.png)</p>
<div align="center">

[![Discord Chat](https://img.shields.io/discord/728222413397164142.svg)](https://discord.gg/xuR8Dsv)
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.3.9";
m.attr("version") = "1.4.0";

#ifndef NDEBUG
spdlog::set_level(spdlog::level::debug);
Expand Down
10 changes: 9 additions & 1 deletion docs/_static/custom.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,12 @@

.embedded-video {
text-align: center;
}
}

.level-gallery img {
max-height: 200px !important;
width: auto !important;
max-width: 200px !important;
height: auto !important;
}

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.3.9'
release = '1.4.0'


# -- General configuration ---------------------------------------------------
Expand Down
Binary file modified docs/games/Bait/img/Bait-level-Block2D-0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/games/Bait/img/Bait-level-Block2D-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/games/Bait/img/Bait-level-Block2D-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/games/Bait/img/Bait-level-Block2D-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/games/Bait/img/Bait-level-Block2D-4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/games/Bait/img/Bait-level-Vector-0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/games/Bait/img/Bait-level-Vector-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/games/Bait/img/Bait-level-Vector-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/games/Bait/img/Bait-level-Vector-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/games/Bait/img/Bait-level-Vector-4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/games/Bait/img/Bait-tile-avatar-Vector.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/games/Bait/img/Bait-tile-box-Block2D.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/games/Bait/img/Bait-tile-box-Vector.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/games/Bait/img/Bait-tile-goal-Vector.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/games/Bait/img/Bait-tile-hole-Vector.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/games/Bait/img/Bait-tile-key-Block2D.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/games/Bait/img/Bait-tile-key-Vector.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/games/Bait/img/Bait-tile-mushroom-Vector.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/games/Bait/img/Bait-tile-wall-Block2D.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/games/Bait/img/Bait-tile-wall-Vector.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions docs/games/Bait/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Levels
---------

.. list-table:: Levels
:class: level-gallery
:header-rows: 1

* -
Expand Down
Binary file modified docs/games/Bait_With_Keys/img/Bait_With_Keys-level-Block2D-0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/games/Bait_With_Keys/img/Bait_With_Keys-level-Block2D-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/games/Bait_With_Keys/img/Bait_With_Keys-level-Block2D-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/games/Bait_With_Keys/img/Bait_With_Keys-level-Block2D-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/games/Bait_With_Keys/img/Bait_With_Keys-level-Block2D-4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/games/Bait_With_Keys/img/Bait_With_Keys-level-Vector-0.png
Binary file modified docs/games/Bait_With_Keys/img/Bait_With_Keys-level-Vector-1.png
Binary file modified docs/games/Bait_With_Keys/img/Bait_With_Keys-level-Vector-2.png
Binary file modified docs/games/Bait_With_Keys/img/Bait_With_Keys-level-Vector-3.png
Binary file modified docs/games/Bait_With_Keys/img/Bait_With_Keys-level-Vector-4.png
Binary file modified docs/games/Bait_With_Keys/img/Bait_With_Keys-tile-box-Vector.png
1 change: 1 addition & 0 deletions docs/games/Bait_With_Keys/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Levels
---------

.. list-table:: Levels
:class: level-gallery
:header-rows: 1

* -
Expand Down
1 change: 1 addition & 0 deletions docs/games/Butterflies_and_Spiders/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Levels
---------

.. list-table:: Levels
:class: level-gallery
:header-rows: 1

* -
Expand Down
Binary file modified docs/games/Clusters/img/Clusters-level-Block2D-0.png
Binary file modified docs/games/Clusters/img/Clusters-level-Block2D-1.png
Binary file modified docs/games/Clusters/img/Clusters-level-Block2D-2.png
Binary file modified docs/games/Clusters/img/Clusters-level-Block2D-3.png
Binary file modified docs/games/Clusters/img/Clusters-level-Block2D-4.png
Binary file modified docs/games/Clusters/img/Clusters-level-Vector-0.png
Binary file modified docs/games/Clusters/img/Clusters-level-Vector-1.png
Binary file modified docs/games/Clusters/img/Clusters-level-Vector-2.png
Binary file modified docs/games/Clusters/img/Clusters-level-Vector-3.png
Binary file modified docs/games/Clusters/img/Clusters-level-Vector-4.png
Binary file modified docs/games/Clusters/img/Clusters-tile-avatar-Vector.png
Binary file modified docs/games/Clusters/img/Clusters-tile-blue_block-Vector.png
Binary file modified docs/games/Clusters/img/Clusters-tile-blue_box-Block2D.png
Binary file modified docs/games/Clusters/img/Clusters-tile-blue_box-Vector.png
Binary file modified docs/games/Clusters/img/Clusters-tile-green_block-Vector.png
Binary file modified docs/games/Clusters/img/Clusters-tile-green_box-Block2D.png
Binary file modified docs/games/Clusters/img/Clusters-tile-green_box-Vector.png
Binary file modified docs/games/Clusters/img/Clusters-tile-red_block-Vector.png
Binary file modified docs/games/Clusters/img/Clusters-tile-red_box-Block2D.png
Binary file modified docs/games/Clusters/img/Clusters-tile-red_box-Vector.png
Binary file modified docs/games/Clusters/img/Clusters-tile-spike-Block2D.png
Binary file modified docs/games/Clusters/img/Clusters-tile-spike-Vector.png
Binary file modified docs/games/Clusters/img/Clusters-tile-wall-Block2D.png
Binary file modified docs/games/Clusters/img/Clusters-tile-wall-Vector.png
1 change: 1 addition & 0 deletions docs/games/Clusters/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Levels
---------

.. list-table:: Levels
:class: level-gallery
:header-rows: 1

* -
Expand Down
Binary file modified docs/games/Cook_Me_Pasta/img/Cook_Me_Pasta-level-Block2D-0.png
Binary file modified docs/games/Cook_Me_Pasta/img/Cook_Me_Pasta-level-Block2D-1.png
Binary file modified docs/games/Cook_Me_Pasta/img/Cook_Me_Pasta-level-Block2D-2.png
Binary file modified docs/games/Cook_Me_Pasta/img/Cook_Me_Pasta-level-Block2D-3.png
Binary file modified docs/games/Cook_Me_Pasta/img/Cook_Me_Pasta-level-Block2D-4.png
Binary file modified docs/games/Cook_Me_Pasta/img/Cook_Me_Pasta-level-Block2D-5.png
Binary file modified docs/games/Cook_Me_Pasta/img/Cook_Me_Pasta-level-Sprite2D-2.png
Binary file modified docs/games/Cook_Me_Pasta/img/Cook_Me_Pasta-level-Sprite2D-3.png
Binary file modified docs/games/Cook_Me_Pasta/img/Cook_Me_Pasta-level-Sprite2D-4.png
Binary file modified docs/games/Cook_Me_Pasta/img/Cook_Me_Pasta-level-Sprite2D-5.png
Binary file modified docs/games/Cook_Me_Pasta/img/Cook_Me_Pasta-level-Vector-0.png
Binary file modified docs/games/Cook_Me_Pasta/img/Cook_Me_Pasta-level-Vector-1.png
Binary file modified docs/games/Cook_Me_Pasta/img/Cook_Me_Pasta-level-Vector-2.png
Binary file modified docs/games/Cook_Me_Pasta/img/Cook_Me_Pasta-level-Vector-3.png
Binary file modified docs/games/Cook_Me_Pasta/img/Cook_Me_Pasta-level-Vector-4.png
Binary file modified docs/games/Cook_Me_Pasta/img/Cook_Me_Pasta-level-Vector-5.png
Binary file modified docs/games/Cook_Me_Pasta/img/Cook_Me_Pasta-tile-key-Block2D.png
Binary file modified docs/games/Cook_Me_Pasta/img/Cook_Me_Pasta-tile-key-Sprite2D.png
Binary file modified docs/games/Cook_Me_Pasta/img/Cook_Me_Pasta-tile-lock-Block2D.png
Binary file modified docs/games/Cook_Me_Pasta/img/Cook_Me_Pasta-tile-tuna-Vector.png
Binary file modified docs/games/Cook_Me_Pasta/img/Cook_Me_Pasta-tile-wall-Block2D.png
1 change: 1 addition & 0 deletions docs/games/Cook_Me_Pasta/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Levels
---------

.. list-table:: Levels
:class: level-gallery
:header-rows: 1

* -
Expand Down
Binary file modified docs/games/Doggo/img/Doggo-level-Block2D-0.png
Binary file modified docs/games/Doggo/img/Doggo-level-Block2D-1.png
Binary file modified docs/games/Doggo/img/Doggo-level-Block2D-2.png
Binary file modified docs/games/Doggo/img/Doggo-level-Block2D-3.png
Binary file modified docs/games/Doggo/img/Doggo-level-Block2D-4.png
Binary file modified docs/games/Doggo/img/Doggo-level-Vector-0.png
Binary file modified docs/games/Doggo/img/Doggo-level-Vector-1.png
Binary file modified docs/games/Doggo/img/Doggo-level-Vector-2.png
Binary file modified docs/games/Doggo/img/Doggo-level-Vector-3.png
Binary file modified docs/games/Doggo/img/Doggo-level-Vector-4.png
Binary file modified docs/games/Doggo/img/Doggo-tile-doggo-Vector.png
Binary file modified docs/games/Doggo/img/Doggo-tile-stick-Vector.png
Binary file modified docs/games/Doggo/img/Doggo-tile-wall-Block2D.png
Binary file modified docs/games/Doggo/img/Doggo-tile-wall-Vector.png
1 change: 1 addition & 0 deletions docs/games/Doggo/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Levels
---------

.. list-table:: Levels
:class: level-gallery
:header-rows: 1

* -
Expand Down
Binary file modified docs/games/Drunk_Dwarf/img/Drunk_Dwarf-level-Block2D-0.png
Binary file modified docs/games/Drunk_Dwarf/img/Drunk_Dwarf-level-Block2D-1.png
Binary file modified docs/games/Drunk_Dwarf/img/Drunk_Dwarf-level-Block2D-2.png
Binary file modified docs/games/Drunk_Dwarf/img/Drunk_Dwarf-level-Block2D-3.png
Binary file modified docs/games/Drunk_Dwarf/img/Drunk_Dwarf-level-Block2D-4.png
Binary file modified docs/games/Drunk_Dwarf/img/Drunk_Dwarf-level-Vector-0.png
Binary file modified docs/games/Drunk_Dwarf/img/Drunk_Dwarf-level-Vector-1.png
Binary file modified docs/games/Drunk_Dwarf/img/Drunk_Dwarf-level-Vector-2.png
Binary file modified docs/games/Drunk_Dwarf/img/Drunk_Dwarf-level-Vector-3.png
Binary file modified docs/games/Drunk_Dwarf/img/Drunk_Dwarf-level-Vector-4.png
Binary file modified docs/games/Drunk_Dwarf/img/Drunk_Dwarf-tile-chair-Block2D.png
Binary file modified docs/games/Drunk_Dwarf/img/Drunk_Dwarf-tile-chair-Vector.png
Binary file modified docs/games/Drunk_Dwarf/img/Drunk_Dwarf-tile-doggo-Block2D.png
Binary file modified docs/games/Drunk_Dwarf/img/Drunk_Dwarf-tile-doggo-Vector.png
Binary file modified docs/games/Drunk_Dwarf/img/Drunk_Dwarf-tile-door-Block2D.png
Binary file modified docs/games/Drunk_Dwarf/img/Drunk_Dwarf-tile-door-Vector.png
Binary file modified docs/games/Drunk_Dwarf/img/Drunk_Dwarf-tile-key-Vector.png
Binary file modified docs/games/Drunk_Dwarf/img/Drunk_Dwarf-tile-table-Block2D.png
Binary file modified docs/games/Drunk_Dwarf/img/Drunk_Dwarf-tile-table-Vector.png
Binary file modified docs/games/Drunk_Dwarf/img/Drunk_Dwarf-tile-wall-Block2D.png
Binary file modified docs/games/Drunk_Dwarf/img/Drunk_Dwarf-tile-wall-Vector.png
1 change: 1 addition & 0 deletions docs/games/Drunk_Dwarf/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Levels
---------

.. list-table:: Levels
:class: level-gallery
:header-rows: 1

* -
Expand Down
Binary file modified docs/games/Eyeball/img/Eyeball-level-Block2D-0.png
Binary file modified docs/games/Eyeball/img/Eyeball-level-Vector-0.png
Binary file modified docs/games/Eyeball/img/Eyeball-tile-eye_drops-Vector.png
Binary file modified docs/games/Eyeball/img/Eyeball-tile-eyeball-Vector.png
Binary file modified docs/games/Eyeball/img/Eyeball-tile-wall-Block2D.png
Binary file modified docs/games/Eyeball/img/Eyeball-tile-wall-Vector.png
1 change: 1 addition & 0 deletions docs/games/Eyeball/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Levels
---------

.. list-table:: Levels
:class: level-gallery
:header-rows: 1

* -
Expand Down
Binary file modified docs/games/Foragers/img/Foragers-level-Block2D-0.png
Binary file modified docs/games/Foragers/img/Foragers-level-Block2D-1.png
Binary file modified docs/games/Foragers/img/Foragers-level-Block2D-2.png
Binary file modified docs/games/Foragers/img/Foragers-level-Sprite2D-0.png
Binary file modified docs/games/Foragers/img/Foragers-level-Sprite2D-1.png
Binary file modified docs/games/Foragers/img/Foragers-level-Sprite2D-2.png
Binary file modified docs/games/Foragers/img/Foragers-level-Vector-0.png
Binary file modified docs/games/Foragers/img/Foragers-level-Vector-1.png
Binary file modified docs/games/Foragers/img/Foragers-level-Vector-2.png
Binary file modified docs/games/Foragers/img/Foragers-tile-fixed_wall-Block2D.png
Binary file modified docs/games/Foragers/img/Foragers-tile-fixed_wall-Vector.png
Binary file modified docs/games/Foragers/img/Foragers-tile-harvester-Block2D.png
Binary file modified docs/games/Foragers/img/Foragers-tile-harvester-Vector.png
Binary file modified docs/games/Foragers/img/Foragers-tile-potion1-Sprite2D.png
Binary file modified docs/games/Foragers/img/Foragers-tile-potion1-Vector.png
Binary file modified docs/games/Foragers/img/Foragers-tile-potion2-Sprite2D.png
Binary file modified docs/games/Foragers/img/Foragers-tile-potion2-Vector.png
Binary file modified docs/games/Foragers/img/Foragers-tile-potion3-Block2D.png
Binary file modified docs/games/Foragers/img/Foragers-tile-potion3-Vector.png
1 change: 1 addition & 0 deletions docs/games/Foragers/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Levels
---------

.. list-table:: Levels
:class: level-gallery
:header-rows: 1

* -
Expand Down
Loading

0 comments on commit 24c21c3

Please sign in to comment.