Release v.1.3 (merge branch 'devel' into 'master')

sconetto · Jul 24, 2017 · e5ecbe3 · e5ecbe3
2 parents 6f8d4de + 8f024e0
commit e5ecbe3
Show file tree

Hide file tree

Showing 142 changed files with 3,994 additions and 1,073 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,13 @@
+*.o
+*.a
+*.so
+*.dll
+*.exe
+*.elf
+*.ppu
+*.geany
+*.patch
+
+*.*~
+var/*
+
diff --git a/LICENSE.txt → LICENCE.txt b/LICENSE.txt → LICENCE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2012-2014 Artur "suve" Iwicki
+Copyright (c) 2012-2017 Artur "suve" Iwicki
 
 This software is provided 'as-is', without any express or implied warranty.
 In no event will the authors be held liable for any damages arising from the
@@ -13,7 +13,7 @@ subject to the following restrictions:
    an acknowledgment (see the following) in the product documentation
    is required.
 
-   Portions Copyright (c) 2012-2014 Artur "suve" Iwicki
+   Portions Copyright (c) 2012-2017 Artur "suve" Iwicki
 
 2. Altered source versions must be plainly marked as such, and must not be
    misrepresented as being the original software.

diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ Licensing
 ---------------------------
 Colorful is released under the "zlib with acknowledgement" license.
 
-The full text of the license can be found in the LICENSE.txt file.
+The full text of the license can be found in the LICENCE.txt file.
 
 
 Language info
@@ -32,7 +32,7 @@ the game quite eagerly.
 
 Libraries used
 ----------------------
-The game uses SDL (along with SDL_image and SDL_mixer) libraries
+The game uses SDL (along with SDL_Image and SDL_Mixer) libraries
 for event handling, gfx and sfx; and the Sour lib.
 
 Simple DirectMedia Layer
@@ -65,11 +65,23 @@ you'll have to meddle with the code a bit and add these constants for
 your new platform. Or just remove the compiler directives and hard-code
 them for your OS - whatever you find suitable.
 
-Also, note that, by default, on Linux, SDL_mixer links and depends on
-smpeg for MP3 support. Since Colorful does not use MP3s, and less 
-dependencies is better, my releases are compiled using a slightly 
-altered version of SDL_mixer.pas, disabling the smpeg capabilities.
-This version is also bundled with the GitHub sources.
+
+Bundled SDL_Mixer
+-----------------
+By default, on Linux, SDL_mixer links and depends on smpeg for MP3 support.
+Since Colorful does not use MP3s, and less dependencies is better 
+(not to mention that until quite recently, MP3 was patent-encumbered), 
+we want to avoid dragging smpeg into the picture.
+
+Since FPC 3.0.0, the compiler comes with an smpeg-disabled version of SDL_Mixer
+by default. However, for older versions of the compiler, it was necessary
+to bundle a copy of SDL_Mixer and modify it appropriately.
+
+There are macros in the source code that detect whether you're using
+FPC >= 3.0.0 and switch to using the compiler-provided library, instead
+of relying on the bundled one. In this case, it's safe to competely remove
+the `src/sdl_mixer_bundled.pas` and `src/jedi.inc` files 
+without affecting the build.
 
 
 Author's rambling

diff --git a/change.log b/change.log
@@ -6,20 +6,55 @@ Legend:
 * Altered
 > Comment
 
-> 2014.0316
+= 2017.0723 =
+* The woman will now cycle through colours at a fixed rate, instead of
+  randomly picking a colour each frame.
+* Cropped the game font to remove unused space.
+
+= 2017.0721 =
++ The game will now listen to events when loading assets (it will not freeze
+  and will respond properly to a "quit" request).
+
+= 2017.0707 =
+* If the game is compiled using FPC 3.0.0 or newer, it will include ("uses")
+  the compiler-provided version of SDL_Mixer, instead of the bundled one.
+
+= 2017.0630 =
++ It is now possible to use the mouse to select options in the menus.
++ The mouse cursor is now hidden upon entering the game (and shown again when
+  going back to the menu).
+
+= 2017.0629 =
++ The game now properly loads and sets its window icon.
+* Made the green zone a little bit harder (added a door that forces the player
+  to take a longer way to a generator).
+
+= 2017.0628 =
+* Moved room change so it doesn't take place during the game step.
+* Changed the way hero-room collisions are handled - should improve
+  the room-change experience.
+* Minor fixes to maps.
+
+= 2017.0627 =
+* Moved game loop code to a separate code file.
+
+= 2017.0326 =
+* Fixed possible segfault in TRoom.Collides() and TRoom.HitSfx().
+
+= 2014.0316 =
 * Fixed a bug which made an SDL_Mixer call before the library was initialized.
   Which, quite amusingly, led to division by zero and crash on some machines,
   and worked perfectly fine on others.
 > v.1.2 released, after sitting on my HDD for over a year.
 
-> 2013.0108
+= 2013.0108 =
 * Replaced BASS with SDL_Mixer for audio handling.
 * Moved finalization from main() to QuitProg().
 
-> 2012.1226
+= 2012.1226 =
 > v.1.1 realeased.
 
-> 2012.1225
+= 2012.1225 =
 + Implemented the keybinding dialog.
 + Added a global shutdown variable.
 * All enemy behaviour times have been changed from consts to object fields,
@@ -29,21 +64,21 @@ Legend:
   gameworld selection dialog when (s)he wishes to begin/load a game.
 > Finished the tutorial.
 
-> 2012.1224
+= 2012.1224 =
 + Added automatic pause upon losing application focus.
 + Added automatic savegame upon death, progress (delivering a colour)
   and program exit.
 * Moved ChangeRoom() and DestoryEntities() to shared.
 * Separate savegames for every gameworld.
 
-> 2012.1223
+= 2012.1223 =
 + Added the configfiles unit.
 + Added some comments in case anyone would actually want to read the code.
 * Divided tutorial and game maps into subfolders.
 * "tile" roomscript command now takes (1,1)-(20,20) coords,
   instead of (0,0)-(19,19).
 
-> 2012.1222
+= 2012.1222 =
 * Fixed loading sounds not updating the progress bar.
 * Moved room loading from rooms/initialization to shared/interface/LoadRes().
 + Added the floatingtext unit.

diff --git a/gfx/colours.png b/gfx/colours.png
diff --git a/gfx/enem0.png b/gfx/enem0.png
diff --git a/gfx/enem1.png b/gfx/enem1.png
diff --git a/gfx/enem2.png b/gfx/enem2.png
diff --git a/gfx/enem3.png b/gfx/enem3.png
diff --git a/gfx/enem4.png b/gfx/enem4.png
diff --git a/gfx/enem5.png b/gfx/enem5.png
diff --git a/gfx/enem6.png b/gfx/enem6.png
diff --git a/gfx/font.png b/gfx/font.png
diff --git a/gfx/hero.png b/gfx/hero.png
diff --git a/gfx/icon.png b/gfx/icon.png
diff --git a/gfx/numbers.png b/gfx/numbers.png
diff --git a/gfx/shot0.png b/gfx/shot0.png
diff --git a/gfx/shot1.png b/gfx/shot1.png
diff --git a/gfx/shot2.png b/gfx/shot2.png
diff --git a/gfx/shot3.png b/gfx/shot3.png
diff --git a/gfx/shot4.png b/gfx/shot4.png
diff --git a/gfx/tiles.png b/gfx/tiles.png
diff --git a/gfx/title.png b/gfx/title.png
diff --git a/gfx/ui.png b/gfx/ui.png
diff --git a/intro/out0.png b/intro/out0.png
diff --git a/intro/out1.png b/intro/out1.png
diff --git a/intro/out2.png b/intro/out2.png
diff --git a/intro/out3.png b/intro/out3.png
diff --git a/intro/out4.png b/intro/out4.png
diff --git a/intro/out5.png b/intro/out5.png
diff --git a/intro/out6.png b/intro/out6.png
diff --git a/intro/out7.png b/intro/out7.png
diff --git a/intro/out8.png b/intro/out8.png
diff --git a/intro/out9.png b/intro/out9.png
diff --git a/intro/slide0.png b/intro/slide0.png
diff --git a/intro/slide1.png b/intro/slide1.png
diff --git a/intro/slide2.png b/intro/slide2.png
diff --git a/intro/slide3.png b/intro/slide3.png
diff --git a/intro/slide4.png b/intro/slide4.png
diff --git a/intro/slide5.png b/intro/slide5.png
-Original file line number
+Diff line change
@@ -0,0 +1,13 @@
+    *.o
+    *.a
+    *.so
+    *.dll
+    *.exe
+    *.elf
+    *.ppu
+    *.geany
+    *.patch
+    *.*~
+    var/*