]> git.jsancho.org Git - lugaru.git/log
lugaru.git
7 years agoDevtools: Fix saving player proportions
Rémi Verschelde [Sat, 11 Feb 2017 16:01:47 +0000 (17:01 +0100)]
Devtools: Fix saving player proportions

Fixes #92.

7 years agoDevtools: Add clotheslist cmd and fix devkeys in console
Rémi Verschelde [Sat, 11 Feb 2017 14:28:38 +0000 (15:28 +0100)]
Devtools: Add clotheslist cmd and fix devkeys in console

The `clotheslist` and `clotheslistnear` can be used to list the
clothes (and their tint) of a player in the terminal.
The other fix prevents text input in the console from activating
devtools hotkeys (e.g. "p" placing a player).

7 years agoRename fur textures for clarity
Rémi Verschelde [Sat, 11 Feb 2017 14:26:30 +0000 (15:26 +0100)]
Rename fur textures for clarity

For now keeping FurBW2.jpg, Fur2.png and Fur.jpg which are
hardcoded into several maps. I will eventually get rid of them
as part of #91.

7 years agoImprove end texts for existing campaigns
Rémi Verschelde [Sat, 11 Feb 2017 12:35:46 +0000 (13:35 +0100)]
Improve end texts for existing campaigns

Made the end text left-aligned since the current system
does not allow proper centering of variable length lines.

Completes and closes #60.

7 years agoFixed Wolves damage tolerance which was broken by f38eb24f446b94d592d97b24b315bb44bed...
Côme Chilliet [Sun, 5 Feb 2017 21:48:49 +0000 (22:48 +0100)]
Fixed Wolves damage tolerance which was broken by f38eb24f446b94d592d97b24b315bb44bed7b12c

7 years agoMoved PersonType class to its own file
Côme Chilliet [Sun, 5 Feb 2017 21:31:01 +0000 (22:31 +0100)]
Moved PersonType class to its own file

7 years agoMoved more animation info to PersonType
Côme Chilliet [Sun, 5 Feb 2017 21:24:11 +0000 (22:24 +0100)]
Moved more animation info to PersonType

7 years agoMoved bloodText to PersonType
Côme Chilliet [Sun, 5 Feb 2017 21:10:29 +0000 (22:10 +0100)]
Moved bloodText to PersonType

7 years agoMoved creatures skins to PersonType class
Côme Chilliet [Sun, 5 Feb 2017 20:57:18 +0000 (21:57 +0100)]
Moved creatures skins to PersonType class

7 years agoMoved models paths to PersonType
Côme Chilliet [Sun, 5 Feb 2017 17:53:30 +0000 (18:53 +0100)]
Moved models paths to PersonType

7 years agoPut some sounds and animations information in creature types
Côme Chilliet [Sun, 5 Feb 2017 17:37:22 +0000 (18:37 +0100)]
Put some sounds and animations information in creature types

7 years agoFixed default command so that it does not make you giant
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

7 years agoMerge branch 'master' of gitlab.com:osslugaru/lugaru
Côme Chilliet [Fri, 3 Feb 2017 23:58:10 +0000 (00:58 +0100)]
Merge branch 'master' of gitlab.com:osslugaru/lugaru

7 years agoMoved proportions system in a PersonType class
Côme Chilliet [Fri, 3 Feb 2017 16:58:13 +0000 (17:58 +0100)]
Moved proportions system in a PersonType class

Still buggy

7 years agoDevtools: Fix scaling issue with creature type change
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).

7 years agoFixes #88 Fixed joints and muscles loading for an existing skeleton object
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

7 years agoEnhancements to devtools input processing code
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.

7 years agoGameTick: Move input processing to a dedicated method
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.

7 years agoThis should fix the segfault from #89
Côme Chilliet [Mon, 30 Jan 2017 18:13:08 +0000 (19:13 +0100)]
This should fix the segfault from #89

7 years agoFixed bindings or documentation to make sure both are consistent with each other
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

7 years agoFix feedback on prev commits from MCMic
Rémi Verschelde [Sun, 29 Jan 2017 22:47:50 +0000 (23:47 +0100)]
Fix feedback on prev commits from MCMic

7 years agoUpdate copyright year to 2017
Rémi Verschelde [Sat, 28 Jan 2017 21:18:27 +0000 (22:18 +0100)]
Update copyright year to 2017

7 years agoFix a few GCC5 and GCC6 warnings
Rémi Verschelde [Sat, 28 Jan 2017 21:14:01 +0000 (22:14 +0100)]
Fix a few GCC5 and GCC6 warnings

7 years agoSplit distribution stuff per platform
Rémi Verschelde [Sat, 28 Jan 2017 17:11:06 +0000 (18:11 +0100)]
Split distribution stuff per platform

7 years agoUnify platform-specific definitions and clean .rc file
Rémi Verschelde [Sat, 28 Jan 2017 16:20:52 +0000 (17:20 +0100)]
Unify platform-specific definitions and clean .rc file

7 years agoAI: Prevent division by 0 when enemy has no velocity
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.

7 years agoDialogs: Fix long lines overflowing the box
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.

7 years agoEmpire: Restore Ash's black fur as intended by the author
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.

7 years agoOutput version info to stdout and show in menu
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.

7 years agoCMake: Add version logic and make it generate Version.hpp
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.

7 years agoRemove bogus clothes paths from task15 and task18
Rémi Verschelde [Tue, 24 Jan 2017 07:56:02 +0000 (08:56 +0100)]
Remove bogus clothes paths from task15 and task18

7 years agoRemove occurences of All.png used as clothes
Rémi Verschelde [Mon, 23 Jan 2017 22:53:45 +0000 (23:53 +0100)]
Remove occurences of All.png used as clothes

Fixes #54.

7 years agoDevtools: Prevent clothes from saving invalid path
Rémi Verschelde [Mon, 23 Jan 2017 17:38:57 +0000 (18:38 +0100)]
Devtools: Prevent clothes from saving invalid path

Fixes #59.

7 years agoFixed invalid participant focus in svengrotto map (Fixes #79)
Côme Chilliet [Mon, 23 Jan 2017 17:24:09 +0000 (18:24 +0100)]
Fixed invalid participant focus in svengrotto map (Fixes #79)

7 years agoWorkaround GCC issue with mvt keys in tutorial
Rémi Verschelde [Mon, 23 Jan 2017 17:13:50 +0000 (18:13 +0100)]
Workaround GCC issue with mvt keys in tutorial

Fixes #64.

7 years agoReading the campaign end text from campaign file (see #60)
Côme Chilliet [Mon, 23 Jan 2017 17:11:13 +0000 (18:11 +0100)]
Reading the campaign end text from campaign file (see #60)

7 years agoFixes #40 Scores are now integers
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

7 years agoFixed search for closest ally or weapon
Côme Chilliet [Mon, 23 Jan 2017 16:18:33 +0000 (17:18 +0100)]
Fixed search for closest ally or weapon

7 years agoAdded braces to all statements with clang-tidy and ran clang-format again
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

7 years agoApplied clang-format on all files
Côme Chilliet [Mon, 9 Jan 2017 23:50:38 +0000 (00:50 +0100)]
Applied clang-format on all files

7 years agoAdded .clang-format file
Côme Chilliet [Mon, 9 Jan 2017 23:49:48 +0000 (00:49 +0100)]
Added .clang-format file

7 years agoFixed a few parentheses
Côme Chilliet [Mon, 9 Jan 2017 23:48:44 +0000 (00:48 +0100)]
Fixed a few parentheses

7 years agoReplaced patchobjects arrays by vectors, cleaned code a bit
Côme Chilliet [Sun, 8 Jan 2017 17:43:28 +0000 (18:43 +0100)]
Replaced patchobjects arrays by vectors, cleaned code a bit

7 years agoCleaned up Terrain::AddObject
Côme Chilliet [Sun, 8 Jan 2017 17:14:29 +0000 (18:14 +0100)]
Cleaned up Terrain::AddObject

7 years agoFix levels numbering in main.txt
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.

7 years agoAdded a helper for getting model triangle vertexes, mostly used in Decal for now.
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.

7 years agoFixes #74 Shadow glitch (was using decal.vertex instead of model.vertex)
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)

7 years agoFixed participantfocus value in a dialogue in sventemple to avoid crash
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

7 years agoCreating map saving folder if needed
Côme Chilliet [Fri, 6 Jan 2017 13:46:01 +0000 (14:46 +0100)]
Creating map saving folder if needed

7 years agoAdded .at usage to have clearer crash when dialogue contains invalid participant
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

7 years agoConsole: Return gracefully when loading missing level
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.

7 years agoRemoved unused defines, changed method names case
Côme Chilliet [Wed, 4 Jan 2017 17:34:32 +0000 (18:34 +0100)]
Removed unused defines, changed method names case

7 years agoChanged Weapon models and textures to be private
Côme Chilliet [Wed, 4 Jan 2017 14:02:01 +0000 (15:02 +0100)]
Changed Weapon models and textures to be private

7 years agoMoved Weapon model and texture loading in Weapon class
Côme Chilliet [Wed, 4 Jan 2017 14:00:53 +0000 (15:00 +0100)]
Moved Weapon model and texture loading in Weapon class

7 years agoUsing an enum for model type
Côme Chilliet [Wed, 4 Jan 2017 14:00:42 +0000 (15:00 +0100)]
Using an enum for model type

7 years agoRemoved unused members in Model class
Côme Chilliet [Wed, 4 Jan 2017 13:28:57 +0000 (14:28 +0100)]
Removed unused members in Model class

7 years agoRemoved unused method from Model class
Côme Chilliet [Wed, 4 Jan 2017 13:23:42 +0000 (14:23 +0100)]
Removed unused method from Model class

7 years agoUse a mono font for the console text
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.

7 years agoFixed bushes appearing above ground on first level loaded
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.

7 years agoAttempt at fixing LoadStuff calling logic
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

7 years agoFixed crashes due to trianglesNum having wrong type
Côme Chilliet [Mon, 2 Jan 2017 23:40:07 +0000 (00:40 +0100)]
Fixed crashes due to trianglesNum having wrong type

7 years agoReplaced a strcpy by strncpy
Côme Chilliet [Mon, 2 Jan 2017 16:25:18 +0000 (17:25 +0100)]
Replaced a strcpy by strncpy

7 years agoRemoved lots of unused code from Math folder, renamed Quaternion file to XYZ
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

7 years agoRefactored ugly ifs
Côme Chilliet [Mon, 2 Jan 2017 12:22:49 +0000 (13:22 +0100)]
Refactored ugly ifs

7 years agoReplaced Model::possible with a vector
Côme Chilliet [Mon, 2 Jan 2017 12:06:01 +0000 (13:06 +0100)]
Replaced Model::possible with a vector

7 years agoUsing initialization list in Muscle constructor
Côme Chilliet [Sun, 1 Jan 2017 23:40:39 +0000 (00:40 +0100)]
Using initialization list in Muscle constructor

7 years agoCleans up in Object class, factor duplicated code
Côme Chilliet [Sun, 1 Jan 2017 23:16:52 +0000 (00:16 +0100)]
Cleans up in Object class, factor duplicated code

7 years agoFixed warnings
Côme Chilliet [Sun, 1 Jan 2017 14:57:43 +0000 (15:57 +0100)]
Fixed warnings

7 years agoCI: Bump expiration limit to keep builds 14 days
Rémi Verschelde [Sat, 31 Dec 2016 20:09:33 +0000 (21:09 +0100)]
CI: Bump expiration limit to keep builds 14 days

7 years agoUsing a vector for Model triangles, moved facenormal inside triangles
Côme Chilliet [Fri, 23 Dec 2016 01:46:01 +0000 (02:46 +0100)]
Using a vector for Model triangles, moved facenormal inside triangles

7 years agoUsing the Decal class in Model as well
Côme Chilliet [Fri, 23 Dec 2016 01:13:19 +0000 (02:13 +0100)]
Using the Decal class in Model as well

7 years agoAdded an enum for decal type
Côme Chilliet [Fri, 23 Dec 2016 00:22:15 +0000 (01:22 +0100)]
Added an enum for decal type

7 years agoCleaned Terrain Decal handling
Côme Chilliet [Thu, 22 Dec 2016 23:44:28 +0000 (00:44 +0100)]
Cleaned Terrain Decal handling

7 years agoWindows: Remove disabled warnings unknown to MinGW
Rémi Verschelde [Thu, 22 Dec 2016 22:14:08 +0000 (23:14 +0100)]
Windows: Remove disabled warnings unknown to MinGW

7 years agoCampaigns: Fix number of levels in seventasks and main
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.

7 years agoSmall cleanups
Côme Chilliet [Thu, 22 Dec 2016 20:32:21 +0000 (21:32 +0100)]
Small cleanups

7 years agoFixed double set of velocity var
Côme Chilliet [Thu, 22 Dec 2016 20:15:45 +0000 (21:15 +0100)]
Fixed double set of velocity var

7 years agoAdded parenthesis to expression
Côme Chilliet [Thu, 22 Dec 2016 20:06:04 +0000 (21:06 +0100)]
Added parenthesis to expression

7 years agoFixed warnings, removed unused attributes, broken audio output setting, and so on
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

7 years agoFixing some warnings of cppcheck
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/

7 years agoFixing some warnings
Nicola Spanti (RyDroid) [Tue, 20 Dec 2016 00:02:04 +0000 (01:02 +0100)]
Fixing some warnings

7 years agoCleaned up a bit Tutorial::active ifs in Person
Côme Chilliet [Wed, 21 Dec 2016 13:18:58 +0000 (14:18 +0100)]
Cleaned up a bit Tutorial::active ifs in Person

7 years agoFix opacity for splintersprite and always-true condition
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.

7 years agoRemoved useless code in GameInitDispose
Côme Chilliet [Wed, 21 Dec 2016 09:19:16 +0000 (10:19 +0100)]
Removed useless code in GameInitDispose

7 years agoSettings: Fix string length for strncmp (again)
Rémi Verschelde [Tue, 20 Dec 2016 17:47:01 +0000 (18:47 +0100)]
Settings: Fix string length for strncmp (again)

7 years agodon't set same variable twice
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>
7 years agofix length for strncmp()
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>
7 years agoremove recurring checks
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>
7 years agoFixed methods signatures to fix build
Côme Chilliet [Mon, 19 Dec 2016 22:10:56 +0000 (23:10 +0100)]
Fixed methods signatures to fix build

7 years agoMoved doAI in Person class
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)

7 years agoCMake: Switch to --std=gnu++11 to fix builds with POWER
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.

7 years agoCleaned a bit mouse button shown names, added names for button 4 and 5.
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.

7 years agoFixes #62 fixed button names display
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

7 years agoCleaned up a bit Tutorial::DrawTextInfo
Côme Chilliet [Sat, 17 Dec 2016 19:34:37 +0000 (20:34 +0100)]
Cleaned up a bit Tutorial::DrawTextInfo

7 years agoRenamed method because DrawText is reserved on some windows build
Côme Chilliet [Sat, 17 Dec 2016 16:33:53 +0000 (17:33 +0100)]
Renamed method because DrawText is reserved on some windows build

7 years agoMoved visibleloading check inside LoadingScreen
Côme Chilliet [Fri, 16 Dec 2016 22:56:00 +0000 (23:56 +0100)]
Moved visibleloading check inside LoadingScreen

7 years agoMerged identical switch cases in Tutorial
Côme Chilliet [Fri, 16 Dec 2016 22:37:07 +0000 (23:37 +0100)]
Merged identical switch cases in Tutorial

7 years agoMoved things related to tutorial in new Tutorial class
Côme Chilliet [Fri, 16 Dec 2016 04:10:11 +0000 (11:10 +0700)]
Moved things related to tutorial in new Tutorial class

7 years agoAdd script to fix hardcoded strings in maps
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.

7 years agoCleaned up TextureRes lifecycle to make sure it’s destroyed by RAII
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