Commit 47b1a195 authored by Matthew Collins's avatar Matthew Collins

Update deps/move from github-pages gem, optimize images

parent ecd17302
_site
.sass-cache
.jekyll-metadata
.vscode/
\ No newline at end of file
.vscode/
.asset-cache/
.jekyll-cache/
\ No newline at end of file
......@@ -10,6 +10,7 @@ deploy_site:
- /master/
variables:
OUT_NAME: "steam_assets"
JEKYLL_ENV: "production"
stage: deploy
script:
- apt-get -y -qq update
......@@ -25,3 +26,4 @@ deploy_site:
- bundle install
- bundle exec jekyll build
- cd _site && ./mc cp --recursive ./ think/site/live
- mcli rm --recursive --older-than=5 think/site/live
source "https://rubygems.org"
ruby RUBY_VERSION
source 'https://rubygems.org'
gem 'github-pages', group: :jekyll_plugins
gem "sprockets", "~> 4.0.beta", {
require: false
}
gem "image_optim"
gem "image_optim_pack"
gem 'jekyll', '~> 3.8', '>= 3.8.2'
gem 'jekyll-assets', '~> 3.0', '>= 3.0.11', group: :jekyll_plugins
gem 'jekyll-feed', '~> 0.9.3', group: :jekyll_plugins
gem 'jekyll-redirect-from', '~> 0.13.0', group: :jekyll_plugins
GEM
remote: https://rubygems.org/
specs:
activesupport (4.2.9)
i18n (~> 0.7)
activesupport (5.2.0)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.11.1)
colorator (1.1.0)
commonmarker (0.17.9)
ruby-enum (~> 0.5)
concurrent-ruby (1.0.5)
dnsruby (1.60.2)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
ethon (0.11.0)
ffi (>= 1.3.0)
eventmachine (1.2.5)
eventmachine (1.2.7)
execjs (2.7.0)
faraday (0.15.0)
multipart-post (>= 1.2, < 3)
exifr (1.3.4)
extras (0.3.0)
forwardable-extended (~> 2.5)
fastimage (2.1.3)
ffi (1.9.23)
forwardable-extended (2.6.0)
gemoji (3.0.0)
github-pages (183)
activesupport (= 4.2.9)
github-pages-health-check (= 1.7.3)
jekyll (= 3.7.3)
jekyll-avatar (= 0.5.0)
jekyll-coffeescript (= 1.1.1)
jekyll-commonmark-ghpages (= 0.1.5)
jekyll-default-layout (= 0.1.4)
jekyll-feed (= 0.9.3)
jekyll-gist (= 1.5.0)
jekyll-github-metadata (= 2.9.4)
jekyll-mentions (= 1.3.0)
jekyll-optional-front-matter (= 0.3.0)
jekyll-paginate (= 1.1.0)
jekyll-readme-index (= 0.2.0)
jekyll-redirect-from (= 0.13.0)
jekyll-relative-links (= 0.5.3)
jekyll-remote-theme (= 0.2.3)
jekyll-sass-converter (= 1.5.2)
jekyll-seo-tag (= 2.4.0)
jekyll-sitemap (= 1.2.0)
jekyll-swiss (= 0.4.0)
jekyll-theme-architect (= 0.1.1)
jekyll-theme-cayman (= 0.1.1)
jekyll-theme-dinky (= 0.1.1)
jekyll-theme-hacker (= 0.1.1)
jekyll-theme-leap-day (= 0.1.1)
jekyll-theme-merlot (= 0.1.1)
jekyll-theme-midnight (= 0.1.1)
jekyll-theme-minimal (= 0.1.1)
jekyll-theme-modernist (= 0.1.1)
jekyll-theme-primer (= 0.5.3)
jekyll-theme-slate (= 0.1.1)
jekyll-theme-tactile (= 0.1.1)
jekyll-theme-time-machine (= 0.1.1)
jekyll-titles-from-headings (= 0.5.1)
jemoji (= 0.9.0)
kramdown (= 1.16.2)
liquid (= 4.0.0)
listen (= 3.1.5)
mercenary (~> 0.3)
minima (= 2.4.1)
nokogiri (>= 1.8.1, < 2.0)
rouge (= 2.2.1)
terminal-table (~> 1.4)
github-pages-health-check (1.7.3)
addressable (~> 2.3)
dnsruby (~> 1.60)
octokit (~> 4.0)
public_suffix (~> 2.0)
typhoeus (~> 1.3)
html-pipeline (2.7.2)
activesupport (>= 2)
nokogiri (>= 1.4)
fspath (3.1.0)
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jekyll (3.7.3)
image_optim (0.26.1)
exifr (~> 1.2, >= 1.2.2)
fspath (~> 3.0)
image_size (~> 1.5)
in_threads (~> 1.3)
progress (~> 3.0, >= 3.0.1)
image_optim_pack (0.5.0.20180419)
fspath (>= 2.1, < 4)
image_optim (~> 0.19)
image_size (1.5.0)
in_threads (1.5.0)
jekyll (3.8.2)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
......@@ -99,152 +49,75 @@ GEM
pathutil (~> 0.9)
rouge (>= 1.7, < 4)
safe_yaml (~> 1.0)
jekyll-avatar (0.5.0)
jekyll (~> 3.0)
jekyll-coffeescript (1.1.1)
coffee-script (~> 2.2)
coffee-script-source (~> 1.11.1)
jekyll-commonmark (1.2.0)
commonmarker (~> 0.14)
jekyll (>= 3.0, < 4.0)
jekyll-commonmark-ghpages (0.1.5)
commonmarker (~> 0.17.6)
jekyll-commonmark (~> 1)
rouge (~> 2)
jekyll-default-layout (0.1.4)
jekyll (~> 3.0)
jekyll-assets (3.0.11)
activesupport (~> 5.0)
execjs (~> 2.7)
extras (~> 0.2)
fastimage (~> 2.0, >= 1.8)
jekyll (>= 3.5, < 4.0)
jekyll-sanity (~> 1.2)
liquid-tag-parser (~> 1.0)
nokogiri (~> 1.8)
pathutil (~> 0.16)
sprockets (>= 3.3, < 4.1.beta)
jekyll-feed (0.9.3)
jekyll (~> 3.3)
jekyll-gist (1.5.0)
octokit (~> 4.2)
jekyll-github-metadata (2.9.4)
jekyll (~> 3.1)
octokit (~> 4.0, != 4.4.0)
jekyll-mentions (1.3.0)
activesupport (~> 4.0)
html-pipeline (~> 2.3)
jekyll (~> 3.0)
jekyll-optional-front-matter (0.3.0)
jekyll (~> 3.0)
jekyll-paginate (1.1.0)
jekyll-readme-index (0.2.0)
jekyll (~> 3.0)
jekyll-redirect-from (0.13.0)
jekyll (~> 3.3)
jekyll-relative-links (0.5.3)
jekyll (~> 3.3)
jekyll-remote-theme (0.2.3)
jekyll (~> 3.5)
rubyzip (>= 1.2.1, < 3.0)
typhoeus (>= 0.7, < 2.0)
jekyll-sanity (1.2.0)
jekyll (~> 3.1)
jekyll-sass-converter (1.5.2)
sass (~> 3.4)
jekyll-seo-tag (2.4.0)
jekyll (~> 3.3)
jekyll-sitemap (1.2.0)
jekyll (~> 3.3)
jekyll-swiss (0.4.0)
jekyll-theme-architect (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-cayman (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-dinky (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-hacker (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-leap-day (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-merlot (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-midnight (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-minimal (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-modernist (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-primer (0.5.3)
jekyll (~> 3.5)
jekyll-github-metadata (~> 2.9)
jekyll-seo-tag (~> 2.0)
jekyll-theme-slate (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-tactile (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-time-machine (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-titles-from-headings (0.5.1)
jekyll (~> 3.3)
jekyll-watch (2.0.0)
listen (~> 3.0)
jemoji (0.9.0)
activesupport (~> 4.0, >= 4.2.9)
gemoji (~> 3.0)
html-pipeline (~> 2.2)
jekyll (~> 3.0)
kramdown (1.16.2)
liquid (4.0.0)
liquid-tag-parser (1.9.0)
extras (~> 0.3)
liquid (>= 3.0, < 5.0)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
mercenary (0.3.6)
mini_portile2 (2.3.0)
minima (2.4.1)
jekyll (~> 3.5)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
minitest (5.11.3)
multipart-post (2.0.0)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
octokit (4.8.0)
sawyer (~> 0.8.0, >= 0.5.3)
pathutil (0.16.1)
forwardable-extended (~> 2.6)
public_suffix (2.0.5)
progress (3.4.0)
public_suffix (3.0.2)
rack (2.0.5)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rouge (2.2.1)
ruby-enum (0.7.2)
i18n
rouge (3.1.1)
ruby_dep (1.5.0)
rubyzip (1.2.1)
safe_yaml (1.0.4)
sass (3.5.6)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sawyer (0.8.1)
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
sprockets (4.0.0.beta7)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
thread_safe (0.3.6)
typhoeus (1.3.0)
ethon (>= 0.9.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
unicode-display_width (1.3.2)
PLATFORMS
ruby
DEPENDENCIES
github-pages
image_optim
image_optim_pack
jekyll (~> 3.8, >= 3.8.2)
jekyll-assets (~> 3.0, >= 3.0.11)
jekyll-feed (~> 0.9.3)
jekyll-redirect-from (~> 0.13.0)
sprockets (~> 4.0.beta)
RUBY VERSION
ruby 2.5.1p57
......
---
---
@charset "UTF-8";
@font-face {
......
......@@ -14,6 +14,29 @@ compress_html:
plugins:
- jekyll-feed
- jekyll-redirect-from
- jekyll-assets
sass:
sass_dir: css/
style: compressed
\ No newline at end of file
style: compressed
assets:
defaults:
js:
integrity: false
css:
integrity: false
img:
integrity: false
plugins:
img:
optim:
jekyll:
pack: true
advpng: {}
allow_lossy: false
optipng:
level: 7
pngquant:
speed: 1
jpegoptim:
max_quality: 100
allow_lossy: false
\ No newline at end of file
......@@ -5,7 +5,7 @@ layout: compress
<html lang=en>
<head>
<title>{{ site.title }}</title>
<link rel=stylesheet href="/css/main.css"/>
{% asset main.css %}
<meta name=viewport content="width=device-width, initial-scale=1">
{% feed_meta %}
</head>
......
......@@ -26,7 +26,7 @@ into Rust was challenging for me. Getting used to not relying on a
GC to clean up for me and trying to get the hang of borrowing rules
took a bit of time and I still haven't completely mastered them yet.
![My final year project at uni](/img/a-game-in-rust/ce301.jpg){:align="left"}
{% asset a-game-in-rust/ce301.jpg alt='My final year project at uni' align='left' @optim %}
One of my first projects in Rust was a game I created for my final
year project at university. The game was a platforming game with
......@@ -46,7 +46,7 @@ Even though the project hasn't been touched in months it still builds
on the latest version of Rust (after a `cargo update` because some
dependencies did break between versions).
![Steven: A Minecraft client reimplementation](/img/a-game-in-rust/steven.jpg){:align="right"}
{% asset a-game-in-rust/steven.jpg alt='Steven: A Minecraft client reimplementation' align='right' @optim %}
The other largish project i've done in Rust is a re-implementation
of the Minecraft client in Rust called [Steven][steven] which I
......@@ -72,7 +72,7 @@ be arriving soon.
## The game
![My game](/img/a-game-in-rust/game.jpg){:align="left"}
{% asset a-game-in-rust/game.jpg alt='My game' align='left' @optim %}
Planning not being my strong point i'm just making up the game as
I go with a rough idea in my head of whats going to happen.
Its going to be a management game set in a school/university type
......
......@@ -123,7 +123,7 @@ an in-game term.
### Money
![HUD display money and the current rating](/img/money.png){:align="right"}
{% asset money.png alt='HUD display money and the current rating' align='right' @optim %}
Staff, rooms and objects now have a cost and will charge the player
to place them. Students can now pay the player as well.
......@@ -139,8 +139,8 @@ when finalizing the edit, however, will be lost.
### Redrawn icons
![Before](/img/icons-before.jpg){:.cimage}
![After](/img/icons-after.jpg){:.cimage}
{% asset icons-before.jpg alt="Before" class='cimage' @optim %}
{% asset icons-after.jpg alt="After" class='cimage' @optim %}
Improved the look of icons on the ui. Previously a pixel art style was
used but I've changed over to a sketchy style instead. I feel this new
......@@ -156,8 +156,8 @@ during the game.
### Chairs/Benches
![Chairs](/img/chairs.jpg){:align="left"}
![A bench](/img/bench.jpg){:align="right"}
{% asset chairs.jpg alt='Chairs' align='left' @optim %}
{% asset bench.jpg alt='A bench' align='right' @optim %}
Chairs and benches were added. Students will automatically sit
in chairs during a lecture. The number of chairs affects the
......@@ -178,7 +178,7 @@ task as soon as a lesson starts.
### Extensions
![Extension joining two buildings](/img/extension.jpg){:.cimage}
{% asset extension.jpg alt="Extension joining two buildings" class='cimage' @optim %}
An extension object was added that allows for two buildings to be joined
together. Originally you could overlap buildings to join them but this
......@@ -188,7 +188,7 @@ two buildings.
### Work on having random colors for units
[![Random colours for professors](/img/random-prof.jpg){:.cimage}](/img/random-prof-orig.jpg)
[{% asset random-prof.jpg alt="Random colours for professors" class='cimage' @optim %}](/img/random-prof-orig.jpg)
[Video showing more][random] To try and make staff/students feel
more unique I've started to work on a feature that allows for
......
......@@ -12,7 +12,7 @@ quite a lot of time has been spent on stylish.
## Stylish
![Stylish's demo project](/img/stylish-demo.png){:align="right"}
{% asset stylish-demo.png alt="Stylish's demo project" align='right' @optim %}
One of the big things I've been working on this month is [Stylish][stylish].
Stylish is a simple ui system that revolves around styles (hence the name)
......@@ -65,7 +65,7 @@ currently performs well enough for my uses.
### UniverCity
![The server connection screen from univercity](/img/stylish-univercity.jpg){:align="left"}
{% asset stylish-univercity.jpg alt='The server connection screen from univercity' align='left' @optim %}
Embedding stylish + webrender into my game ended up being pretty simple.
The only pain point was working out what state webrender expected opengl
......@@ -151,7 +151,7 @@ I'll start finding issues as I finish moving everything over to it.
### New path and brick wall textures
![The new improved path texture](/img/path-texture.jpg){:.cimage}
{% asset path-texture.jpg alt="The new improved path texture" class='cimage' @optim %}
The old path texture was one of the first textures drawn for the game
and was showing its age as I've improved with my texture work.
......@@ -164,8 +164,8 @@ but they fit in much better with the rest of the textures.
### SSAO and lighting improvements
[![The old look of the game without SSAO](/img/render-before-small.jpg)](/img/render-before.jpg)
[![The new look of the game with SSAO](/img/render-after-small.jpg){:align="right"}](/img/render-after.jpg)
[{% asset render-before.jpg alt="The old look of the game without SSAO](/img/render-before-small.jpg)" @optim %}
[{% asset render-after-small.jpg alt='The new look of the game with SSAO' align='right' @optim %}](/img/render-after.jpg)
Click the images for a larger view.
......@@ -185,7 +185,7 @@ and I plan to add an option to disable it on low end machines.
### Students got a model
![A student sitting](/img/student-model.jpg){:align="left"}
{% asset student-model.jpg alt='A student sitting' align='left' @optim %}
[The old blue box model will be missed][boxy], but the new model
is much more fitting. It is fully set up for the tinting system that
......
......@@ -8,7 +8,7 @@ comments: 5
### Stylish conversion complete + UI Improvements
![The server connection screen from univercity with a new font](/img/new-font.jpg){:align="left"}
{% asset new-font.jpg alt='The server connection screen from univercity with a new font' align='left' @optim %}
The conversion from the old UI system to [stylish][stylish] is complete.
This did take a while but things look and work better because of it.
......@@ -26,8 +26,8 @@ mouse is released.
### Logo Updated
![Old Logo](/img/old-logo.png)
![New Logo](/img/new-logo.png)
{% asset old-logo.png alt="Old Logo" @optim %}
{% asset new-logo.png alt="New Logo" @optim %}
With the font change I dedicided it was time to update the game's logo as well.
As you can see i'm not an artist. The new logo uses the same idea of the previous
......@@ -36,7 +36,7 @@ form of a graduation cap.
### Tooltips improved
![New tooltip layout](/img/tooltip.jpg){:align="right"}
{% asset tooltip.jpg alt='New tooltip layout' align='right' @optim %}
Tooltips can now include icons and highlighted text. This should make them
clearer to players. The current icons aren't that clear so they may get
......@@ -78,14 +78,14 @@ rooms so more will walk in over time as the player builds.
### Model changes
![Professor variants](/img/variants-prof.jpg){:align="left"}
{% asset variants-prof.jpg alt='Professor variants' align='left' @optim %}
The animation rig for professors and students was completely redone
and they now share the same rig. This allows for the animations
to be reused greatly reducing the amount of duplicate work and
work to add a new model to the game.
![Student variants](/img/variants-students.jpg){:align="right"}
{% asset variants-students.jpg alt='Student variants' align='right' @optim %}
Along with this new variants of the exist models were added. The
game now supports random variants for entities which can override
......@@ -99,7 +99,7 @@ amount of time I have to be working on models.
### Plants
![Plant models](/img/plants.jpg){:.cimage}
{% asset plants.jpg alt="Plant models" class='cimage' @optim %}
### Professors teach
......
......@@ -49,15 +49,15 @@ places.
### New rooms
![Science Basics](/img/science_basics.jpg)
![Science Lab](/img/science_lab.jpg)
![Compsci Lab](/img/compsci_lab.jpg)
![Art Room](/img/art_room.jpg)
![Toilets](/img/toilets.jpg)
{% asset science_basics.jpg alt="Science Basics" @optim %}
{% asset science_lab.jpg alt="Science Lab" @optim %}
{% asset compsci_lab.jpg alt="Compsci Lab" @optim %}
{% asset art_room.jpg alt="Art Room" @optim %}
{% asset toilets.jpg alt="Toilets" @optim %}
### Stats screen
![Stats screen](/img/stats-screen.png){:.cimage}
{% asset stats-screen.png alt="Stats screen" class='cimage' @optim %}
The line drawing code needs some work but it works well enough for
now. Currently this only tracks total money over time, the buttons
......@@ -65,7 +65,7 @@ at the top are not implemented.
### Student feelings
![Student feelings screen](/img/student-feelings.png){:align="left"}
{% asset student-feelings.png alt='Student feelings screen' align='left' @optim %}
Students now have 'feelings' which decay over time. Hunger can be
fixed by building places to obtain food (e.g. snack stop) which students
......
......@@ -8,7 +8,7 @@ comments: 7
### Saving and Loading
![Save file list](/img/load-list.jpg){:.cimage}
{% asset load-list.jpg alt="Save file list" class='cimage' @optim %}
Built UniverCities can finally be saved and loaded at a later date.
I may make breaking changes to the format whilst i'm working on this
......@@ -28,7 +28,7 @@ try it again later if save file size becomes an issue.
### Wall toggle for limited mode editing
![Limited mode walls being lowered](/img/limited-walls.jpg){:align="right"}
{% asset limited-walls.jpg alt='Limited mode walls being lowered' align='right' @optim %}
Previously this was only possible when editing rooms/placing buildings but
wouldn't work if the building/room contained another room. This now works
......@@ -40,7 +40,7 @@ but allows adding/removing objects.
### Improved door model/texture
![New door look](/img/new-door.jpg){:align="left"}
{% asset new-door.jpg alt='New door look' align='left' @optim %}
Previously this was just a flat texture with a hole. The texture resolution
was increased and the handle got a model instead of being flat.
......@@ -51,7 +51,7 @@ from.
### Pausing
![Pause Menu](/img/pause.jpg){:align="right"}
{% asset pause.jpg alt='Pause Menu' align='right' @optim %}
The game has an in game menu that pauses in single player. From this
menu the game can be saved and the options menu can be accessed.
......@@ -59,7 +59,7 @@ Currently all settings can be changed whilst in game.
### Chat
![Chat system](/img/chat.jpg){:.cimage}
{% asset chat.jpg alt="Chat system" class='cimage' @optim %}
Implemented a basic chat system. In multiplayer the names will be what
the player entered on the connection screen but single player is currently
......
......@@ -11,7 +11,7 @@ In general I think the game feels a bit better now.
### Highlights when hovering over students/staff/objects
![Highlights around the edge of entities](/img/highlight.png){:align="left"}
{% asset highlight.png alt='Highlights around the edge of entities' align='left' @optim %}
Added a highlight to students, staff and objects when you mouse over them
to help being able to see which one you are actually selecting. Objects
......@@ -38,7 +38,7 @@ generalise the case where models have custom shaders at some point.
### Object menu redesign
![The new object menu](/img/objectmenu.jpg){:align="right"}
{% asset objectmenu.jpg alt='The new object menu' align='right' @optim %}
I decided to redesign the object menu to make finding objects easier. Whilst
the old menu provided a icon for the object which this one is currently missing,
......@@ -62,18 +62,18 @@ along with the model they are attached to.
### Model additions
![Office worker and talk animation](/img/officeworker.jpg){:.cimage}
{% asset officeworker.jpg alt="Office worker and talk animation" class='cimage' @optim %}
Finally have an office worker model (RIP boxy the yellow box) and there is