]>
git.jsancho.org Git - lugaru.git/log
Côme Chilliet [Wed, 14 Dec 2016 16:04:01 +0000 (23:04 +0700)]
Cleaned up console printing code, replaced global displaytext by local vars in Menu
Côme Chilliet [Wed, 14 Dec 2016 15:45:35 +0000 (22:45 +0700)]
Cleaned up a bit Text class. Using glPrintOutlined everywhere.
Côme Chilliet [Wed, 14 Dec 2016 14:35:43 +0000 (21:35 +0700)]
Improved error reporting of screenshot saving, fixed screenshot path.
Côme Chilliet [Wed, 14 Dec 2016 14:28:00 +0000 (21:28 +0700)]
Removed useless STUBBED define
Neal Gompa [Wed, 14 Dec 2016 13:54:52 +0000 (08:54 -0500)]
CMake: Use correct path for Resources in app root for macOS
Neal Gompa [Wed, 14 Dec 2016 13:53:05 +0000 (08:53 -0500)]
CMake: Fix SDL2 detection for macOS
Côme Chilliet [Wed, 14 Dec 2016 08:06:30 +0000 (15:06 +0700)]
Added some security to avoid dividing by 0 if joints vector is empty
Côme Chilliet [Wed, 14 Dec 2016 07:41:51 +0000 (14:41 +0700)]
Call to static method should be static
Rémi Verschelde [Wed, 14 Dec 2016 07:23:07 +0000 (08:23 +0100)]
Seven Tasks: Revert task18 to unfixed version
Looks like dehardcoding the path to world.png broke it, I will have to
investigate deeper.
Rémi Verschelde [Wed, 14 Dec 2016 07:10:42 +0000 (08:10 +0100)]
Add modders to the credits file
Rémi Verschelde [Wed, 14 Dec 2016 07:05:06 +0000 (08:05 +0100)]
CMake: Decrease required version (3.0) and use pkgconfig to detect SDL2
Some distros (e.g. CentOS 7+EPEL) do not provide the sdl2-config.cmake file
necessary for `find_package`.
Others still provide CMake 3.0 which works just fine (at least for Linux
compilation).
Also install Seven Tasks readme.
Rémi Verschelde [Mon, 12 Dec 2016 21:04:24 +0000 (22:04 +0100)]
Seven Tasks: Fix hardcoded clothes paths
Still unfixed in task15, various references to:
:Data:Textures.png
Removing them requires removing the whole chunks about clothes
information, so it is a bit more involved.
Rémi Verschelde [Mon, 12 Dec 2016 20:49:29 +0000 (21:49 +0100)]
Add The Seven Tasks campaign by Philtron R./skraeling
It is licensed under CC-BY-SA 4.0 International with attribution to
Philtron R., as mentioned on the Lugaru forums:
> *Note:** This mod (campaign, maps and custom textures) is licensed under
> the Creative Commons Attribution - Share Alike license, version 4.0
> International (CC-BY-SA 4.0, https://creativecommons.org/licenses/by-sa/4.0/)
> Attributions can be made to "Philtron R.".
Permalink: https://web.archive.org/web/20161214063840/http://forums.wolfire.com/viewtopic.php?f=7&t=4633
Rémi Verschelde [Tue, 13 Dec 2016 20:03:39 +0000 (21:03 +0100)]
Fix GCC5 warnings (-Wsign-compare and -Wmaybe-uninitialized)
Rémi Verschelde [Tue, 13 Dec 2016 20:02:18 +0000 (21:02 +0100)]
Add original Temple readme and fix doc install
Rémi Verschelde [Tue, 13 Dec 2016 19:32:46 +0000 (20:32 +0100)]
Move some doc to Docs/ and apply folder naming scheme
Rémi Verschelde [Tue, 13 Dec 2016 18:42:39 +0000 (19:42 +0100)]
Add info for packagers and tweak Mac info
Also document previous commit.
Rémi Verschelde [Tue, 13 Dec 2016 18:12:36 +0000 (19:12 +0100)]
Save progress upon level completion
Fixes #47.
Also made Folder::getUserDataPath() inline, hope that's good style.
Rémi Verschelde [Tue, 13 Dec 2016 06:26:43 +0000 (07:26 +0100)]
Empire: Specify licensing in documentation
Also use permalink from the Wayback Machine for the Temple
license statement.
Also update release notes accordingly.
Rémi Verschelde [Mon, 12 Dec 2016 23:25:09 +0000 (00:25 +0100)]
Empire: Fix hardcoded clothes paths
There is only one path I did not fixed, as it triggered a weird texture
bug on the main character, Ash (as Ben had told me by email). It can be
fixed with sed to trigger the bug:
# :Data:Textures:blackfur.png / Textures/Fur2.jpg (fix)
sed -i 's/\x1b\x3a\x44\x61\x74\x61\x3a\x54\x65\x78\x74\x75\x72\x65\x73\x3a\x62\x6c\x61\x63\x6b\x66\x75\x72\x2e\x70\x6e\x67/\x11\x54\x65\x78\x74\x75\x72\x65\x73\x2f\x46\x75\x72\x32\x2e\x6a\x70\x67/g' Data/Maps/jendraz*
Rémi Verschelde [Mon, 12 Dec 2016 22:46:45 +0000 (23:46 +0100)]
Add the Lugaru: Empire campaign by Jendraz
It is licensed under CC-BY-SA 4.0 International with attribution to Jendraz,
as mentioned on the Lugaru forums:
> Note: This mod (campaign, maps and custom textures) is licensed under the
> Creative Commons Attribution - Share Alike license, version 4.0 International
> (CC-BY-SA 4.0, https://creativecommons.org/licenses/by-sa/4.0/)
> Attributions can be made to Jendraz.
Permalink: https://web.archive.org/web/20161213062036/http://forums.wolfire.com/viewtopic.php?f=7&t=3797
Rémi Verschelde [Mon, 12 Dec 2016 19:33:35 +0000 (20:33 +0100)]
Add release notes for upcoming 1.1 release
Fixes #19.
Côme Chilliet [Mon, 12 Dec 2016 17:12:12 +0000 (00:12 +0700)]
Got rid of char[] uses in GameDraw.cpp
Côme Chilliet [Mon, 12 Dec 2016 16:02:00 +0000 (23:02 +0700)]
Trying to avoid crashes in Weapon::DoStuff
Côme Chilliet [Mon, 12 Dec 2016 15:59:30 +0000 (22:59 +0700)]
Fixes #41 It was hard to click on the next campaign level when it’s above an old one
Rémi Verschelde [Sun, 11 Dec 2016 22:54:38 +0000 (23:54 +0100)]
Add self-made FurBW.jpg for Temple campaign
The furbw2.png file from the original mod was obviously a mix between
the Fur.jpg and Fur2.jpg of Lugaru, so I tried to redo it since furbw2.png
was sadly not licensed under CC-BY-SA 3.0.
The furwhite.png image was just the same as Fur.jpg, so I just changed
the hardcoded references to it.
Part of #26.
Rémi Verschelde [Sun, 11 Dec 2016 21:45:44 +0000 (22:45 +0100)]
Add self-made replacement for Temple Cl*.png assets
The original assets were not licensed CC-BY-SA 3.0 and thus not added here.
To redo them, I used the AR PL UKai TW font under the Arphic Public License
(https://www.freedesktop.org/wiki/Software/CJKUnifonts/Download/).
Note: the Chinese characters are flipped horizontally so that they appear
properly on the back of players.
Part of #26.
Neal Gompa [Sun, 11 Dec 2016 21:02:29 +0000 (16:02 -0500)]
Adjust macOS build information to new minimum OS version
Neal Gompa [Sun, 11 Dec 2016 20:49:30 +0000 (15:49 -0500)]
Drop _EXT suffix from various GL_TEXTURE_* names
Neal Gompa [Sun, 11 Dec 2016 20:36:10 +0000 (15:36 -0500)]
Add missing C standard library headers
Neal Gompa [Sun, 11 Dec 2016 20:16:14 +0000 (15:16 -0500)]
abs() -> fabs()
Neal Gompa [Sun, 11 Dec 2016 18:10:56 +0000 (13:10 -0500)]
Convert C-header includes to C++ variants in C++ files
Neal Gompa [Sun, 11 Dec 2016 17:53:33 +0000 (12:53 -0500)]
Remove usage of deprecated gl(Un)LockArraysEXT()
Neal Gompa [Sun, 11 Dec 2016 17:36:17 +0000 (12:36 -0500)]
Fix OpenGL and OpenAL header paths for macOS
Côme Chilliet [Sun, 11 Dec 2016 17:44:47 +0000 (00:44 +0700)]
Fixed a lot of GCC warnings
Rémi Verschelde [Sun, 11 Dec 2016 14:12:53 +0000 (15:12 +0100)]
Fix Lugaru.rc for previous header renaming
Rémi Verschelde [Sun, 11 Dec 2016 14:06:33 +0000 (15:06 +0100)]
Rename all C++ headers with .hpp extension
Also improve header inclusion to follow this logic:
- "Own" header comes first (`Folders.hpp` in `Folder.cpp`)
- Lugaru headers come next, in alphabetical order
- System headers come next, using the `<header>` format
Côme Chilliet [Sun, 11 Dec 2016 10:34:33 +0000 (17:34 +0700)]
Sorted all source files in folders
Côme Chilliet [Sun, 11 Dec 2016 09:21:48 +0000 (16:21 +0700)]
Stopped using Account pointers, and removed general difficulty setting (difficulty from account is always used)
Was supposed to be two separate commits, sorry I forgot :-/
Côme Chilliet [Sun, 11 Dec 2016 08:16:33 +0000 (15:16 +0700)]
Account active is now stored as an integer to avoid weird loops to find the right id
Côme Chilliet [Sun, 11 Dec 2016 08:03:38 +0000 (15:03 +0700)]
Replaced all uses of Account::active outside of Account by call to active() method
Côme Chilliet [Sun, 11 Dec 2016 07:58:43 +0000 (14:58 +0700)]
Removed all modifications of Account active from outside Account
Côme Chilliet [Sun, 11 Dec 2016 07:34:52 +0000 (14:34 +0700)]
Moved Account::active in Account class. Maybe it should be changed for a method and we only store its index instead of a pointer.
Rémi Verschelde [Sat, 10 Dec 2016 21:58:59 +0000 (22:58 +0100)]
Improve formatting of devtools docs
Milky [Sat, 10 Dec 2016 21:17:37 +0000 (14:17 -0700)]
Re-write of DEVTOOLS.txt
Rémi Verschelde [Sat, 10 Dec 2016 19:59:47 +0000 (20:59 +0100)]
Mention devtools option in man page
Rémi Verschelde [Sat, 10 Dec 2016 19:31:46 +0000 (20:31 +0100)]
Rename debug mode to dev tools
The new config is then "Devtools" and the command line option is
--devtools, -d.
Côme Chilliet [Sat, 10 Dec 2016 19:10:05 +0000 (02:10 +0700)]
Updating newdetail more often to avoid storing bad value, and added a newline at the end of the config file
Côme Chilliet [Sat, 10 Dec 2016 18:18:17 +0000 (01:18 +0700)]
Reading debug mode from config again, but command line option overrides it
Côme Chilliet [Sat, 10 Dec 2016 18:10:14 +0000 (01:10 +0700)]
Oops, should be ifdef not ifndef
Côme Chilliet [Sat, 10 Dec 2016 18:00:09 +0000 (01:00 +0700)]
Disabling exception catching when building debug, to ease gdb use
Côme Chilliet [Sat, 10 Dec 2016 17:57:04 +0000 (00:57 +0700)]
Attempt at fixing the crash in DoAnimation
Côme Chilliet [Sat, 10 Dec 2016 17:34:09 +0000 (00:34 +0700)]
Using at() instead of operator[] in currentFrame to get more precise crashes
Côme Chilliet [Sat, 10 Dec 2016 16:47:05 +0000 (23:47 +0700)]
Fixed a bug loading all persons with the same ID. I hope it will fix weapon problems
Côme Chilliet [Sat, 10 Dec 2016 15:21:13 +0000 (22:21 +0700)]
Oops, committed by mistake a temporary commenting of code
Rémi Verschelde [Sat, 10 Dec 2016 12:55:38 +0000 (13:55 +0100)]
Fix 7s offset between shown challenge time and high score
Also properly rounds the float time so that 26.89s does not end up as 26 but 27.
Côme Chilliet [Sat, 10 Dec 2016 10:53:49 +0000 (17:53 +0700)]
Removed useless Menu:: prefix, replaced uses of char by strings
Côme Chilliet [Sat, 10 Dec 2016 08:13:00 +0000 (15:13 +0700)]
Moved everything related to Menu is Menu.h,cpp and Campaign in Campaign.h,cpp
Côme Chilliet [Sat, 10 Dec 2016 07:13:40 +0000 (14:13 +0700)]
Replace MenuItem::init with a constructor
Côme Chilliet [Sat, 10 Dec 2016 07:08:25 +0000 (14:08 +0700)]
Changed namespace Menu for a class
Côme Chilliet [Sat, 10 Dec 2016 06:57:39 +0000 (13:57 +0700)]
Updated information in DEBUG-OPTIONS.txt
Alt+Y and alt+U are still undocumented.
Documentation about editor commands seems also inaccurate, and the code
seems buggy, shift+p will add a player AND a waypoint to this player it
seems to me.
Côme Chilliet [Sat, 10 Dec 2016 06:18:49 +0000 (13:18 +0700)]
Added a warning when loading a map with an old map version
Côme Chilliet [Sat, 10 Dec 2016 05:59:17 +0000 (12:59 +0700)]
Fix a crash when map contains a negative number of hotspots
Côme Chilliet [Sat, 10 Dec 2016 04:49:02 +0000 (11:49 +0700)]
Cleaned up a bit debug keys, ALT is always needed now except in editor.
Côme Chilliet [Sat, 10 Dec 2016 04:11:30 +0000 (11:11 +0700)]
Debug mode is now a comandline option
Rémi Verschelde [Fri, 9 Dec 2016 22:52:23 +0000 (23:52 +0100)]
Declare Tempanim animation properly
Fixes #36.
Rémi Verschelde [Fri, 9 Dec 2016 22:03:13 +0000 (23:03 +0100)]
CMake: Default to RelWithDebInfo build type when not specified
Also cosmetic changes.
Rémi Verschelde [Fri, 9 Dec 2016 21:32:32 +0000 (22:32 +0100)]
CMake: Fix missing data install on Windows
Regression from
4afbc86d0abd136357e88d8c1fe2360a119289e3
Côme Chilliet [Fri, 9 Dec 2016 18:14:42 +0000 (01:14 +0700)]
Added a class for Hotspots to avoid using several arrays
Côme Chilliet [Fri, 9 Dec 2016 17:32:46 +0000 (00:32 +0700)]
Removed empty destructors. Joint::label is a bodypart
Côme Chilliet [Fri, 9 Dec 2016 17:16:35 +0000 (00:16 +0700)]
Removed unused methods from Skeleton
Côme Chilliet [Fri, 9 Dec 2016 17:15:46 +0000 (00:15 +0700)]
Replaced muscles and joints in Skeleton by vectors
Côme Chilliet [Fri, 9 Dec 2016 16:53:45 +0000 (23:53 +0700)]
Got rid of malloc in Muscle
Côme Chilliet [Fri, 9 Dec 2016 16:13:00 +0000 (23:13 +0700)]
Moved Joint and Muscle classes to their own files
Côme Chilliet [Fri, 9 Dec 2016 11:27:48 +0000 (18:27 +0700)]
Using the right type for animation height and type
Côme Chilliet [Fri, 9 Dec 2016 11:04:34 +0000 (18:04 +0700)]
Added convenient method to get target and current frames of Person animations
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