repo string | commit string | message string | diff string |
|---|---|---|---|
cfaerber/Graphics-ColorNames-WWW | bbee250d90dac9cc2b20c1b58baa2f37234c3da3 | Graphics-ColorNames-WWW-1.00 | diff --git a/IE.pm b/IE.pm
index 1be2e48..16085d4 100644
--- a/IE.pm
+++ b/IE.pm
@@ -1,198 +1,198 @@
package Graphics::ColorNames::IE;
=head1 NAME
Graphics::ColorNames::IE - MS Internet Explorer color names and equivalent RGB values
=head1 SYNOPSIS
require Graphics::ColorNames::IE;
$NameTable = Grap... |
cfaerber/Graphics-ColorNames-WWW | 8e253cdfa6ef54341db4a52d4d6706357ee6b654 | Graphics-ColorNames-WWW-0.01 | diff --git a/IE.pm b/IE.pm
new file mode 100644
index 0000000..1be2e48
--- /dev/null
+++ b/IE.pm
@@ -0,0 +1,198 @@
+package Graphics::ColorNames::IE;
+
+=head1 NAME
+
+Graphics::ColorNames::IE - MS Internet Explorer color names and equivalent RGB values
+
+=head1 SYNOPSIS
+
+ require Graphics::ColorNames::IE;
+
+ $Na... |
cfaerber/Graphics-ColorNames-WWW | f76f32b5051541572674acaea5e31f2d117f1624 | Color-Calc-1.00 | diff --git a/Calc.pm b/Calc.pm
index 5134a2e..79c2593 100644
--- a/Calc.pm
+++ b/Calc.pm
@@ -1,615 +1,620 @@
-# $Id: Calc.pm,v 1.10 2005/04/09 20:49:58 cfaerber Exp $
+# $Id: Calc.pm,v 1.13 2005/09/24 17:36:15 cfaerber Exp $
#
package Color::Calc;
use strict;
-use Carp;
-use POSIX;
+use Carp;
+use Exporter;
use... |
cfaerber/Graphics-ColorNames-WWW | 02463ac62085c85d14b2b95c3219af5588b6f6ea | Color-Calc-0.29_0003 | diff --git a/Calc.pm b/Calc.pm
index ad04b96..5134a2e 100644
--- a/Calc.pm
+++ b/Calc.pm
@@ -1,613 +1,615 @@
+# $Id: Calc.pm,v 1.10 2005/04/09 20:49:58 cfaerber Exp $
+#
package Color::Calc;
use strict;
use Carp;
use POSIX;
use Params::Validate qw(:all);
use Graphics::ColorNames qw( hex2tuple tuple2hex );
... |
cfaerber/Graphics-ColorNames-WWW | 1730bfef4fc289e809126b4e6bd28e254549a584 | Graphics-ColorNames-WWW-0.00_0001 | diff --git a/Calc.pm b/Calc.pm
index 11a0423..ad04b96 100644
--- a/Calc.pm
+++ b/Calc.pm
@@ -1,624 +1,613 @@
package Color::Calc;
use strict;
use Carp;
use POSIX;
use Params::Validate qw(:all);
use Graphics::ColorNames qw( hex2tuple tuple2hex );
use Graphics::ColorNames::HTML;
-our $VERSION = '0.29_0001'... |
cfaerber/Graphics-ColorNames-WWW | f50c5d72832c51fec6a889326d57b00f19c5f761 | Color-Calc-0.29_0001 (p2) | diff --git a/Calc/WWW.pm b/Calc/WWW.pm
new file mode 100644
index 0000000..94a79ee
--- /dev/null
+++ b/Calc/WWW.pm
@@ -0,0 +1,12 @@
+package Color::Calc::WWW;
+
+use strict;
+use Carp;
+
+use Exporter;
+use Color::Calc('OutputFormat' => 'html', 'ColorScheme' => 'WWW');
+
+our @ISA = qw(Exporter);
+our @EXPORT = ('color... |
cfaerber/Graphics-ColorNames-WWW | 2b0b8ad9aabf4e8e491acee10b37f6e1188b2af4 | Color-Calc-0.29_0001 | diff --git a/Calc.pm b/Calc.pm
index e3524b9..11a0423 100644
--- a/Calc.pm
+++ b/Calc.pm
@@ -1,477 +1,624 @@
package Color::Calc;
use strict;
use Carp;
use POSIX;
+use Params::Validate qw(:all);
+
use Graphics::ColorNames qw( hex2tuple tuple2hex );
use Graphics::ColorNames::HTML;
-our $VERSION = '0.20';
+ou... |
cfaerber/Graphics-ColorNames-WWW | 79b8d12ee64dba7ecc1cbdf4695b142b95297cd7 | Color-Calc-0.20a | diff --git a/Calc.pm b/Calc.pm
index 897359a..e3524b9 100644
--- a/Calc.pm
+++ b/Calc.pm
@@ -1,313 +1,477 @@
package Color::Calc;
use strict;
+use Carp;
+use POSIX;
+
use Graphics::ColorNames qw( hex2tuple tuple2hex );
+use Graphics::ColorNames::HTML;
+
+our $VERSION = '0.20';
+$VERSION = eval $VERSION;
-our $VE... |
cfaerber/Graphics-ColorNames-WWW | a41f32be59073b616dca774191d04dd94f0e9aa7 | Color-Calc-0.12 | diff --git a/Calc.pm b/Calc.pm
index e85387d..897359a 100644
--- a/Calc.pm
+++ b/Calc.pm
@@ -1,313 +1,313 @@
package Color::Calc;
use strict;
use Graphics::ColorNames qw( hex2tuple tuple2hex );
-our $VERSION = 0.11;
+our $VERSION = 0.12;
our $AUTOLOAD;
use Exporter;
our @ISA = qw(Exporter);
our @EXPORT =... |
cfaerber/Graphics-ColorNames-WWW | 8a5d6e99082793cfb78ae698ea637ad01805aca1 | Color-Calc-0.11 | diff --git a/Calc.pm b/Calc.pm
index 74197b8..e85387d 100644
--- a/Calc.pm
+++ b/Calc.pm
@@ -1,301 +1,313 @@
package Color::Calc;
use strict;
use Graphics::ColorNames qw( hex2tuple tuple2hex );
-our $VERSION = 0.10;
+our $VERSION = 0.11;
our $AUTOLOAD;
use Exporter;
our @ISA = qw(Exporter);
our @EXPORT =... |
cfaerber/Graphics-ColorNames-WWW | d7b32ec542d09095b9e980a732fe341418fb159d | Color-Calc-0.1 | diff --git a/Calc.pm b/Calc.pm
index 238f932..74197b8 100644
--- a/Calc.pm
+++ b/Calc.pm
@@ -1,271 +1,301 @@
package Color::Calc;
use strict;
use Graphics::ColorNames qw( hex2tuple tuple2hex );
-our $VERSION = 0.02;
+our $VERSION = 0.10;
our $AUTOLOAD;
use Exporter;
our @ISA = qw(Exporter);
our @EXPORT =... |
cfaerber/Graphics-ColorNames-WWW | 763845b7aedcebad44936173ccd8da303c60d9a9 | Color-Calc-0.02 | diff --git a/Calc.pm b/Calc.pm
new file mode 100644
index 0000000..238f932
--- /dev/null
+++ b/Calc.pm
@@ -0,0 +1,271 @@
+package Color::Calc;
+
+use strict;
+use Graphics::ColorNames qw( hex2tuple tuple2hex );
+
+our $VERSION = 0.02;
+our $AUTOLOAD;
+
+use Exporter;
+
+our @ISA = qw(Exporter);
+our @EXPORT = qw(
+ co... |
jtzemp/base62 | 6dd5739f830cc92535dbd1b35563fdf1e3cb1d1e | Add more detail to changelog | diff --git a/CHANGELOG.md b/CHANGELOG.md
index 283f94d..f23f08d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,26 +1,26 @@
# Base62 changelog
## 2.0.0 (not yet released)
-* The `Integer` and `String` extensions are no longer loaded by default. `require 'base62/ext'` to do this.
+* The `Integer#base62_encode` ... |
jtzemp/base62 | 7ac9c3a349c1a7126614dbfeb6fa61658122e3a3 | Separate Integer and String extensions into separate file | diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec3f96b..283f94d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,22 +1,26 @@
# Base62 changelog
+## 2.0.0 (not yet released)
+
+* The `Integer` and `String` extensions are no longer loaded by default. `require 'base62/ext'` to do this.
+
## 1.0.0 (2014-01-16)
* L... |
jtzemp/base62 | 24329f637dd1e84d50c02474307824265de5db34 | No need to create separate variable | diff --git a/lib/base62.rb b/lib/base62.rb
index 156c9bd..245736a 100644
--- a/lib/base62.rb
+++ b/lib/base62.rb
@@ -1,31 +1,31 @@
require "base62/version"
require "base62/string"
require "base62/integer"
module Base62
PRIMITIVES = (0..9).collect { |i| i.to_s } + ('A'..'Z').to_a + ('a'..'z').to_a
class ... |
jtzemp/base62 | 6a8040a4e99aa770b88f540a83bede5f96738e80 | Use `prepend` to avoid creating new string objects | diff --git a/lib/base62.rb b/lib/base62.rb
index d79401a..156c9bd 100644
--- a/lib/base62.rb
+++ b/lib/base62.rb
@@ -1,31 +1,31 @@
require "base62/version"
require "base62/string"
require "base62/integer"
module Base62
PRIMITIVES = (0..9).collect { |i| i.to_s } + ('A'..'Z').to_a + ('a'..'z').to_a
class ... |
jtzemp/base62 | ce19d6045bab87c08615dcf6b91ee156bd7a5c5e | Raise when trying to encode negative numbers | diff --git a/lib/base62.rb b/lib/base62.rb
index 7b2ef22..d79401a 100644
--- a/lib/base62.rb
+++ b/lib/base62.rb
@@ -1,30 +1,31 @@
require "base62/version"
require "base62/string"
require "base62/integer"
module Base62
PRIMITIVES = (0..9).collect { |i| i.to_s } + ('A'..'Z').to_a + ('a'..'z').to_a
class ... |
jtzemp/base62 | 36527ceb5b0be89696d827f0c896aeb7f3ac7231 | Use `chars` instead of `split` | diff --git a/lib/base62.rb b/lib/base62.rb
index d1c24ff..7b2ef22 100644
--- a/lib/base62.rb
+++ b/lib/base62.rb
@@ -1,30 +1,30 @@
require "base62/version"
require "base62/string"
require "base62/integer"
module Base62
PRIMITIVES = (0..9).collect { |i| i.to_s } + ('A'..'Z').to_a + ('a'..'z').to_a
class ... |
jtzemp/base62 | 0357039151207e094959249771641098fd55b96a | Add Travis-CI | diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..adac848
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+ - 2.1.0
+ - 2.0.0
+ - 1.9.3
+notifications:
+ email: false
\ No newline at end of file
diff --git a/README.md b/README.md
index 0ff0f03..7215097 100644
--- a/REA... |
jtzemp/base62 | b6248539fddc7c755b14b4ba1f940cfccd2e5e64 | Added CHANGELOG.md entry for v 1.0.0 bump. | diff --git a/CHANGELOG.md b/CHANGELOG.md
index d162c40..ec3f96b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,18 +1,22 @@
# Base62 changelog
+## 1.0.0 (2014-01-16)
+
+* Lasse Bunk refactored and modernized the whole shebang.
+
## 0.1.3 (2010-11-24)
* Cleaned out the crap that's not needed like hoe and rake ... |
jtzemp/base62 | 2559bdd5dc0eb9fd9512872162b8704a8a014ebe | Version bump 0.1.4 -> 1.0.0 | diff --git a/lib/base62/version.rb b/lib/base62/version.rb
index 87b363a..4007029 100644
--- a/lib/base62/version.rb
+++ b/lib/base62/version.rb
@@ -1,3 +1,3 @@
module Base62
- VERSION = "0.1.4"
+ VERSION = "1.0.0"
end
|
jtzemp/base62 | 081cdd4f65e671d87fab21d65286982b335c9618 | Mad props to Lasse Bunk. | diff --git a/LICENSE.txt b/LICENSE.txt
index f3d8bde..af81c98 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,22 +1,22 @@
-Copyright (c) 2008-2013 JT Zemp & Thrive Information Solutions
+Copyright (c) 2008-2014 JT Zemp
MIT License
Permission is hereby granted, free of charge, to any person obtaining
a copy of t... |
jtzemp/base62 | 23a7c935c5de8174afd02f94a20804bfdddc7242 | Fix typo in license link | diff --git a/README.md b/README.md
index 8934736..1949c67 100644
--- a/README.md
+++ b/README.md
@@ -1,36 +1,36 @@
# Base62
Base62 monkeypatches Integer to add an Integer#base62_encode instance method to encode an integer in the character set of 0-9 + A-Z + a-z. It also monkeypatches String to add String#base62_dec... |
jtzemp/base62 | cb8085ead132cb01fbdc0a4757c08599547dba7a | Fix indentation in gemspec | diff --git a/base62.gemspec b/base62.gemspec
index 0a56cd9..cdf2055 100644
--- a/base62.gemspec
+++ b/base62.gemspec
@@ -1,25 +1,25 @@
lib = File.expand_path('../lib', __FILE__)
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
require 'base62/version'
Gem::Specification.new do |s|
s.name = "bas... |
jtzemp/base62 | 8efa4924060a34aa945a48bb0925bfd7b89bb775 | Simplify and convert text files into markdown | diff --git a/History.txt b/CHANGELOG.md
similarity index 66%
rename from History.txt
rename to CHANGELOG.md
index 2640e97..d162c40 100644
--- a/History.txt
+++ b/CHANGELOG.md
@@ -1,16 +1,18 @@
-== 0.1.3 2010-11-24
+# Base62 changelog
+
+## 0.1.3 (2010-11-24)
* Cleaned out the crap that's not needed like hoe and rake... |
jtzemp/base62 | 6dd6a51d93445f90f22dd50f03931ea663ccbd4c | Separate and simplify encoding and decoding | diff --git a/lib/base62.rb b/lib/base62.rb
index 21f3dd2..d1c24ff 100644
--- a/lib/base62.rb
+++ b/lib/base62.rb
@@ -1,95 +1,30 @@
-require File.dirname(__FILE__) + "/base62/version"
+require "base62/version"
+require "base62/string"
+require "base62/integer"
-class String
- BASE62_PRIMITIVES = {
- "0" => 0,
- ... |
jtzemp/base62 | 14f32bd07b2de11912187462e32fd6ee8dfa5d43 | Simplify version | diff --git a/lib/base62/version.rb b/lib/base62/version.rb
index 513c540..87b363a 100644
--- a/lib/base62/version.rb
+++ b/lib/base62/version.rb
@@ -1,7 +1,3 @@
module Base62
- MAJOR = 0
- MINOR = 1
- TINY = 4
-
- VERSION = [MAJOR, MINOR, TINY].join('.')
+ VERSION = "0.1.4"
end
|
jtzemp/base62 | 3bb22158f7cf5b6837a557ed144be1437f25cde8 | Simplify tests | diff --git a/test/base62_test.rb b/test/base62_test.rb
new file mode 100644
index 0000000..934f228
--- /dev/null
+++ b/test/base62_test.rb
@@ -0,0 +1,52 @@
+require "test_helper"
+
+class Base62Test < Test::Unit::TestCase
+ def test_encode
+ { 0 => "0",
+ 1 => "1",
+ 10 => "A",
+ 100 => "1c",
+ ... |
jtzemp/base62 | 856ef8cb315aa2e509b36031215164d7e8f726ca | Add a Rakefile so you can `rake test` | diff --git a/Rakefile b/Rakefile
new file mode 100644
index 0000000..97eb7bb
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,10 @@
+require 'rake/testtask'
+require 'bundler/gem_tasks'
+
+Rake::TestTask.new do |t|
+ t.libs << 'test'
+ t.test_files = FileList['test/**/*_test.rb']
+ t.verbose = true
+end
+
+task :default => :... |
jtzemp/base62 | eb5bc1ce385c4a0b538dc8f9249d725271ae4732 | Use Bundler for gem development dependencies | diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..1ecddc6
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in base62.gemspec
+gemspec
|
jtzemp/base62 | 49fb564548524805756696cb4651372e7bc9f2d4 | Simplify gemspec | diff --git a/base62.gemspec b/base62.gemspec
index 503e7a6..0a56cd9 100644
--- a/base62.gemspec
+++ b/base62.gemspec
@@ -1,27 +1,25 @@
-$LOAD_PATH << File.join(File.dirname(__FILE__), 'lib')
-require 'base62'
-Gem::Specification.new do |s|
- s.name = %q{base62}
- s.version = Base62::VERSION
-
- ... |
jtzemp/base62 | 0ca03807d297adae9c1fb837eb8c647ea461d175 | Fixed Issue #1 https://github.com/jtzemp/base62/issues#issue/1: 0.base62_encode returns "0" | diff --git a/README.rdoc b/README.rdoc
index 93a1f77..ef9e88e 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -1,51 +1,47 @@
-= base62
-
-* http://geekjacking.com/base62_gem
-
== DESCRIPTION:
Base62 monkeypatches Integer to add an Integer#base62_encode instance method to encode an integer in the character set of 0-9 ... |
jtzemp/base62 | 4993c065e621c54373b8dcf09ce7e766d0679c1c | Version bump and Gemspec cleanup/additions as well as added usage instructions to the README | diff --git a/.gitignore b/.gitignore
index ccc9fd9..52ed97e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-*.DS_Store
\ No newline at end of file
+*.DS_Store
+*.gem
\ No newline at end of file
diff --git a/History.txt b/History.txt
index 7b47983..2640e97 100644
--- a/History.txt
+++ b/History.txt
@@ -1,8 +1,16... |
jtzemp/base62 | e276743ba475a7080d665aba6708e9f3502aa72c | gotta give myself some credit | diff --git a/base62.gemspec b/base62.gemspec
index cac4fa9..eaf5673 100644
--- a/base62.gemspec
+++ b/base62.gemspec
@@ -1,28 +1,28 @@
$LOAD_PATH << File.join(File.dirname(__FILE__), 'lib')
require 'base62'
Gem::Specification.new do |s|
s.name = %q{base62}
s.version = Base62::VERSION
s.summ... |
jtzemp/base62 | c6e99e6b3889fdb03153b94c7b388b00893f4c88 | fixing version constant and modifying gemspec | diff --git a/base62.gemspec b/base62.gemspec
index c475c58..cac4fa9 100644
--- a/base62.gemspec
+++ b/base62.gemspec
@@ -1,28 +1,28 @@
$LOAD_PATH << File.join(File.dirname(__FILE__), 'lib')
require 'base62'
Gem::Specification.new do |s|
s.name = %q{base62}
s.version = Base62::VERSION
s.summ... |
jtzemp/base62 | fb1c55b1319bcfa193975faedb6b09b843f07136 | adding gemspec file | diff --git a/base62.gemspec b/base62.gemspec
new file mode 100644
index 0000000..c475c58
--- /dev/null
+++ b/base62.gemspec
@@ -0,0 +1,28 @@
+$LOAD_PATH << File.join(File.dirname(__FILE__), 'lib')
+require 'base62'
+Gem::Specification.new do |s|
+ s.name = %q{base62}
+ s.version = Base62::VERSION
+ ... |
jtzemp/base62 | a36d50623a4ebf943b8069d0b743ee473c5583f1 | fix for Ruby 1.9 compatibility | diff --git a/History.txt b/History.txt
index 9993927..7b47983 100644
--- a/History.txt
+++ b/History.txt
@@ -1,4 +1,8 @@
+== 0.1.1 2009-11-4
+
+* Ruby 1.9 compatible thx to Saadiq Rodgers-King
+
== 0.1.0 2008-10-04
* 1 major enhancement:
* Initial release
diff --git a/README.rdoc b/README.rdoc
index 63a5e1a..6c0... |
jtzemp/base62 | 14b0f9a24a925c8adbb566a17f2620d12c483227 | deployed the package to rubyforge and updated the website template. | diff --git a/pkg/base62-0.1.0.gem b/pkg/base62-0.1.0.gem
deleted file mode 100644
index 3d769b1..0000000
Binary files a/pkg/base62-0.1.0.gem and /dev/null differ
diff --git a/pkg/base62-0.1.0.tgz b/pkg/base62-0.1.0.tgz
deleted file mode 100644
index 2bf0ee6..0000000
Binary files a/pkg/base62-0.1.0.tgz and /dev/null dif... |
jtzemp/base62 | cfb35dba9f9c29edc198e1c747c1e08976c93059 | created the gem package. | diff --git a/pkg/base62-0.1.0.gem b/pkg/base62-0.1.0.gem
new file mode 100644
index 0000000..f232a9a
Binary files /dev/null and b/pkg/base62-0.1.0.gem differ
diff --git a/pkg/base62-0.1.0.tgz b/pkg/base62-0.1.0.tgz
new file mode 100644
index 0000000..d276b5e
Binary files /dev/null and b/pkg/base62-0.1.0.tgz differ
diff... |
jtzemp/base62 | 6ebe04fe9f3221b0b40f6ecdb4ce4426b190276d | added gitignore | diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ccc9fd9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.DS_Store
\ No newline at end of file
|
jtzemp/base62 | 958c6691e3cd88a3ca101aa8892b77c74d135bd3 | initial import | diff --git a/History.txt b/History.txt
new file mode 100644
index 0000000..9993927
--- /dev/null
+++ b/History.txt
@@ -0,0 +1,4 @@
+== 0.1.0 2008-10-04
+
+* 1 major enhancement:
+ * Initial release
diff --git a/Manifest.txt b/Manifest.txt
new file mode 100644
index 0000000..858c11f
--- /dev/null
+++ b/Manifest.txt
@@ ... |
jhasse/jntetri | 1344eb507f5f6d3abdf22cbee4c6463113f3bf83 | Make Input scale-independent | diff --git a/src/gui/input.cpp b/src/gui/input.cpp
index 237394a..1808a31 100644
--- a/src/gui/input.cpp
+++ b/src/gui/input.cpp
@@ -1,89 +1,87 @@
#include "input.hpp"
#include <jngl.hpp>
Input::Input(const jngl::Vec2 position) : displayCursor(0) {
setPos(position);
}
void Input::setMaxWidth(unsigned int w... |
jhasse/jntetri | 31c1857f698c2b849051d4418406f8aa43d279cb | Accept Vec2 in Input ctor | diff --git a/src/gameoverscreen.cpp b/src/gameoverscreen.cpp
index 1d22183..7ff847e 100644
--- a/src/gameoverscreen.cpp
+++ b/src/gameoverscreen.cpp
@@ -1,82 +1,83 @@
#include "gameoverscreen.hpp"
#include "Game.hpp"
#include "engine/Options.hpp"
#include "engine/fade.hpp"
#include "engine/screen.hpp"
#include ... |
jhasse/jntetri | a93b1cbe6f1e1b776a6388acbbaf694492ab70cd | Rename Input::displayCursor_ to displayCursor | diff --git a/src/gui/input.cpp b/src/gui/input.cpp
index ad83ca3..e3eb5bb 100644
--- a/src/gui/input.cpp
+++ b/src/gui/input.cpp
@@ -1,89 +1,89 @@
#include "input.hpp"
#include <jngl.hpp>
-Input::Input(int x, int y) : displayCursor_(0) {
+Input::Input(int x, int y) : displayCursor(0) {
setPos(x, y);
}
void ... |
jhasse/jntetri | bfb49ccb8ea0921ef87aad2149bd15d83accf87c | Add --server argument | diff --git a/.vscode/launch.json b/.vscode/launch.json
index 1e9ecbe..79b099d 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -1,23 +1,26 @@
{
"version": "0.2.0",
"configurations": [
{
- "type": "gdb",
+ "type": "lldb",
"request": "launch",
- "name": "jntetri (GDB)",
- "target": "./bui... |
jhasse/jntetri | 8565fa90bcf68cef41a64a1ef06d99d3a5539a58 | Fix warnings in tetromino.cpp | diff --git a/src/tetromino.cpp b/src/tetromino.cpp
index cf1b22b..dd8aa73 100644
--- a/src/tetromino.cpp
+++ b/src/tetromino.cpp
@@ -1,315 +1,317 @@
#include "tetromino.hpp"
#include "Field.hpp"
#include <numbers>
Tetromino::Tetromino(int type, Field& field)
: field_(field),
shadow(jngl::ScaleablePixels(6... |
jhasse/jntetri | d005e73f419f027bdc460afded25a11f9b0eda98 | web: Add #include <numbers> | diff --git a/src/tetromino.cpp b/src/tetromino.cpp
index 7d25a1e..cf1b22b 100644
--- a/src/tetromino.cpp
+++ b/src/tetromino.cpp
@@ -1,313 +1,315 @@
#include "tetromino.hpp"
#include "Field.hpp"
+#include <numbers>
+
Tetromino::Tetromino(int type, Field& field)
: field_(field),
shadow(jngl::ScaleablePixels(6... |
jhasse/jntetri | bdf6086fde6e034a059a232ab36d15edb738c92c | clang-tidy: -readability-math-missing-parentheses | diff --git a/.clang-tidy b/.clang-tidy
index 7f9acec..be8df53 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,71 +1,72 @@
---
Checks: '
,*,
,-altera-id-dependent-backward-branch,
,-altera-struct-pack-align,
,-altera-unroll-loops,
,-android-cloexec-fopen,
,-bugprone-eas... |
jhasse/jntetri | b6ca17e3a7c809aa7d685f419229914c0117fb2e | Modernize drawing of Block using jngl::Mat3 modelview | diff --git a/src/Block.cpp b/src/Block.cpp
index 2ed22d3..b84c68d 100644
--- a/src/Block.cpp
+++ b/src/Block.cpp
@@ -1,87 +1,87 @@
#include "Block.hpp"
#include "engine/screen.hpp"
#include <jngl/Sprite.hpp>
const int Block::size = 60;
Block::Block(int x, int y, jngl::Color color) : x(x), y(y), color(color... |
jhasse/jntetri | 029ceaa601546b21e5f0a4dbbc4757a3e9e75ca3 | Rename Input::SetPassword to setPassword | diff --git a/src/gui/input.cpp b/src/gui/input.cpp
index 2df7f3a..ad83ca3 100644
--- a/src/gui/input.cpp
+++ b/src/gui/input.cpp
@@ -1,89 +1,89 @@
#include "input.hpp"
#include <jngl.hpp>
-Input::Input(int x, int y) : password_(false), displayCursor_(0) {
+Input::Input(int x, int y) : displayCursor_(0) {
setPos... |
jhasse/jntetri | eb4b7ca9a52956b7a6874e6b4af6d23607f8aa49 | Use jngl::utf8Length() for password | diff --git a/src/gui/input.cpp b/src/gui/input.cpp
index 97cc49c..2df7f3a 100644
--- a/src/gui/input.cpp
+++ b/src/gui/input.cpp
@@ -1,89 +1,89 @@
#include "input.hpp"
#include <jngl.hpp>
Input::Input(int x, int y) : password_(false), displayCursor_(0) {
setPos(x, y);
}
void Input::setMaxWidth(unsigned int... |
jhasse/jntetri | b44895f3e20286c0d3ff754fd210c790761f42d9 | Use new modelview function in MessageBox | diff --git a/src/gui/MessageBox.cpp b/src/gui/MessageBox.cpp
index 8ed8a68..57d2147 100644
--- a/src/gui/MessageBox.cpp
+++ b/src/gui/MessageBox.cpp
@@ -1,28 +1,27 @@
#include "MessageBox.hpp"
#include "../fonts.hpp"
#include <jngl.hpp>
MessageBox::MessageBox(const std::string& message, std::shared_ptr<jngl::... |
jhasse/jntetri | af830a30d30b4bf1e57dc1fc913c3d89f7cf1e4d | Use Widget::position instead of x_, y_ | diff --git a/src/gui/input.cpp b/src/gui/input.cpp
index 4a558c6..97cc49c 100644
--- a/src/gui/input.cpp
+++ b/src/gui/input.cpp
@@ -1,86 +1,89 @@
#include "input.hpp"
#include <jngl.hpp>
-Input::Input(int x, int y) : x_(x), y_(y), password_(false), displayCursor_(0) {
+Input::Input(int x, int y) : password_(fals... |
jhasse/jntetri | fb07a6d06df8a7fce71682373c27bb32509fce80 | Support holding-to-repeat with Gamepad | diff --git a/src/control.cpp b/src/control.cpp
index f1c880e..3270c6d 100644
--- a/src/control.cpp
+++ b/src/control.cpp
@@ -1,143 +1,168 @@
#include "control.hpp"
#include <jngl/Controller.hpp>
#include <jngl/input.hpp>
ControlBase::~ControlBase() {
}
bool ControlBase::step(const std::function<void(Control... |
jhasse/jntetri | 0fe8f9ef8906de9860241423606620fe5a70cad5 | Trying to fix flickering in multiplayer | diff --git a/src/Field.cpp b/src/Field.cpp
index c8aaa87..46397cf 100644
--- a/src/Field.cpp
+++ b/src/Field.cpp
@@ -1,375 +1,375 @@
#include "Field.hpp"
#include <algorithm>
#include <jngl.hpp>
#include <map>
#include <set>
const int Field::width_ = 11;
const int Field::height_ = 19;
Field::Field(int see... |
jhasse/jntetri | 2b8c8623e7f4a369d4623f411ad3d61453d9b180 | Rename Game::setRotateScreen | diff --git a/src/Game.cpp b/src/Game.cpp
index b3d75dd..4ef4281 100644
--- a/src/Game.cpp
+++ b/src/Game.cpp
@@ -1,137 +1,137 @@
#include "Game.hpp"
#include "ReplayRecorder.hpp"
#include "engine/Options.hpp"
#include "gameoverscreen.hpp"
#include "pausemenu.hpp"
#include <iomanip>
#include <jngl.hpp>
#incl... |
jhasse/jntetri | 34a5bae5ccf276955629b99adc2b4b08ac2acbc4 | Use JNGL instead of spdlog | diff --git a/CMakeLists.txt b/CMakeLists.txt
index 55b21b7..55f99b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,64 +1,59 @@
cmake_minimum_required(VERSION 3.15)
project(jntetri)
if(NOT MSVC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=implicit-function-declaration")
set(CMAKE_CXX_FLAGS "${CMAKE_CX... |
jhasse/jntetri | ad242db9195c982fa21f7022e2bb9b3233be4a4f | Simplify Fade | diff --git a/src/engine/fade.cpp b/src/engine/fade.cpp
index 6a3fae8..0fcf477 100644
--- a/src/engine/fade.cpp
+++ b/src/engine/fade.cpp
@@ -1,42 +1,40 @@
#include "fade.hpp"
#include <jngl.hpp>
Fade::Fade(std::shared_ptr<Work> work, int speed)
: work_(std::move(work)), oldWork_(jngl::getWork()), fadeCount_(0),... |
jhasse/jntetri | b08e1ee084ee53e350e781f1602ff04a84c611f8 | GitLab CI: FIx deploy | diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e817628..2f02faa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,79 +1,78 @@
image: fedora:39
linux:
stage: build
script:
- dnf install -y git gcc-c++ fontconfig-devel freetype-devel libvorbis-devel libepoxy-devel libwebp-devel boost-python3-devel... |
jhasse/jntetri | 94fac7661965985f25264284bf92daaaf952f14b | GitLab CI: Package web build | diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7d30c9b..e817628 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,72 +1,79 @@
image: fedora:39
linux:
stage: build
script:
- dnf install -y git gcc-c++ fontconfig-devel freetype-devel libvorbis-devel libepoxy-devel libwebp-devel boost-python3-devel... |
jhasse/jntetri | c4598240f3c34d3d7f06f8cfd439a7446c457db1 | GitLab CI: Use new boost download URL | diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 918a353..7d30c9b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,72 +1,72 @@
image: fedora:39
linux:
stage: build
script:
- dnf install -y git gcc-c++ fontconfig-devel freetype-devel libvorbis-devel libepoxy-devel libwebp-devel boost-python3-devel... |
jhasse/jntetri | 167c074d57fe4d4783bb4ad75e02dc3a219ef060 | Use jngl::Sprite to draw Field background | diff --git a/src/Field.cpp b/src/Field.cpp
index cf24394..c8aaa87 100644
--- a/src/Field.cpp
+++ b/src/Field.cpp
@@ -1,377 +1,375 @@
#include "Field.hpp"
-#include "engine/screen.hpp"
-
#include <algorithm>
+#include <jngl.hpp>
#include <map>
#include <set>
-#include <jngl.hpp>
const int Field::width_ = 11;
c... |
jhasse/jntetri | 40bd94430bd1bb78cbb4099d6ccedfa3567404b6 | Use FindBoost again to fix web | diff --git a/CMakeLists.txt b/CMakeLists.txt
index baeb153..55b21b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,63 +1,64 @@
cmake_minimum_required(VERSION 3.15)
project(jntetri)
if(NOT MSVC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=implicit-function-declaration")
set(CMAKE_CXX_FLAGS "${CMAKE_CX... |
jhasse/jntetri | 239b8ac9472d9c6520782d8709fb16f9fcc89ec5 | Fix clang warnings | diff --git a/.clang-tidy b/.clang-tidy
index df8803d..7f9acec 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,70 +1,71 @@
---
Checks: '
,*,
,-altera-id-dependent-backward-branch,
,-altera-struct-pack-align,
,-altera-unroll-loops,
,-android-cloexec-fopen,
,-bugprone-eas... |
jhasse/jntetri | 9cde286496ba73f2910455b1027b050661019497 | Fix CMake FindBoost warning | diff --git a/CMakeLists.txt b/CMakeLists.txt
index d7e6a97..7a2190b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,63 +1,63 @@
cmake_minimum_required(VERSION 3.15)
project(jntetri)
if(NOT MSVC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=implicit-function-declaration")
set(CMAKE_CXX_FLAGS "${CMAKE_CX... |
jhasse/jntetri | a659e085192ef4a37b3b2bc660734824dac8fc87 | Remove some warnings unsupported by older compilers (e.g. emscripten) | diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5e4acd..d7e6a97 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,63 +1,63 @@
cmake_minimum_required(VERSION 3.15)
project(jntetri)
if(NOT MSVC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=implicit-function-declaration")
- set(CMAKE_CXX_FLAGS "${CMAKE_CX... |
jhasse/jntetri | 09f1d63ed10247bdc46b057203edfc6dcbea7377 | Fix web build: Boost libraries are not really required (yet) | diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7793e37..a5e4acd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,62 +1,63 @@
cmake_minimum_required(VERSION 3.15)
project(jntetri)
if(NOT MSVC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=implicit-function-declaration")
set(CMAKE_CXX_FLAGS "${CMAKE_CX... |
jhasse/jntetri | f8ece2fc4804204f7d5e17800c106a429810fec6 | Support older CMake versions | diff --git a/CMakeLists.txt b/CMakeLists.txt
index eeaae7b..7793e37 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,60 +1,62 @@
cmake_minimum_required(VERSION 3.15)
project(jntetri)
if(NOT MSVC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=implicit-function-declaration")
- set(CMAKE_CXX_FLAGS "${CMAKE_CX... |
jhasse/jntetri | 8105e790048a0e54b4c685dc775cb81f346ceba2 | Socket::connect: Use lambda instead of boost::bind | diff --git a/src/engine/socket.cpp b/src/engine/socket.cpp
index 07c2571..2e83c96 100644
--- a/src/engine/socket.cpp
+++ b/src/engine/socket.cpp
@@ -1,80 +1,80 @@
#include "socket.hpp"
#include "../../server/NetworkConstants.hpp"
-#include <iostream>
-#include <boost/bind/bind.hpp>
#include <boost/asio/co_spawn.... |
jhasse/jntetri | 3b07d0a982ff16364a4a294ab8f1cf669d5b448a | Clean up PauseMenu a bit | diff --git a/src/pausemenu.cpp b/src/pausemenu.cpp
index 6f548aa..a56d274 100644
--- a/src/pausemenu.cpp
+++ b/src/pausemenu.cpp
@@ -1,42 +1,42 @@
#include "pausemenu.hpp"
#include "Game.hpp"
#include "engine/fade.hpp"
#include "gui/ButtonBox.hpp"
#include "menu.hpp"
PauseMenu::PauseMenu(std::shared_ptr<Game>... |
jhasse/jntetri | 9c9e49a7c97461790e89fbdc59c62be0568297c6 | Fix mouse being visible when going to PauseMenu via Escape | diff --git a/src/Game.cpp b/src/Game.cpp
index 045ca02..c87b60a 100644
--- a/src/Game.cpp
+++ b/src/Game.cpp
@@ -1,135 +1,138 @@
#include "Game.hpp"
#include "engine/screen.hpp"
#include "engine/Options.hpp"
#include "gameoverscreen.hpp"
#include "pausemenu.hpp"
#include "ReplayRecorder.hpp"
#include <jngl.h... |
jhasse/jntetri | 30890356abb8a26d3e3f5bdc34d277a35995bb35 | VSCode: Use MSVC and Ninja on Windows | diff --git a/.vscode/build.bat b/.vscode/build.bat
new file mode 100644
index 0000000..42f06f2
--- /dev/null
+++ b/.vscode/build.bat
@@ -0,0 +1,18 @@
+@echo off
+
+:: see https://blog.pcitron.fr/2022/01/04/dont-use-vcvarsall-vsdevcmd/
+set VSCMD_ARG_HOST_ARCH=x64
+set VSCMD_ARG_TGT_ARCH=x64
+set VSCMD_ARG_APP_PLAT=Desk... |
jhasse/jntetri | 0a1ce3642a676b04274a5b444bebfdde399bd92d | Remove some boost includes | diff --git a/server/Server.cpp b/server/Server.cpp
index 3a9109e..b4ca92b 100644
--- a/server/Server.cpp
+++ b/server/Server.cpp
@@ -1,160 +1,159 @@
#include "Server.hpp"
#include "Client.hpp"
#include "NetworkConstants.hpp"
-#include <boost/bind/bind.hpp>
#include <iostream>
#include <soci/sqlite3/soci-sqlite... |
jhasse/jntetri | b07e8540227d42a44f63c094ca837da0a740e1da | CMake: Add Boost::headers | diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c8df75..eeaae7b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,60 +1,60 @@
cmake_minimum_required(VERSION 3.15)
project(jntetri)
if(NOT MSVC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=implicit-function-declaration")
set(CMAKE_CXX_FLAGS "${CMAKE_CX... |
jhasse/jntetri | dfc2a014ec67523b3ddf102bcded9f46deeb21e5 | VSCode: Use Ninja Multi-Config | diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 9ed181a..87a1fe5 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -1,54 +1,54 @@
{
"version": "2.0.0",
"windows": {
"command": "C:\\msys64\\usr\\bin\\bash.exe",
- "args": ["-lc", "clear && cd \"${workspaceRoot}\" && ([ -d build ] || cmake -B... |
jhasse/jntetri | fac30417722b040b8e12ad098babad296ac67841 | Reduce boost usage | diff --git a/src/Field.hpp b/src/Field.hpp
index 095cbca..3dd30a9 100644
--- a/src/Field.hpp
+++ b/src/Field.hpp
@@ -1,94 +1,97 @@
#pragma once
#include "Block.hpp"
#include "DesyncInfo.hpp"
#include "tetromino.hpp"
#include "explosion.hpp"
#include "control.hpp"
#include <vector>
#include <random>
#includ... |
jhasse/jntetri | 714b898569d12687822ff0a42da92125d29db309 | Use CPM.cmake for cereal | diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15db393..3c8df75 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,62 +1,60 @@
cmake_minimum_required(VERSION 3.15)
project(jntetri)
if(NOT MSVC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=implicit-function-declaration")
set(CMAKE_CXX_FLAGS "${CMAKE_CX... |
jhasse/jntetri | ec34f2bb1847bc95e84f641282ef142a00216dcf | GitLab CI: Use the latest working version of emsdk | diff --git a/.gitignore b/.gitignore
index 4af6ab9..98d0f9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,28 +1,31 @@
/build*/
.DS_Store
.sconsign.dblite
bin/
*.sublime-workspace
obj/
msi/*.wixobj
msi/*.wixpdb
msi/JNTETRI.msi
msi/data.wxs
/JNTETRI.opensdf
/.cache/
# Visual Studio
*.sdf
*.v12.suo
.v... |
jhasse/jntetri | 6ab4695313f452011bef65a218046f76a10271f6 | Remove unused Screen::DrawCentered(const std::string& filename, const Vector2d& position) | diff --git a/src/engine/screen.cpp b/src/engine/screen.cpp
index 3b7bcaa..0b53551 100644
--- a/src/engine/screen.cpp
+++ b/src/engine/screen.cpp
@@ -1,27 +1,22 @@
#include "screen.hpp"
#include "paths.hpp"
#include <jngl.hpp>
void Screen::DrawCentered(const std::string& filename, const double x, const double y)... |
jhasse/jntetri | 2f329040ec1b6fffe09c3455b4c21389f974e637 | Simplify sprite loading mechanism | diff --git a/data/gfx/x1200/block.webp b/data/gfx/block.webp
similarity index 100%
rename from data/gfx/x1200/block.webp
rename to data/gfx/block.webp
diff --git a/data/gfx/x1200/box.webp b/data/gfx/box.webp
similarity index 100%
rename from data/gfx/x1200/box.webp
rename to data/gfx/box.webp
diff --git a/data/gfx/x120... |
jhasse/jntetri | b1cf55b96d3ca9c3f50a74139162147e873b54f9 | VSCode: Use Ninja Multi-Config | diff --git a/.vscode/launch.json b/.vscode/launch.json
index 04459dd..1e9ecbe 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -1,23 +1,23 @@
{
"version": "0.2.0",
"configurations": [
{
"type": "gdb",
"request": "launch",
"name": "jntetri (GDB)",
- "target": "./build/jntetri",
+ "ta... |
jhasse/jntetri | 4c69ffd7c5048803830153bdfb1374a399cd684f | Remove Meson build support | diff --git a/.gitignore b/.gitignore
index a3885fd..4af6ab9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,32 +1,28 @@
/build*/
.DS_Store
.sconsign.dblite
bin/
*.sublime-workspace
obj/
msi/*.wixobj
msi/*.wixpdb
msi/JNTETRI.msi
msi/data.wxs
/JNTETRI.opensdf
/.cache/
# Visual Studio
*.sdf
*.v12.suo
.v... |
jhasse/jntetri | 48ce5c5f0300fd48d0d9038bd3570237bf5ef98f | Remove unused Procedure | diff --git a/src/engine/procedure.cpp b/src/engine/procedure.cpp
deleted file mode 100644
index 0ff8b59..0000000
--- a/src/engine/procedure.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "procedure.hpp"
-#include "../constants.hpp"
-
-#include <jngl.hpp>
-
-Procedure::Procedure()
-: oldTime_(jngl::getTime()), needDraw_(t... |
jhasse/jntetri | 56d2d2d7deb7b533d851fdb3fa25c418dac3401e | Add .clang-tidy | diff --git a/.clang-tidy b/.clang-tidy
new file mode 100644
index 0000000..df8803d
--- /dev/null
+++ b/.clang-tidy
@@ -0,0 +1,70 @@
+---
+Checks: '
+ ,*,
+ ,-altera-id-dependent-backward-branch,
+ ,-altera-struct-pack-align,
+ ,-altera-unroll-loops,
+ ,-android-cloexec-fopen,
+ ,-bug... |
jhasse/jntetri | 195981d4517b1937af92851c84cc87f304c1f236 | JNGL no longer uses OpenAL | diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3238af6..779403f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,72 +1,72 @@
image: fedora:39
linux:
stage: build
script:
- - dnf install -y git gcc-c++ fontconfig-devel freetype-devel libvorbis-devel libepoxy-devel libwebp-devel boost-python3-devel... |
jhasse/jntetri | 1b5779e2ea76ccaa337d3b8fb263d54eb8fb674c | GitLab CI: Update to Fedora 39 | diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index caefe44..3238af6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,72 +1,72 @@
-image: fedora:34
+image: fedora:39
linux:
stage: build
script:
- dnf install -y git gcc-c++ fontconfig-devel freetype-devel libvorbis-devel libepoxy-devel libwebp-devel b... |
jhasse/jntetri | e601fe3a44b319fc9fe97dd88c6472c3718c8a36 | Rename options.hpp/cpp to Options.hpp/cpp | diff --git a/src/Block.cpp b/src/Block.cpp
index 88c06ed..ab50352 100644
--- a/src/Block.cpp
+++ b/src/Block.cpp
@@ -1,86 +1,87 @@
#include "Block.hpp"
+
#include "engine/screen.hpp"
#include <jngl/sprite.hpp>
const int Block::size = 60;
Block::Block(int x, int y, jngl::Color color) : x(x), y(y), color(color... |
jhasse/jntetri | 6d3bf2023e93d1bf9fe7f79d28a34a04e16bc64a | Refactoring | diff --git a/src/block.cpp b/src/Block.cpp
similarity index 98%
rename from src/block.cpp
rename to src/Block.cpp
index d8589bf..88c06ed 100644
--- a/src/block.cpp
+++ b/src/Block.cpp
@@ -1,86 +1,86 @@
-#include "block.hpp"
+#include "Block.hpp"
#include "engine/screen.hpp"
#include <jngl/sprite.hpp>
const int B... |
jhasse/jntetri | 263d0168d2e3d4ffb744887d7a6a4bd6acc94f20 | server: Update downloaded Boost version if not found | diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index 1293a7a..f99dd49 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -1,38 +1,39 @@
cmake_minimum_required(VERSION 3.10)
project(jntetri-server)
if(NOT MSVC)
-string(APPEND CMAKE_CXX_FLAGS -fdiagnostics-color)
+ string(APPEND CMAKE_CXX_... |
jhasse/jntetri | 215c387bd4807935c598dbe170c1f7a948de7c75 | Only show Quit in PauseMenu if canQuit | diff --git a/src/pausemenu.cpp b/src/pausemenu.cpp
index ed857f4..e6b0661 100644
--- a/src/pausemenu.cpp
+++ b/src/pausemenu.cpp
@@ -1,42 +1,44 @@
#include "pausemenu.hpp"
#include "engine/procedure.hpp"
#include "engine/screen.hpp"
#include "Game.hpp"
#include "gui/ButtonBox.hpp"
#include "menu.hpp"
#include ... |
jhasse/jntetri | 8ed2954f8230b17aa0f9565077d41bd0f12f4b80 | Only change Window title in Debug build | diff --git a/src/NetworkControl.cpp b/src/NetworkControl.cpp
index 76b44a2..21fe66b 100644
--- a/src/NetworkControl.cpp
+++ b/src/NetworkControl.cpp
@@ -1,113 +1,115 @@
#include "NetworkControl.hpp"
#include "engine/socket.hpp"
#include "gui/MessageBox.hpp"
#include "jngl/window.hpp"
#include "jngl/work.hpp"
#i... |
jhasse/jntetri | 9cec51e942b4550b5fc19368f62d30a0b9d66b02 | Fix quickLogin not starting match making | diff --git a/src/Login.cpp b/src/Login.cpp
index 41a353e..13fc79b 100644
--- a/src/Login.cpp
+++ b/src/Login.cpp
@@ -1,187 +1,187 @@
#include "Login.hpp"
#include "../server/NetworkConstants.hpp"
#include "engine/screen.hpp"
#include "engine/procedure.hpp"
#include "engine/fade.hpp"
#include "engine/options.hpp... |
jhasse/jntetri | da909465d893ec09c01f9577e8159edcd08392a7 | server: Only show "xy left." message for logged in users | diff --git a/server/Server.cpp b/server/Server.cpp
index 415f3f9..3a9109e 100644
--- a/server/Server.cpp
+++ b/server/Server.cpp
@@ -1,161 +1,160 @@
#include "Server.hpp"
#include "Client.hpp"
#include "NetworkConstants.hpp"
#include <boost/bind/bind.hpp>
#include <iostream>
#include <soci/sqlite3/soci-sqlite... |
jhasse/jntetri | 3fcd2da19585f583591d3c45ab5a254358b01b0e | server: Fix invalid login message | diff --git a/server/Client.cpp b/server/Client.cpp
index 249d34d..beaa035 100644
--- a/server/Client.cpp
+++ b/server/Client.cpp
@@ -1,227 +1,227 @@
#include "Client.hpp"
#include "Server.hpp"
#include "NetworkConstants.hpp"
#include <boost/array.hpp>
#include <boost/bind.hpp>
#include <iostream>
#include <n... |
jhasse/jntetri | 95881d5e8aa7acd7c90fe9d412cd271f865530dc | Skip Intro in Release build if first time | diff --git a/src/Intro.cpp b/src/Intro.cpp
index 2ff2a26..230fb44 100644
--- a/src/Intro.cpp
+++ b/src/Intro.cpp
@@ -1,77 +1,78 @@
#include "Intro.hpp"
#include "constants.hpp"
#include "engine/fade.hpp"
#include "engine/options.hpp"
#include "engine/procedure.hpp"
#include "engine/screen.hpp"
#include "fonts.... |
jhasse/jntetri | 6760f35b28ade8eb1dcb41fafbc1dc0d4708aec4 | Show better error message on protocol mismatch | diff --git a/src/Login.cpp b/src/Login.cpp
index 15d063b..41a353e 100644
--- a/src/Login.cpp
+++ b/src/Login.cpp
@@ -1,183 +1,187 @@
#include "Login.hpp"
#include "../server/NetworkConstants.hpp"
#include "engine/screen.hpp"
#include "engine/procedure.hpp"
#include "engine/fade.hpp"
#include "engine/options.hpp... |
jhasse/jntetri | 4d96cc8aba58f286f56f0c979c4069cbd9e8e2e0 | Avoid endless quickLogin loop on errors | diff --git a/src/multiplayermenu.cpp b/src/multiplayermenu.cpp
index efd51b8..c07ce02 100644
--- a/src/multiplayermenu.cpp
+++ b/src/multiplayermenu.cpp
@@ -1,62 +1,63 @@
#include "multiplayermenu.hpp"
#include "engine/screen.hpp"
#include "engine/procedure.hpp"
#include "engine/fade.hpp"
#include "engine/option... |
jhasse/jntetri | 1b8df01de7bd5107fb817df0620b8daf6a84f234 | Only show Quit button if the platform can quit | diff --git a/src/menu.cpp b/src/menu.cpp
index 7a046b6..52e905d 100644
--- a/src/menu.cpp
+++ b/src/menu.cpp
@@ -1,73 +1,75 @@
#include "menu.hpp"
#include "engine/paths.hpp"
#include "engine/procedure.hpp"
#include "engine/fade.hpp"
#include "gui/ButtonBox.hpp"
#include "optionsmenu.hpp"
#include "engine/scre... |
jhasse/jntetri | 2b17b1b3e6067aeb3b8cf37666b5a52b8a1eb640 | Login automatically when started for the first time | diff --git a/src/Intro.cpp b/src/Intro.cpp
index 885bac0..2ff2a26 100644
--- a/src/Intro.cpp
+++ b/src/Intro.cpp
@@ -1,73 +1,77 @@
#include "Intro.hpp"
#include "constants.hpp"
#include "engine/fade.hpp"
#include "engine/options.hpp"
#include "engine/procedure.hpp"
#include "engine/screen.hpp"
#include "fonts.... |
jhasse/jntetri | 1b5623da952834622525becab4afca40cb59e843 | Avoid own login message being sent to a user which is about to login | diff --git a/server/Client.cpp b/server/Client.cpp
index b0ab0d9..249d34d 100644
--- a/server/Client.cpp
+++ b/server/Client.cpp
@@ -1,227 +1,227 @@
#include "Client.hpp"
#include "Server.hpp"
#include "NetworkConstants.hpp"
#include <boost/array.hpp>
#include <boost/bind.hpp>
#include <iostream>
#include <n... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.