]>
git.jsancho.org Git - lugaru.git/log
Rémi Verschelde [Sat, 31 Dec 2016 20:09:33 +0000 (21:09 +0100)]
CI: Bump expiration limit to keep builds 14 days
Côme Chilliet [Fri, 23 Dec 2016 01:46:01 +0000 (02:46 +0100)]
Using a vector for Model triangles, moved facenormal inside triangles
Côme Chilliet [Fri, 23 Dec 2016 01:13:19 +0000 (02:13 +0100)]
Using the Decal class in Model as well
Côme Chilliet [Fri, 23 Dec 2016 00:22:15 +0000 (01:22 +0100)]
Added an enum for decal type
Côme Chilliet [Thu, 22 Dec 2016 23:44:28 +0000 (00:44 +0100)]
Cleaned Terrain Decal handling
Rémi Verschelde [Thu, 22 Dec 2016 22:14:08 +0000 (23:14 +0100)]
Windows: Remove disabled warnings unknown to MinGW
Rémi Verschelde [Thu, 22 Dec 2016 21:34:39 +0000 (22:34 +0100)]
Campaigns: Fix number of levels in seventasks and main
The wrong number of levels announced for Seven Tasks caused a crash on
Win32. Fixes #70.
Also fixed the spelling for "NextLevel", though it did not seem to have
an influence on parsing.
Côme Chilliet [Thu, 22 Dec 2016 20:32:21 +0000 (21:32 +0100)]
Small cleanups
Côme Chilliet [Thu, 22 Dec 2016 20:15:45 +0000 (21:15 +0100)]
Fixed double set of velocity var
Côme Chilliet [Thu, 22 Dec 2016 20:06:04 +0000 (21:06 +0100)]
Added parenthesis to expression
Côme Chilliet [Thu, 22 Dec 2016 20:04:26 +0000 (21:04 +0100)]
Fixed warnings, removed unused attributes, broken audio output setting, and so on
Nicola Spanti (RyDroid) [Tue, 20 Dec 2016 00:26:42 +0000 (01:26 +0100)]
Fixing some warnings of cppcheck
cppcheck --quiet --enable=warning,style,performance,portability Source/
Nicola Spanti (RyDroid) [Tue, 20 Dec 2016 00:02:04 +0000 (01:02 +0100)]
Fixing some warnings
Côme Chilliet [Wed, 21 Dec 2016 13:18:58 +0000 (14:18 +0100)]
Cleaned up a bit Tutorial::active ifs in Person
Rémi Verschelde [Wed, 21 Dec 2016 10:57:23 +0000 (11:57 +0100)]
Fix opacity for splintersprite and always-true condition
As spotted by @ignatenkobrain in #69.
Côme Chilliet [Wed, 21 Dec 2016 09:19:16 +0000 (10:19 +0100)]
Removed useless code in GameInitDispose
Rémi Verschelde [Tue, 20 Dec 2016 17:47:01 +0000 (18:47 +0100)]
Settings: Fix string length for strncmp (again)
Igor Gnatenko [Tue, 20 Dec 2016 15:00:58 +0000 (16:00 +0100)]
don't set same variable twice
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Igor Gnatenko [Tue, 20 Dec 2016 14:49:23 +0000 (15:49 +0100)]
fix length for strncmp()
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Igor Gnatenko [Tue, 20 Dec 2016 14:26:35 +0000 (15:26 +0100)]
remove recurring checks
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Côme Chilliet [Mon, 19 Dec 2016 22:10:56 +0000 (23:10 +0100)]
Fixed methods signatures to fix build
Côme Chilliet [Mon, 19 Dec 2016 22:03:27 +0000 (23:03 +0100)]
Moved doAI in Person class
Had to change weapons[i] for weapons[k) which might change behavior,
test needed. (but weapons[i] is bogus anyway, i was a person id)
Neal Gompa [Mon, 19 Dec 2016 18:30:13 +0000 (13:30 -0500)]
CMake: Switch to --std=gnu++11 to fix builds with POWER
On POWER architectures (ppc64/ppc64le), the AltiVec SIMD instructions
overload bool with vector ints, causing builds to fail because vector
data cannot be cast to scalar data. However, this only happens on c++11
mode. In gnu+11 mode, the usage of AltiVec overload attributes is
contextual, so it doesn't cause builds to fail anymore.
Côme Chilliet [Sat, 17 Dec 2016 20:22:15 +0000 (21:22 +0100)]
Cleaned a bit mouse button shown names, added names for button 4 and 5.
Côme Chilliet [Sat, 17 Dec 2016 19:42:12 +0000 (20:42 +0100)]
Fixes #62 fixed button names display
Note that this cause problem because of the incomplete font we use:
I mapped the key «é» to draw weapon and it can’t be shown in the menu.
We should switch to a more complete font
Côme Chilliet [Sat, 17 Dec 2016 19:34:37 +0000 (20:34 +0100)]
Cleaned up a bit Tutorial::DrawTextInfo
Côme Chilliet [Sat, 17 Dec 2016 16:33:53 +0000 (17:33 +0100)]
Renamed method because DrawText is reserved on some windows build
Côme Chilliet [Fri, 16 Dec 2016 22:56:00 +0000 (23:56 +0100)]
Moved visibleloading check inside LoadingScreen
Côme Chilliet [Fri, 16 Dec 2016 22:37:07 +0000 (23:37 +0100)]
Merged identical switch cases in Tutorial
Côme Chilliet [Fri, 16 Dec 2016 04:10:11 +0000 (11:10 +0700)]
Moved things related to tutorial in new Tutorial class
Rémi Verschelde [Fri, 16 Dec 2016 15:16:23 +0000 (16:16 +0100)]
Add script to fix hardcoded strings in maps
Usage instructions in the script.
Côme Chilliet [Thu, 15 Dec 2016 13:51:01 +0000 (20:51 +0700)]
Cleaned up TextureRes lifecycle to make sure it’s destroyed by RAII
Côme Chilliet [Thu, 15 Dec 2016 13:35:48 +0000 (20:35 +0700)]
Ditched unused private list in TextureRes
Côme Chilliet [Thu, 15 Dec 2016 13:22:57 +0000 (20:22 +0700)]
Object type is now an enum
Côme Chilliet [Thu, 15 Dec 2016 13:08:31 +0000 (20:08 +0700)]
Moved checkcollide methods in Object
Côme Chilliet [Thu, 15 Dec 2016 11:14:34 +0000 (18:14 +0700)]
Cleaned up checkcollide methods
Côme Chilliet [Thu, 15 Dec 2016 11:08:21 +0000 (18:08 +0700)]
Removed forgotten debug output
Côme Chilliet [Thu, 15 Dec 2016 11:07:22 +0000 (18:07 +0700)]
Removed unused method Checkcollide
Côme Chilliet [Wed, 14 Dec 2016 18:40:07 +0000 (01:40 +0700)]
Cleaned up Objects handling
Checkcollide in Object is unused.
Game::checkcollide is used instead, it should be cleaned and moved to
Object class.
Côme Chilliet [Wed, 14 Dec 2016 16:32:19 +0000 (23:32 +0700)]
Deleted duplicated unused method
Côme Chilliet [Wed, 14 Dec 2016 16:20:00 +0000 (23:20 +0700)]
Fixed a few ifs
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