]>
git.jsancho.org Git - lugaru.git/log
Côme Chilliet [Sat, 4 Feb 2017 00:01:35 +0000 (01:01 +0100)]
Fixed default command so that it does not make you giant
Côme Chilliet [Fri, 3 Feb 2017 23:58:10 +0000 (00:58 +0100)]
Merge branch 'master' of gitlab.com:osslugaru/lugaru
Côme Chilliet [Fri, 3 Feb 2017 16:58:13 +0000 (17:58 +0100)]
Moved proportions system in a PersonType class
Still buggy
Rémi Verschelde [Wed, 1 Feb 2017 21:46:11 +0000 (22:46 +0100)]
Devtools: Fix scaling issue with creature type change
Now the `wolfie` command and the [Ctrl+]Alt+Shift+T command behave similarly
by making wolves 15% bigger than rabbits. The duplicate `wolfieisgod` command
was dropped, and the logic for the hotkey was simplified (it was bogus).
Côme Chilliet [Wed, 1 Feb 2017 18:39:13 +0000 (19:39 +0100)]
Fixes #88 Fixed joints and muscles loading for an existing skeleton object
Rémi Verschelde [Mon, 30 Jan 2017 07:28:56 +0000 (08:28 +0100)]
Enhancements to devtools input processing code
Changed key to modify player skin and type: [Shift+]Alt+T instead of
[Shift+]Alt+O which conflicted placing objects.
Changed key to restart challenge to Alt+K from Super+Z.
Apply fire to nearby player by default (Alt+F), to self with Shift mod.
Various code quality improvements.
Rémi Verschelde [Sun, 29 Jan 2017 14:08:42 +0000 (15:08 +0100)]
GameTick: Move input processing to a dedicated method
Gameplay-related input is still in the main Tick() though as it is
tightly coupled to the game logic.
Côme Chilliet [Mon, 30 Jan 2017 18:13:08 +0000 (19:13 +0100)]
This should fix the segfault from #89
Côme Chilliet [Mon, 30 Jan 2017 17:52:37 +0000 (18:52 +0100)]
Fixed bindings or documentation to make sure both are consistent with each other
Rémi Verschelde [Sun, 29 Jan 2017 22:47:50 +0000 (23:47 +0100)]
Fix feedback on prev commits from MCMic
Rémi Verschelde [Sat, 28 Jan 2017 21:18:27 +0000 (22:18 +0100)]
Update copyright year to 2017
Rémi Verschelde [Sat, 28 Jan 2017 21:14:01 +0000 (22:14 +0100)]
Fix a few GCC5 and GCC6 warnings
Rémi Verschelde [Sat, 28 Jan 2017 17:11:06 +0000 (18:11 +0100)]
Split distribution stuff per platform
Rémi Verschelde [Sat, 28 Jan 2017 16:20:52 +0000 (17:20 +0100)]
Unify platform-specific definitions and clean .rc file
Rémi Verschelde [Sat, 28 Jan 2017 14:26:00 +0000 (15:26 +0100)]
AI: Prevent division by 0 when enemy has no velocity
Fixes #45.
Rémi Verschelde [Sat, 28 Jan 2017 12:12:21 +0000 (13:12 +0100)]
Dialogs: Fix long lines overflowing the box
I just reduced their scale factor from 1.5 to 1.4, which seems to work fine.
Also took the opportunity to cleanup the string management while I was trying
to understand what the code does.
Fixes #86.
Rémi Verschelde [Wed, 25 Jan 2017 20:56:11 +0000 (21:56 +0100)]
Empire: Restore Ash's black fur as intended by the author
Fixes #84.
Rémi Verschelde [Tue, 24 Jan 2017 18:47:12 +0000 (19:47 +0100)]
Output version info to stdout and show in menu
Fixes #82.
Rémi Verschelde [Tue, 24 Jan 2017 18:34:09 +0000 (19:34 +0100)]
CMake: Add version logic and make it generate Version.hpp
Part of #82.
Rémi Verschelde [Tue, 24 Jan 2017 07:56:02 +0000 (08:56 +0100)]
Remove bogus clothes paths from task15 and task18
Rémi Verschelde [Mon, 23 Jan 2017 22:53:45 +0000 (23:53 +0100)]
Remove occurences of All.png used as clothes
Fixes #54.
Rémi Verschelde [Mon, 23 Jan 2017 17:38:57 +0000 (18:38 +0100)]
Devtools: Prevent clothes from saving invalid path
Fixes #59.
Côme Chilliet [Mon, 23 Jan 2017 17:24:09 +0000 (18:24 +0100)]
Fixed invalid participant focus in svengrotto map (Fixes #79)
Rémi Verschelde [Mon, 23 Jan 2017 17:13:50 +0000 (18:13 +0100)]
Workaround GCC issue with mvt keys in tutorial
Fixes #64.
Côme Chilliet [Mon, 23 Jan 2017 17:11:13 +0000 (18:11 +0100)]
Reading the campaign end text from campaign file (see #60)
Côme Chilliet [Mon, 23 Jan 2017 16:28:46 +0000 (17:28 +0100)]
Fixes #40 Scores are now integers
They are still stored as floats in save file to be backward compatible
Côme Chilliet [Mon, 23 Jan 2017 16:18:33 +0000 (17:18 +0100)]
Fixed search for closest ally or weapon
Côme Chilliet [Mon, 9 Jan 2017 23:52:57 +0000 (00:52 +0100)]
Added braces to all statements with clang-tidy and ran clang-format again
Côme Chilliet [Mon, 9 Jan 2017 23:50:38 +0000 (00:50 +0100)]
Applied clang-format on all files
Côme Chilliet [Mon, 9 Jan 2017 23:49:48 +0000 (00:49 +0100)]
Added .clang-format file
Côme Chilliet [Mon, 9 Jan 2017 23:48:44 +0000 (00:48 +0100)]
Fixed a few parentheses
Côme Chilliet [Sun, 8 Jan 2017 17:43:28 +0000 (18:43 +0100)]
Replaced patchobjects arrays by vectors, cleaned code a bit
Côme Chilliet [Sun, 8 Jan 2017 17:14:29 +0000 (18:14 +0100)]
Cleaned up Terrain::AddObject
Rémi Verschelde [Sun, 8 Jan 2017 14:54:17 +0000 (15:54 +0100)]
Fix levels numbering in main.txt
The numbers were offset by one due to the raidercamp between
Level 7 and Level 8, which had caused a bogus decrement of numlevels
causing crashes.
Fixes regression from
4343a4e3ad10d520d65dc537012440fc7077eeb0 .
Côme Chilliet [Sun, 8 Jan 2017 14:44:11 +0000 (15:44 +0100)]
Added a helper for getting model triangle vertexes, mostly used in Decal for now.
Côme Chilliet [Sun, 8 Jan 2017 14:11:26 +0000 (15:11 +0100)]
Fixes #74 Shadow glitch (was using decal.vertex instead of model.vertex)
Côme Chilliet [Fri, 6 Jan 2017 14:06:42 +0000 (15:06 +0100)]
Fixed participantfocus value in a dialogue in sventemple to avoid crash
Côme Chilliet [Fri, 6 Jan 2017 13:46:01 +0000 (14:46 +0100)]
Creating map saving folder if needed
Côme Chilliet [Fri, 6 Jan 2017 13:44:44 +0000 (14:44 +0100)]
Added .at usage to have clearer crash when dialogue contains invalid participant
Rémi Verschelde [Wed, 4 Jan 2017 17:28:04 +0000 (18:28 +0100)]
Console: Return gracefully when loading missing level
For this, implemented Folders::file_exists to check for the existence
of a given file, so that we can exit gracefully before raising a FileNotFound
exception which then closes the game.
The console and stderr both display an error message.
Part of #23.
Côme Chilliet [Wed, 4 Jan 2017 17:34:32 +0000 (18:34 +0100)]
Removed unused defines, changed method names case
Côme Chilliet [Wed, 4 Jan 2017 14:02:01 +0000 (15:02 +0100)]
Changed Weapon models and textures to be private
Côme Chilliet [Wed, 4 Jan 2017 14:00:53 +0000 (15:00 +0100)]
Moved Weapon model and texture loading in Weapon class
Côme Chilliet [Wed, 4 Jan 2017 14:00:42 +0000 (15:00 +0100)]
Using an enum for model type
Côme Chilliet [Wed, 4 Jan 2017 13:28:57 +0000 (14:28 +0100)]
Removed unused members in Model class
Côme Chilliet [Wed, 4 Jan 2017 13:23:42 +0000 (14:23 +0100)]
Removed unused method from Model class
Rémi Verschelde [Tue, 3 Jan 2017 22:18:58 +0000 (23:18 +0100)]
Use a mono font for the console text
This makes the console text more readable, as its case is quite important
and the original font uses small capital letters for lower case, which are
hard to read.
The font used is Libration Mono with height 32 and some antialiasing.
Bitmap font generated with CBFG. Liberation Mono is under the SIL Open
Font License version 1.1.
Part of #23.
Côme Chilliet [Tue, 3 Jan 2017 00:48:18 +0000 (01:48 +0100)]
Fixed bushes appearing above ground on first level loaded
This was because Setenvironment was done after objects loading,
and this is were terrain heightmap is built.
This might be related to the appearing inside a rock bug, not sure.
Côme Chilliet [Mon, 2 Jan 2017 23:56:55 +0000 (00:56 +0100)]
Attempt at fixing LoadStuff calling logic
I failed to have the inside rock bug after these changes but it might be luck
Côme Chilliet [Mon, 2 Jan 2017 23:40:07 +0000 (00:40 +0100)]
Fixed crashes due to trianglesNum having wrong type
Côme Chilliet [Mon, 2 Jan 2017 16:25:18 +0000 (17:25 +0100)]
Replaced a strcpy by strncpy
Côme Chilliet [Mon, 2 Jan 2017 16:15:26 +0000 (17:15 +0100)]
Removed lots of unused code from Math folder, renamed Quaternion file to XYZ
Côme Chilliet [Mon, 2 Jan 2017 12:22:49 +0000 (13:22 +0100)]
Refactored ugly ifs
Côme Chilliet [Mon, 2 Jan 2017 12:06:01 +0000 (13:06 +0100)]
Replaced Model::possible with a vector
Côme Chilliet [Sun, 1 Jan 2017 23:40:39 +0000 (00:40 +0100)]
Using initialization list in Muscle constructor
Côme Chilliet [Sun, 1 Jan 2017 23:16:52 +0000 (00:16 +0100)]
Cleans up in Object class, factor duplicated code
Côme Chilliet [Sun, 1 Jan 2017 14:57:43 +0000 (15:57 +0100)]
Fixed warnings
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.