diff --git a/Gemfile b/Gemfile index 7e9925f..cf086c5 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" gem "opengl-bindings", require: "opengl" gem "cyberarm_engine", git: "https://github.com/cyberarm/cyberarm_engine" -gem "nokogiri" +gem "nokogiri", ">= 1.11.0.rc1" group(:packaging) do gem "ocra" diff --git a/Gemfile.lock b/Gemfile.lock index 9ded38e..b387f68 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,26 +1,26 @@ GIT remote: https://github.com/cyberarm/cyberarm_engine - revision: 9a3caabc7e36f572ef458dc473edd2961dad8f40 + revision: 8cedb402833b7c81c30108ebc7bcd2e2849b6fa5 specs: - cyberarm_engine (0.12.1) - gosu (~> 0.14.0) + cyberarm_engine (0.13.0) + gosu (~> 0.15.0) GEM remote: https://rubygems.org/ specs: - gosu (0.14.5) - gosu (0.14.5-x64-mingw32) - gosu (0.14.5-x86-mingw32) - ocra (1.3.10) + gosu (0.15.1-x64-mingw32) + mini_portile2 (2.4.0) + nokogiri (1.11.0.rc1-x64-mingw32) + mini_portile2 (~> 2.4.0) + ocra (1.3.11) opengl-bindings (1.6.9) PLATFORMS - ruby x64-mingw32 - x86-mingw32 DEPENDENCIES cyberarm_engine! + nokogiri (>= 1.11.0.rc1) ocra opengl-bindings diff --git a/Rakefile b/Rakefile index 111ab76..80d1751 100644 --- a/Rakefile +++ b/Rakefile @@ -7,7 +7,7 @@ Releasy::Project.new do version "#{IMICFPS::VERSION}" executable "i-mic-fps.rb" - files ["lib/**/*.*", "assets/**/*.*", "blends/**/*.*", "shaders/**/*.*"] + files ["lib/**/*.*", "assets/**/*.*", "blends/**/*.*", "shaders/**/*.*", "static/**/*.*", "maps/**/*.*", "data/**/*.*"] exclude_encoding # Applications that don't use advanced encoding (e.g. Japanese characters) can save build size with this. verbose diff --git a/lib/tools/asset_viewer/lib/turn_table.rb b/lib/tools/asset_viewer/lib/turn_table.rb index 4baf009..085df2a 100644 --- a/lib/tools/asset_viewer/lib/turn_table.rb +++ b/lib/tools/asset_viewer/lib/turn_table.rb @@ -20,7 +20,7 @@ class IMICFPS @map = ProtoMap.new Publisher.new - @entity = Entity.new(manifest: @manifest, auto_manage: false) + @entity = Entity.new(manifest: @manifest) @entity.bind_model @map.add_entity(@entity) @map.entities.each { |e| e.backface_culling = false } diff --git a/shaders/include/light_struct.glsl b/shaders/include/light_struct.glsl index 736ff21..b5ecb7e 100644 --- a/shaders/include/light_struct.glsl +++ b/shaders/include/light_struct.glsl @@ -1,4 +1,4 @@ -const int MAX_LIGHTS = 4; +const int MAX_LIGHTS = 2; struct Light { float end;