]>
git.jsancho.org Git - lugaru.git/log
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
Rémi Verschelde [Sun, 20 Nov 2016 12:01:59 +0000 (13:01 +0100)]
Fix creating a Screenshots folder in bindir on Unix
Also enhanced the code style a bit.
Fixes #4.
Rémi Verschelde [Sun, 20 Nov 2016 11:47:53 +0000 (12:47 +0100)]
Bump details to high level and enable motion blur
This is 2016 :)
Rémi Verschelde [Sun, 20 Nov 2016 11:23:18 +0000 (12:23 +0100)]
Set default resolution to 1024x768
Nowadays it is a saner default than 640x480.
Part of #15.
Neal Gompa (ニール・ゴンパ) [Sun, 20 Nov 2016 11:33:51 +0000 (11:33 +0000)]
Merge branch 'unbundle-the-world-better' into 'master'
Purge all the bundled libraries (including the obsolete GL headers)
Supersedes !5.
See merge request !6
Rémi Verschelde [Sun, 20 Nov 2016 08:52:14 +0000 (09:52 +0100)]
Purge thirdparty source files
Fixes #10.
Neal Gompa [Sun, 20 Nov 2016 08:51:45 +0000 (09:51 +0100)]
CMake: Purge all the bundled dependencies
The actual thirdparty files will be removed in the next commit.
Neal Gompa (ニール・ゴンパ) [Sun, 20 Nov 2016 11:23:01 +0000 (11:23 +0000)]
Merge branch 'opt-fullscreen' into 'master'
Option to toggle fullscreen
Adds a command line switch, saved config option and option menu entry to toggle fullscreen. It also defaults to windowed mode.
Also toggling fullscreen on does not play well with the mouse pointer (it disappears), but the same happens with Alt+Return, so it's not a regression.
Part of #15.
See merge request !4
Rémi Verschelde [Sat, 19 Nov 2016 22:41:28 +0000 (23:41 +0100)]
Add an option to toggle fullscreen
Adds a command line switch, saved config option and option menu entry to
toggle fullscreen.
Also defaults to windowed mode.
Côme Chilliet [Sun, 20 Nov 2016 10:18:51 +0000 (18:18 +0800)]
Fixed resolution detection and handling
Neal Gompa [Sat, 19 Nov 2016 22:42:12 +0000 (17:42 -0500)]
CI: Disable AppVeyor
Unfortunately, we cannot get MSVC builds working at this time.
When the time comes, we'll re-enable it.
Rémi Verschelde [Sat, 19 Nov 2016 16:46:17 +0000 (17:46 +0100)]
CMake: Install OpenAL DLL and docs
Rémi Verschelde [Sat, 19 Nov 2016 16:09:43 +0000 (17:09 +0100)]
CMake: Install required DLLs when building with mingw
Côme Chilliet [Sat, 19 Nov 2016 15:43:22 +0000 (23:43 +0800)]
Fixed nomousegrab option
Fixes #5
Neal Gompa [Sat, 19 Nov 2016 15:33:53 +0000 (10:33 -0500)]
CMake: Do not install no longer existent libraries
Rémi Verschelde [Sat, 19 Nov 2016 15:23:42 +0000 (16:23 +0100)]
Drop bundled OpenAL binaries
Fixes #9.
Rémi Verschelde [Sat, 19 Nov 2016 15:13:30 +0000 (16:13 +0100)]
CMake: Fix linking against system OpenAL via pkgconfig
The pkgconfig check yields OPENAL_LIBRARIES, the other gives
OPENAL_LIBRARY...
Rémi Verschelde [Sat, 19 Nov 2016 15:02:36 +0000 (16:02 +0100)]
CMake: Simplify RC compilation and fix indentation
Should work with MinGW both on Windows and on Linux.
For MSVC, it might work too unless it breaks on the `-i` arg,
but we will handle it then in a cleaner way.
Côme Chilliet [Sat, 19 Nov 2016 15:10:48 +0000 (23:10 +0800)]
Fixes #12 Removed chatting code
Rémi Verschelde [Sat, 19 Nov 2016 14:34:45 +0000 (15:34 +0100)]
mingw: Temporarily disable glstubs logic to fix build
Works around #8, but we lose the functionality to lookup the gl symbols
that we need on mingw. Also, I have no clue about the disabled pglDeleteTextures
"cheat".
Neal Gompa [Sat, 19 Nov 2016 01:50:08 +0000 (20:50 -0500)]
Fix paths for OpenAL headers
Neal Gompa [Sat, 19 Nov 2016 01:44:04 +0000 (20:44 -0500)]
OpenAL -> OPENAL
Maybe now it will find it...
Neal Gompa [Sat, 19 Nov 2016 01:39:25 +0000 (20:39 -0500)]
Use pkgconfig for cross-compiling to detect OpenAL
Neal Gompa [Sat, 19 Nov 2016 01:26:52 +0000 (20:26 -0500)]
CI: Fix installing copr command, move it to mingw sections
Neal Gompa [Sat, 19 Nov 2016 01:24:57 +0000 (20:24 -0500)]
CI: Ensure dnf copr command is available
Neal Gompa [Sat, 19 Nov 2016 01:21:57 +0000 (20:21 -0500)]
CI: Add COPR repo to provide OpenAL for MinGW builds
Rémi Verschelde [Sat, 19 Nov 2016 00:13:00 +0000 (01:13 +0100)]
WinDefs: Do not redefine uintptr_t
Fixes build with mingw64. mingw32 still builds fine.
The typedef might have been needed for MSVC, if so we will
readd it with a proper conditional.
Neal Gompa [Sat, 19 Nov 2016 00:02:28 +0000 (19:02 -0500)]
CI: Switch to Fedora Rawhide for Linux builds
"Rolling, Rolling, Rolling........"
Neal Gompa [Fri, 18 Nov 2016 23:42:26 +0000 (18:42 -0500)]
Set CMP0004 policy to OLD
This means CMake will silently strip leading and trailing whitespace
returned in variables used for defining link libraries.
This is necessary because SDL2's config file returns trailing whitespaces
in variables.
Rémi Verschelde [Fri, 18 Nov 2016 23:36:53 +0000 (00:36 +0100)]
CMake: Use upstream SDL2 find_package
Fixes linking on MinGW.
Rémi Verschelde [Fri, 18 Nov 2016 22:43:34 +0000 (23:43 +0100)]
Win32: Allow linking against system OpenGL (mingw)
Also "fix" detection of system OpenAL on Windows.
Rémi Verschelde [Fri, 18 Nov 2016 22:07:15 +0000 (23:07 +0100)]
Fix mingw32 build by dropping re- and undefs of core types
That simplifies the code and it seems to solve build issues with jpeglib.
The mingw32 build still fails at the linking step (GL issue), but that's
better already.
Neal Gompa [Fri, 18 Nov 2016 20:25:39 +0000 (15:25 -0500)]
CI: Switch most of the libraries from internal to system for MinGW builds
Neal Gompa [Fri, 18 Nov 2016 20:09:14 +0000 (15:09 -0500)]
Revert "Remove superfluous explicit command for windres/rc"
For the moment, we're going back to the old way for supporting
the cross-compiler. However, we're still going to depend on
CMake 3.5 or newer for other features.
This partially reverts commit
4df6d827a1a3837142051de155083a3e36409959 .
Neal Gompa (ニール・ゴンパ) [Fri, 18 Nov 2016 19:54:49 +0000 (19:54 +0000)]
Merge branch 'sdl2-rebase' into 'master'
SDL2 migration
This branch contains the new code based on SDL2.
Some notes:
* Resolution detection code seems dubious and should be reworked
* I put the 60FPS code snippet found in the official SDL2 patch but I’m not sure what it does and how.
* Mousegrab needs to be fixed
* The format for key bindings in config.txt changed.
* All key detection is now based on scancodes and this may reveal unlogical under layout other than qwerty for things like meta+q, meta+g, and the debug keys.
This is intended to fix #2
See merge request !3
Rémi Verschelde [Fri, 18 Nov 2016 19:40:07 +0000 (20:40 +0100)]
CI: Adapt to SDL2 migration
Côme Chilliet [Fri, 18 Nov 2016 09:54:14 +0000 (17:54 +0800)]
Deleted SDL 1.2 from Dependencies folder
Côme Chilliet [Fri, 18 Nov 2016 09:51:39 +0000 (17:51 +0800)]
Migrated to SDL2
Option "nomousegrab" seems broken
We might want to go back to keycode instead of scancode for some stuff
(debug keys maybe, things like q or g which have a meaning linked to the
letter itself)
The resolutions detection code seems buggy and should be redone
While editing a new user name or any other field, events like SDL_QUIT
are ignored (will open an issue about that)
Côme Chilliet [Tue, 15 Nov 2016 10:27:51 +0000 (17:27 +0700)]
Fixed CMakeLists.txt identation
Neal Gompa [Wed, 16 Nov 2016 13:28:27 +0000 (08:28 -0500)]
Purge Xcode projects
Neal Gompa [Wed, 16 Nov 2016 12:59:34 +0000 (07:59 -0500)]
CI: AppVeyor x86 -> Win32
Neal Gompa [Wed, 16 Nov 2016 12:51:45 +0000 (07:51 -0500)]
CI: Set Debug configuration for AppVeyor
Neal Gompa [Wed, 16 Nov 2016 12:49:16 +0000 (07:49 -0500)]
CI: Fix .doozer.json buildcmd
Neal Gompa [Wed, 16 Nov 2016 12:43:54 +0000 (07:43 -0500)]
CI: Add .doozer.json
Neal Gompa [Wed, 16 Nov 2016 12:21:23 +0000 (07:21 -0500)]
Generate debugging symbols with Debug configuration
Neal Gompa [Wed, 16 Nov 2016 12:20:46 +0000 (07:20 -0500)]
CI: Add target configuration setting for appveyor
Neal Gompa [Wed, 16 Nov 2016 12:07:46 +0000 (07:07 -0500)]
CI: Fix .appveyor.yml build section
Neal Gompa [Tue, 15 Nov 2016 19:05:42 +0000 (14:05 -0500)]
CI: We only have libraires for 32-bit MSVC builds, so remove 64-bit MSVC builds
Neal Gompa [Tue, 15 Nov 2016 19:02:56 +0000 (14:02 -0500)]
CI: Fix install prefix for appveyor cmake run