]>
git.jsancho.org Git - lugaru.git/log
Côme Chilliet [Fri, 9 Dec 2016 10:50:24 +0000 (17:50 +0700)]
Cleaned up Animation by using vectors and classes
Côme Chilliet [Fri, 9 Dec 2016 09:29:14 +0000 (16:29 +0700)]
Moved Skeleton and Animation to their own folder.
Moved Animation class in Animation.* files.
Using a vector for animations.
Deactivated the deallocation for now, probable memory leaks, will be
fixed by futur commit
Rémi Verschelde [Thu, 8 Dec 2016 18:02:11 +0000 (19:02 +0100)]
Install more docs (AUTHORS, DEBUG-OPTIONS.txt)
Rémi Verschelde [Thu, 8 Dec 2016 08:53:59 +0000 (08:53 +0000)]
Readd -pedantic to CXX flags for all builds
It was removed a bit too fast in
20e924d , it's actually an interesting
flag to keep even for non-debug builds.
Rémi Verschelde [Thu, 8 Dec 2016 07:54:15 +0000 (08:54 +0100)]
Silb assets are also under version 3.0 Unported of CC-BY-SA
At least judging by the version he linked in his forum statement.
Côme Chilliet [Thu, 8 Dec 2016 02:49:40 +0000 (09:49 +0700)]
Replaced as much char* as possible by std::strings
Côme Chilliet [Wed, 7 Dec 2016 17:52:15 +0000 (00:52 +0700)]
Moved all calls to skeleton Load to Person
Neal Gompa [Wed, 7 Dec 2016 22:31:25 +0000 (17:31 -0500)]
Add AppStream appdata/metainfo file
This completes the set of metadata files installed for Linux systems.
Fixes #27.
Rémi Verschelde [Wed, 7 Dec 2016 21:59:41 +0000 (22:59 +0100)]
Write config and user data to %APPDATA% on Windows
We may want to readd a PORTABLE option that reverts to loading the config
and user data from the binary's directory for portable binary distribution.
Last part of and fixes #22.
Rémi Verschelde [Wed, 7 Dec 2016 21:44:56 +0000 (22:44 +0100)]
Fix CXX flags in various CMake build types
The flags we were defining for _DEBUG and _RELEASE were similar to the default
CMake flags for those types, which get appended to CMAKE_CXX_FLAGS, so we only
need to customize the latter.
The final flags will be for e.g. RelWithDebInfo:
${CMAKE_CXX_FLAGS} ${CXXFLAGS} ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}
with ${CXXFLAGS} taken from the environment.
Rémi Verschelde [Wed, 7 Dec 2016 21:03:07 +0000 (22:03 +0100)]
Add manpage for Linux system installation
Fixes #28.
Rémi Verschelde [Wed, 7 Dec 2016 20:42:17 +0000 (21:42 +0100)]
Add and install desktop file and icon
Already added the install instruction for the appdata file for @Conan_Kudo.
Fixes most of #27.
Rémi Verschelde [Wed, 7 Dec 2016 20:36:46 +0000 (21:36 +0100)]
Move distribution-related files to Dist
Also delete useless or obsolete files, as well as a binary .aps file
from Visual Studio.
Also fix .gitignore ignoring any lugaru*.* file :)
Rémi Verschelde [Wed, 7 Dec 2016 20:26:19 +0000 (21:26 +0100)]
Add proper system-wide install instructions for Linux
The behaviour is triggered by the SYSTEM_INSTALL option (currently defaults to OFF).
Fixes #13.
(cherry picked from commit
46cd66c888bd9cc5df4f6eb59abce429fdd6cd56 )
Côme Chilliet [Wed, 7 Dec 2016 11:56:42 +0000 (18:56 +0700)]
Moved as much as possible init in Person constructor
Côme Chilliet [Wed, 7 Dec 2016 11:20:46 +0000 (18:20 +0700)]
Fixed weird broken if/else/if
Côme Chilliet [Wed, 7 Dec 2016 11:16:15 +0000 (18:16 +0700)]
Fixes #8 Removed glstubs.h and its uses
Rémi Verschelde [Sun, 4 Dec 2016 16:43:59 +0000 (17:43 +0100)]
Fix hardcoded clothes paths in maps
Also fix loading those paths with the proper Folder function.
Remove bogus piece of cloth "1.0 1.0 1.0.png".
Part of #21.
Côme Chilliet [Sun, 4 Dec 2016 07:43:02 +0000 (14:43 +0700)]
Trying to handle a bit better missing files and avoid segfaults
Also using multiplatform SDL_ShowSimpleMessageBox instead of Windows
only MessageBox
Rémi Verschelde [Sun, 4 Dec 2016 00:28:26 +0000 (01:28 +0100)]
Data files use title case consistently
The data lookup is now case sensitive, so we make it so that all files
use a title case (e.g. ShirtFemale.png).
Caveat: Paths to clothes are hardcoded in every binary level file as
:Data:Textures:shirtfemale.png or similar, they need to be fixed somehow.
Rémi Verschelde [Sat, 3 Dec 2016 22:21:29 +0000 (23:21 +0100)]
Fix regression in fallback logic on Linux
Regression from
11ff9aec2c3206a5b9df5bf8815051458628c45a
Rémi Verschelde [Sat, 3 Dec 2016 20:51:13 +0000 (21:51 +0100)]
Rename DATADIR to DATA_DIR to avoid conflict
On MinGW it would error out with:
Source/Utils/Folders.cpp:33:45: error: expected primary-expression before ';' token
const std::string Folders::dataDir = DATADIR;
^
The issue seems to be that MinGW (and likely MSVC) is case insensitive
and would see DATADIR as conflicting with dataDir.
Côme Chilliet [Fri, 2 Dec 2016 16:30:30 +0000 (23:30 +0700)]
Trying to add implementations for MacOS and Windows
Côme Chilliet [Fri, 2 Dec 2016 11:41:32 +0000 (18:41 +0700)]
Dirs are now created if missing under GNU/Linux
Côme Chilliet [Thu, 1 Dec 2016 17:40:13 +0000 (00:40 +0700)]
Switched all data access to the new methods
Removed the ugly define on fopen
Still missing:
- Creating the folders we want to write in
- Finding the path of the binary and use it as base on Linux, with locateCorrectFile
Côme Chilliet [Thu, 1 Dec 2016 16:26:21 +0000 (23:26 +0700)]
First step towards using clean methods and correct paths for datas and config
Côme Chilliet [Thu, 1 Dec 2016 04:08:07 +0000 (11:08 +0700)]
Merge branch 'master' of gitlab.com:osslugaru/lugaru
Rémi Verschelde [Wed, 30 Nov 2016 20:50:42 +0000 (21:50 +0100)]
Remove license info obsoleted by relicensing
51203b531b2054a8a7c40356e2108a5ec7b9f366 effectively relicensed all
Wolfire assets under CC-BY-SA 3.0, so this last paragraph is obsolete
and was just forgotten during the relicensing.
Rémi Verschelde [Wed, 30 Nov 2016 20:34:13 +0000 (21:34 +0100)]
Rename "Debug\ Readme" to DEBUG-OPTIONS.txt and move out of Data
Also mac2unix :)
Rémi Verschelde [Wed, 30 Nov 2016 20:20:43 +0000 (21:20 +0100)]
Main campaign: Delete unused German translation of April scene
Rémi Verschelde [Wed, 30 Nov 2016 20:16:49 +0000 (21:16 +0100)]
DialogBox is protected on Windows, rename to DialogScene
Also adapted variable names accordingly and even the fields
in the dialog data files.
Rémi Verschelde [Wed, 30 Nov 2016 20:14:00 +0000 (21:14 +0100)]
Convert campaigns and dialogues to Unix format
Also add .gitattributes to enforce LF line endings.
Rémi Verschelde [Wed, 30 Nov 2016 19:19:41 +0000 (20:19 +0100)]
Fix libpng iCCP warning about invalid sRGB profile
Using ImageMagick or pngcrush seemed to introduce issues, so I had in the end to
fix the sRGB profile manually for each problematic image in GIMP.
Côme Chilliet [Wed, 30 Nov 2016 17:06:12 +0000 (00:06 +0700)]
Removed weird test for dialogues. Only attackkey should be used.
Côme Chilliet [Wed, 30 Nov 2016 16:44:50 +0000 (23:44 +0700)]
Cleaned up dialog handling using a Dialog class
The fixdialogue command will behave a tiny bit differently as it will
set participantfacing value as the dialogue would.
The previous behavior would crash if the number of boxes changed so I
could not keep it.
I kept the limitation of participants of 10 for now, does not seem like
a big deal.
Côme Chilliet [Tue, 29 Nov 2016 16:09:16 +0000 (23:09 +0700)]
Tiny clean
Côme Chilliet [Tue, 29 Nov 2016 10:15:23 +0000 (17:15 +0700)]
Cleaned a bit OPENAL_SetFrequency, fixing some clang warnings
It would be best to check if calls to OPENAL_SetFrequency are really needed
Côme Chilliet [Tue, 29 Nov 2016 09:30:12 +0000 (16:30 +0700)]
Person::occluded should be an int
Côme Chilliet [Tue, 29 Nov 2016 09:26:21 +0000 (16:26 +0700)]
Removed useless code
Côme Chilliet [Tue, 29 Nov 2016 06:03:37 +0000 (13:03 +0700)]
Fixed clang warnings
Côme Chilliet [Tue, 29 Nov 2016 06:03:22 +0000 (13:03 +0700)]
Cleaned up FootLand method
Côme Chilliet [Tue, 29 Nov 2016 05:11:28 +0000 (12:11 +0700)]
Moved Person loading from file into a Person constructor
Côme Chilliet [Tue, 29 Nov 2016 05:02:34 +0000 (12:02 +0700)]
Removed unused member of Weapon class
Côme Chilliet [Tue, 29 Nov 2016 05:01:14 +0000 (12:01 +0700)]
Added pedantic to debug build options to avoid problems such as the VLA one in the future
Côme Chilliet [Tue, 29 Nov 2016 05:00:53 +0000 (12:00 +0700)]
Removed ununused field hasAlpha
Côme Chilliet [Tue, 29 Nov 2016 04:51:16 +0000 (11:51 +0700)]
Avoid using Variable Length Arrays (which are refused by clang)
Côme Chilliet [Tue, 29 Nov 2016 04:22:47 +0000 (11:22 +0700)]
Fixed some small sonar warnings
Côme Chilliet [Tue, 29 Nov 2016 04:08:31 +0000 (11:08 +0700)]
Fixed a clang warning
Côme Chilliet [Mon, 28 Nov 2016 13:35:31 +0000 (20:35 +0700)]
Replaced hardcoded environment values by appropriate define
Côme Chilliet [Mon, 28 Nov 2016 13:04:39 +0000 (20:04 +0700)]
Cleaned a bit flashing by using a function
Côme Chilliet [Mon, 28 Nov 2016 12:43:59 +0000 (19:43 +0700)]
Cleaned up handling of envsounds array through a function
Côme Chilliet [Mon, 28 Nov 2016 11:50:03 +0000 (18:50 +0700)]
Removed unused globals
Côme Chilliet [Mon, 28 Nov 2016 11:28:26 +0000 (18:28 +0700)]
Removed unused members of Person class
Côme Chilliet [Mon, 28 Nov 2016 11:03:55 +0000 (19:03 +0800)]
Added a constructor in Person class
For now it mostly put 0 in all members to avoid uninitialized int,
later it should put default values instead of GameTick.cpp
Neal Gompa [Sun, 27 Nov 2016 12:34:05 +0000 (07:34 -0500)]
CI: Remove use of copr for mingw-openal-soft
It's now part of the Fedora repositories
Côme Chilliet [Sat, 26 Nov 2016 14:35:56 +0000 (22:35 +0800)]
Switch to using «The Lean Mean C++ Option Parser»
Options now requires two dash before long option name.
Some option names were slightly changed, you can see all of them with "lugaru -h"
See http://optionparser.sourceforge.net/index.html for info on the parser used
Fixes #14
We may want to add a --debug option to avoid having to edit the
config.txt file for this?
Côme Chilliet [Sat, 26 Nov 2016 13:04:24 +0000 (21:04 +0800)]
Renamed OpenGL_Windows.cpp into main.cpp as it contains main()
Côme Chilliet [Sat, 26 Nov 2016 12:56:54 +0000 (20:56 +0800)]
Removed ctrl+q binding. All OS have their own binding for window closing.
Côme Chilliet [Sat, 26 Nov 2016 12:54:20 +0000 (20:54 +0800)]
Fixed #11 so that we can close the window while editing text
only small problem is that alt+enter will switch fullscreen and end
editing at the same time
Côme Chilliet [Sat, 26 Nov 2016 12:08:43 +0000 (20:08 +0800)]
Moved clothes loop to Person, got rid of globals tintr,tintg,tintb
Côme Chilliet [Sat, 26 Nov 2016 09:13:06 +0000 (17:13 +0800)]
Cleaned up a bit clothes adding
It would be even better to put the loop in Person class but the editor
code is a bit special and need to be adapted a tiny bit first
Côme Chilliet [Sat, 26 Nov 2016 08:57:38 +0000 (16:57 +0800)]
It makes no sense to use a player id as key for skinText
Côme Chilliet [Sat, 26 Nov 2016 08:47:44 +0000 (16:47 +0800)]
Got rid of global texture var. Calling load_image directly
Côme Chilliet [Sat, 26 Nov 2016 08:20:49 +0000 (16:20 +0800)]
Started to clean Texture/TextureRes by removing unused skindata and reloadAll methods
Côme Chilliet [Fri, 25 Nov 2016 14:55:51 +0000 (22:55 +0800)]
Removed commented out code
Côme Chilliet [Fri, 25 Nov 2016 13:55:53 +0000 (21:55 +0800)]
Removed unused local vars
Côme Chilliet [Fri, 25 Nov 2016 13:48:53 +0000 (21:48 +0800)]
Avoid using bool as int
Côme Chilliet [Fri, 25 Nov 2016 13:42:57 +0000 (21:42 +0800)]
Removed unused var
Côme Chilliet [Fri, 25 Nov 2016 13:40:44 +0000 (21:40 +0800)]
Fixed duplicated expressions in ifs
Côme Chilliet [Fri, 25 Nov 2016 12:19:04 +0000 (20:19 +0800)]
Cleaned up some code in Person.cpp
Côme Chilliet [Fri, 25 Nov 2016 05:57:51 +0000 (13:57 +0800)]
Added information gathered on some Person attributes
Côme Chilliet [Fri, 25 Nov 2016 05:41:54 +0000 (13:41 +0800)]
Refactored weapon taking in Person::takeWeapon
Côme Chilliet [Fri, 25 Nov 2016 05:20:29 +0000 (13:20 +0800)]
Refactor of weapon throwing in Weapon class. (named it thrown as throw is reserved keyword)
Côme Chilliet [Fri, 25 Nov 2016 05:08:46 +0000 (13:08 +0800)]
First refactoring of weapon dropping inside Weapon class
Next step are adding a similar throw() method in Weapon,
and then add drop and throw methods directly in Person.
Rémi Verschelde [Fri, 25 Nov 2016 06:56:25 +0000 (07:56 +0100)]
Add copyright notice and AUTHORS file for open source contributors
Fixes #24.
Côme Chilliet [Thu, 24 Nov 2016 16:12:59 +0000 (00:12 +0800)]
Got rid of unused "osx" global var
Côme Chilliet [Thu, 24 Nov 2016 16:04:30 +0000 (00:04 +0800)]
Cleaned up a bit OpenGL_Windows.cpp, avoid calling CleanUp twice after exceptions
Côme Chilliet [Thu, 24 Nov 2016 15:46:16 +0000 (23:46 +0800)]
Removed commented out code
Côme Chilliet [Thu, 24 Nov 2016 15:37:41 +0000 (23:37 +0800)]
Remove typedef bool -> Boolean, using standard bool instead
Côme Chilliet [Thu, 24 Nov 2016 15:33:37 +0000 (23:33 +0800)]
Moved image loading/saving in TGALoader and renamed it accordingly
Côme Chilliet [Thu, 24 Nov 2016 09:27:32 +0000 (17:27 +0800)]
First step at cleaning image loading.
Removed all weird pascal string stuff
Next step is to remove this texture global var, use load_image directly
and delete TGALoader.*
Côme Chilliet [Thu, 24 Nov 2016 08:52:52 +0000 (16:52 +0800)]
Removed obsolete PLATFORM_MACOSX code
Côme Chilliet [Thu, 24 Nov 2016 08:29:36 +0000 (16:29 +0800)]
Moved console commands in their own file to clean a bit GameTick.cpp
Côme Chilliet [Wed, 23 Nov 2016 17:12:27 +0000 (01:12 +0800)]
Removed most of the commented out code
Côme Chilliet [Wed, 23 Nov 2016 16:23:33 +0000 (00:23 +0800)]
Removed unused methods
Note: I left some unused methods just in case:
Input.cpp::CharToKey
Quaternions.cpp::Quat_Mult
Quaternions.cpp::To_Quat
Quaternions.cpp::Quat_2_Matrix
Quaternions.cpp::Quat_2_AA
Quaternions.cpp::Quat2Vector
Models.cpp::loadraw
Models.cpp::Translate
Sprite.cpp::clearTextures
GameTick.cpp::getEndX
GameTick.cpp::getEndY
pack.c::packf
pack.c::spackf
unpack.c::sunpackf
unpack.c::unpackf
Côme Chilliet [Wed, 23 Nov 2016 16:08:17 +0000 (00:08 +0800)]
Fixed lots of errors spotted by cppcheck
Côme Chilliet [Wed, 23 Nov 2016 14:53:38 +0000 (22:53 +0800)]
Fixed error spotted by cppcheck
Neal Gompa [Wed, 23 Nov 2016 14:43:15 +0000 (09:43 -0500)]
CI: Switch back to fedora:latest
We're done rolling... :)
Côme Chilliet [Tue, 22 Nov 2016 13:54:58 +0000 (21:54 +0800)]
Removed unused file and code
David Rosen [Mon, 21 Nov 2016 21:08:09 +0000 (13:08 -0800)]
Relicensing all Wolfire Lugaru assets to CC-BY-SA 3.0
Côme Chilliet [Mon, 21 Nov 2016 13:18:31 +0000 (21:18 +0800)]
Avoid using unitialized var in corner cases (fixes cppcheck warning)
Rémi Verschelde [Sun, 20 Nov 2016 22:16:31 +0000 (23:16 +0100)]
License: Update GPLv2+ header to match current FSF recommendation
Fixes the FSF address in COPYING.txt, and uses the FSF URL instead
of its address in the file headers.
Of course no license terms are changed, this is still GPL version 2
or later.
Rémi Verschelde [Sun, 20 Nov 2016 22:02:58 +0000 (23:02 +0100)]
Drop unnecessary USE_OPENAL and USE_SDL defines
Rémi Verschelde [Sun, 20 Nov 2016 21:55:15 +0000 (22:55 +0100)]
CMake: Drop LUGARU_INSTALL_PREFIX and clean CMakeLists
In the cleanup:
- Added section separators for clarity
- Enforced lower case commands with no space before parenthesis
Rémi Verschelde [Sun, 20 Nov 2016 21:23:11 +0000 (22:23 +0100)]
Add link to the website in the README
Côme Chilliet [Sun, 20 Nov 2016 17:13:49 +0000 (01:13 +0800)]
Fixed a lot of warnings
Côme Chilliet [Sun, 20 Nov 2016 15:50:22 +0000 (23:50 +0800)]
Ignoring parentheses warnings for now - too much of them it too messy code
Côme Chilliet [Sun, 20 Nov 2016 15:36:36 +0000 (23:36 +0800)]
Fixed some warnings
Rémi Verschelde [Sun, 20 Nov 2016 12:37:54 +0000 (13:37 +0100)]
Add detailed compilation instructions
Neal Gompa [Sun, 20 Nov 2016 12:01:20 +0000 (07:01 -0500)]
CI: Update inactive CI configurations to match current state