]> git.jsancho.org Git - lugaru.git/log
lugaru.git
8 years agoPurge thirdparty source files
Rémi Verschelde [Sun, 20 Nov 2016 08:52:14 +0000 (09:52 +0100)]
Purge thirdparty source files

Fixes #10.

8 years agoCMake: Purge all the bundled dependencies
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.

8 years agoMerge branch 'opt-fullscreen' into 'master'
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

8 years agoAdd an option to toggle fullscreen
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.

8 years agoFixed resolution detection and handling
Côme Chilliet [Sun, 20 Nov 2016 10:18:51 +0000 (18:18 +0800)]
Fixed resolution detection and handling

8 years agoCI: Disable AppVeyor
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.

8 years agoCMake: Install OpenAL DLL and docs
Rémi Verschelde [Sat, 19 Nov 2016 16:46:17 +0000 (17:46 +0100)]
CMake: Install OpenAL DLL and docs

8 years agoCMake: Install required DLLs when building with mingw
Rémi Verschelde [Sat, 19 Nov 2016 16:09:43 +0000 (17:09 +0100)]
CMake: Install required DLLs when building with mingw

8 years agoFixed nomousegrab option
Côme Chilliet [Sat, 19 Nov 2016 15:43:22 +0000 (23:43 +0800)]
Fixed nomousegrab option

Fixes #5

8 years agoCMake: Do not install no longer existent libraries
Neal Gompa [Sat, 19 Nov 2016 15:33:53 +0000 (10:33 -0500)]
CMake: Do not install no longer existent libraries

8 years agoDrop bundled OpenAL binaries
Rémi Verschelde [Sat, 19 Nov 2016 15:23:42 +0000 (16:23 +0100)]
Drop bundled OpenAL binaries

Fixes #9.

8 years agoCMake: Fix linking against system OpenAL via pkgconfig
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...

8 years agoCMake: Simplify RC compilation and fix indentation
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.

8 years agoFixes #12 Removed chatting code
Côme Chilliet [Sat, 19 Nov 2016 15:10:48 +0000 (23:10 +0800)]
Fixes #12 Removed chatting code

8 years agomingw: Temporarily disable glstubs logic to fix build
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".

8 years agoFix paths for OpenAL headers
Neal Gompa [Sat, 19 Nov 2016 01:50:08 +0000 (20:50 -0500)]
Fix paths for OpenAL headers

8 years agoOpenAL -> OPENAL
Neal Gompa [Sat, 19 Nov 2016 01:44:04 +0000 (20:44 -0500)]
OpenAL -> OPENAL

Maybe now it will find it...

8 years agoUse pkgconfig for cross-compiling to detect OpenAL
Neal Gompa [Sat, 19 Nov 2016 01:39:25 +0000 (20:39 -0500)]
Use pkgconfig for cross-compiling to detect OpenAL

8 years agoCI: Fix installing copr command, move it to mingw sections
Neal Gompa [Sat, 19 Nov 2016 01:26:52 +0000 (20:26 -0500)]
CI: Fix installing copr command, move it to mingw sections

8 years agoCI: Ensure dnf copr command is available
Neal Gompa [Sat, 19 Nov 2016 01:24:57 +0000 (20:24 -0500)]
CI: Ensure dnf copr command is available

8 years agoCI: Add COPR repo to provide OpenAL for MinGW builds
Neal Gompa [Sat, 19 Nov 2016 01:21:57 +0000 (20:21 -0500)]
CI: Add COPR repo to provide OpenAL for MinGW builds

8 years agoWinDefs: Do not redefine uintptr_t
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.

8 years agoCI: Switch to Fedora Rawhide for Linux builds
Neal Gompa [Sat, 19 Nov 2016 00:02:28 +0000 (19:02 -0500)]
CI: Switch to Fedora Rawhide for Linux builds

"Rolling, Rolling, Rolling........"

8 years agoSet CMP0004 policy to OLD
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.

8 years agoCMake: Use upstream SDL2 find_package
Rémi Verschelde [Fri, 18 Nov 2016 23:36:53 +0000 (00:36 +0100)]
CMake: Use upstream SDL2 find_package

Fixes linking on MinGW.

8 years agoWin32: Allow linking against system OpenGL (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.

8 years agoFix mingw32 build by dropping re- and undefs of core types
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.

8 years agoCI: Switch most of the libraries from internal to system for MinGW builds
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

8 years agoRevert "Remove superfluous explicit command for windres/rc"
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.

8 years agoMerge branch 'sdl2-rebase' into 'master'
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

8 years agoCI: Adapt to SDL2 migration
Rémi Verschelde [Fri, 18 Nov 2016 19:40:07 +0000 (20:40 +0100)]
CI: Adapt to SDL2 migration

8 years agoDeleted SDL 1.2 from Dependencies folder
Côme Chilliet [Fri, 18 Nov 2016 09:54:14 +0000 (17:54 +0800)]
Deleted SDL 1.2 from Dependencies folder

8 years agoMigrated to SDL2
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)

8 years agoFixed CMakeLists.txt identation
Côme Chilliet [Tue, 15 Nov 2016 10:27:51 +0000 (17:27 +0700)]
Fixed CMakeLists.txt identation

8 years agoPurge Xcode projects
Neal Gompa [Wed, 16 Nov 2016 13:28:27 +0000 (08:28 -0500)]
Purge Xcode projects

8 years agoCI: AppVeyor x86 -> Win32
Neal Gompa [Wed, 16 Nov 2016 12:59:34 +0000 (07:59 -0500)]
CI: AppVeyor x86 -> Win32

8 years agoCI: Set Debug configuration for AppVeyor
Neal Gompa [Wed, 16 Nov 2016 12:51:45 +0000 (07:51 -0500)]
CI: Set Debug configuration for AppVeyor

8 years agoCI: Fix .doozer.json buildcmd
Neal Gompa [Wed, 16 Nov 2016 12:49:16 +0000 (07:49 -0500)]
CI: Fix .doozer.json buildcmd

8 years agoCI: Add .doozer.json
Neal Gompa [Wed, 16 Nov 2016 12:43:54 +0000 (07:43 -0500)]
CI: Add .doozer.json

8 years agoGenerate debugging symbols with Debug configuration
Neal Gompa [Wed, 16 Nov 2016 12:21:23 +0000 (07:21 -0500)]
Generate debugging symbols with Debug configuration

8 years agoCI: Add target configuration setting for appveyor
Neal Gompa [Wed, 16 Nov 2016 12:20:46 +0000 (07:20 -0500)]
CI: Add target configuration setting for appveyor

8 years agoCI: Fix .appveyor.yml build section
Neal Gompa [Wed, 16 Nov 2016 12:07:46 +0000 (07:07 -0500)]
CI: Fix .appveyor.yml build section

8 years agoCI: We only have libraires for 32-bit MSVC builds, so remove 64-bit MSVC builds
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

8 years agoCI: Fix install prefix for appveyor cmake run
Neal Gompa [Tue, 15 Nov 2016 19:02:56 +0000 (14:02 -0500)]
CI: Fix install prefix for appveyor cmake run

8 years agoCI: Drop legacy msvc2005 files, add AppVeyor
Neal Gompa [Tue, 15 Nov 2016 18:48:48 +0000 (13:48 -0500)]
CI: Drop legacy msvc2005 files, add AppVeyor

8 years agoCI: Add mingw{32,64}-headers to build_mingw{32,64} targets
Neal Gompa [Tue, 15 Nov 2016 14:02:43 +0000 (09:02 -0500)]
CI: Add mingw{32,64}-headers to build_mingw{32,64} targets

8 years agoRemove superfluous explicit command for windres/rc
Neal Gompa [Tue, 15 Nov 2016 12:31:39 +0000 (07:31 -0500)]
Remove superfluous explicit command for windres/rc

CMake handles this properly now, as of CMake 3.5, and this
gives us the flexibility to properly start MinGW64 builds

8 years agoCI: Force internal OpenGL for MinGW
Neal Gompa [Mon, 14 Nov 2016 23:57:30 +0000 (18:57 -0500)]
CI: Force internal OpenGL for MinGW

8 years agoMerge branch 'fix-mingw32' into 'master'
Neal Gompa (ニール・ゴンパ) [Mon, 14 Nov 2016 23:06:22 +0000 (23:06 +0000)]
Merge branch 'fix-mingw32' into 'master'

Fix a first batch of mingw32 (gcc 6) compilation issues

Those fixes are mostly trial and error from someone with little experience with Windows compilers (especially getting things to work for both MinGW32 and MSVC), so there is likely room for improvement.

Part of #6.
Fixes #7.

See merge request !2

8 years agomingw32: Fix issues with WIN32 not being defined
Rémi Verschelde [Mon, 14 Nov 2016 21:45:53 +0000 (22:45 +0100)]
mingw32: Fix issues with WIN32 not being defined

Not sure if that is the proper fix, but it does the trick for my toolchain.
An alternative might be to do s/WIN32/_WIN32/g, but I lack experience here.

Also fixed abs() redefinitions that conflicted with mingw's cmath.

8 years agomingw32: Fix a couple build issues
Rémi Verschelde [Mon, 14 Nov 2016 21:34:19 +0000 (22:34 +0100)]
mingw32: Fix a couple build issues

- in libjpeg/jmorecfg.h:

error: conflicting declaration 'typedef short int UINT8'
error: conflicting declaration 'typedef unsigned int UINT16'

The fix used might break on MSVC, should be improved if need be.

- in OpenGL_Windows.cpp:

error: '_argc' was not declared in this scope
error: '_argv' was not declared in this scope

8 years agoAdd project links to the README
Rémi Verschelde [Mon, 14 Nov 2016 10:46:40 +0000 (10:46 +0000)]
Add project links to the README

8 years agoGameTick: add cmath include and _USE_MATH_DEFINES
Neal Gompa [Sun, 13 Nov 2016 22:32:35 +0000 (17:32 -0500)]
GameTick: add cmath include and _USE_MATH_DEFINES

8 years agoMerge branch 'readme' into 'master'
Neal Gompa (ニール・ゴンパ) [Sun, 13 Nov 2016 21:45:06 +0000 (21:45 +0000)]
Merge branch 'readme' into 'master'

Add a README.md with details on the project and repo

See merge request !1

8 years agoAdd a README.md with details on the project and repo
Rémi Verschelde [Sun, 13 Nov 2016 21:07:39 +0000 (22:07 +0100)]
Add a README.md with details on the project and repo

Also including a badge for the CI build results.

8 years agoAdd missing force internal command for OSX and refactor CI file
Neal Gompa [Sun, 13 Nov 2016 21:36:42 +0000 (16:36 -0500)]
Add missing force internal command for OSX and refactor CI file

8 years agoCI: Fixup for MinGW builds
Neal Gompa [Sun, 13 Nov 2016 21:30:55 +0000 (16:30 -0500)]
CI: Fixup for MinGW builds

8 years agoFix cross-compiling command and add CI clause for MinGW
Neal Gompa [Sun, 13 Nov 2016 21:09:23 +0000 (16:09 -0500)]
Fix cross-compiling command and add CI clause for MinGW

8 years agoCI: Add pkgconfig(libjpeg) dependency
Neal Gompa [Sun, 13 Nov 2016 20:43:16 +0000 (15:43 -0500)]
CI: Add pkgconfig(libjpeg) dependency

8 years agoCI: Add missing make install
Neal Gompa [Sun, 13 Nov 2016 20:38:45 +0000 (15:38 -0500)]
CI: Add missing make install

8 years agoAdd .gitlab-ci.yml for enabling GitLab CI
Neal Gompa [Sun, 13 Nov 2016 20:37:49 +0000 (15:37 -0500)]
Add .gitlab-ci.yml for enabling GitLab CI

8 years agoHg -> Git: Remove hg files and put git ones
Neal Gompa [Sun, 13 Nov 2016 19:53:35 +0000 (14:53 -0500)]
Hg -> Git: Remove hg files and put git ones

8 years agoLicense: Also list temple/World.png as texture from the Temple campaign
Rémi Verschelde [Sun, 13 Nov 2016 18:13:44 +0000 (19:13 +0100)]
License: Also list temple/World.png as texture from the Temple campaign

8 years agoReorder content licensing info for clarity
Rémi Verschelde [Tue, 8 Nov 2016 14:39:40 +0000 (15:39 +0100)]
Reorder content licensing info for clarity

9 years agoFix crash due to wrong iterator type
Rémi Verschelde [Wed, 22 Apr 2015 08:31:08 +0000 (10:31 +0200)]
Fix crash due to wrong iterator type

9 years agoAdd copyright header to Windows binary resource header file
Neal Gompa [Sun, 5 Apr 2015 17:14:21 +0000 (13:14 -0400)]
Add copyright header to Windows binary resource header file

9 years agoAdd copyright header to source files to match license for project
Neal Gompa [Sun, 5 Apr 2015 17:12:17 +0000 (13:12 -0400)]
Add copyright header to source files to match license for project

9 years agoHandle the case where the current campaign has been deleted since last game.
Côme BERNIGAUD [Tue, 17 Mar 2015 22:58:45 +0000 (23:58 +0100)]
Handle the case where the current campaign has been deleted since last game.
(or if it can’t be opened for some reason)

11 years agoRemoved numplayers (using Person::players.size() instead)
Côme BERNIGAUD [Sat, 13 Jul 2013 20:56:42 +0000 (22:56 +0200)]
Removed numplayers (using Person::players.size() instead)

11 years agoplayer replaced by Person::players which is a vector of shared_ptr.
Côme BERNIGAUD [Sat, 13 Jul 2013 20:14:36 +0000 (22:14 +0200)]
player replaced by Person::players which is a vector of shared_ptr.

victim being a shared_ptr might be a memory leak, we should consider using weak_ptr for victim.
Having players being pointers will allow polymorphism so we can have a Rabbit and a Wolf class.

11 years agofix a crash
sf17k [Tue, 16 Apr 2013 00:43:25 +0000 (20:43 -0400)]
fix a crash

11 years agomade convenience functions inlineable to avoid performance hit
sf17k [Mon, 15 Apr 2013 23:17:57 +0000 (19:17 -0400)]
made convenience functions inlineable to avoid performance hit

11 years agoCLEANED UP WHITESPACE
sf17k [Mon, 15 Apr 2013 02:28:24 +0000 (22:28 -0400)]
CLEANED UP WHITESPACE
and removed some useless comments

11 years agoFORMATTED IF STATEMENTS
sf17k [Mon, 15 Apr 2013 02:00:24 +0000 (22:00 -0400)]
FORMATTED IF STATEMENTS

11 years agoBEAUTIFIED ALL SOURCE CODE
sf17k [Mon, 15 Apr 2013 00:29:22 +0000 (20:29 -0400)]
BEAUTIFIED ALL SOURCE CODE
AStyle.exe --style=kr --pad-header --pad-oper *.c *.cpp *.h

11 years agocomments and cleanup
sf17k [Fri, 12 Apr 2013 01:59:03 +0000 (21:59 -0400)]
comments and cleanup

11 years agobeautified code
sf17k [Sun, 7 Apr 2013 08:51:52 +0000 (04:51 -0400)]
beautified code

11 years agoconvenience functions
sf17k [Sun, 7 Apr 2013 03:20:23 +0000 (23:20 -0400)]
convenience functions

11 years agoremove repetitive code
sf17k [Sun, 7 Apr 2013 02:57:40 +0000 (22:57 -0400)]
remove repetitive code

11 years agocomments and simplification
sf17k [Fri, 5 Apr 2013 23:49:50 +0000 (19:49 -0400)]
comments and simplification

11 years agoemploy convenience functions
sf17k [Fri, 5 Apr 2013 22:56:22 +0000 (18:56 -0400)]
employ convenience functions

11 years agoadded some comments
sf17k [Fri, 5 Apr 2013 19:52:30 +0000 (15:52 -0400)]
added some comments

11 years agoformatted if statements (Person.cpp)
sf17k [Thu, 4 Apr 2013 22:09:36 +0000 (18:09 -0400)]
formatted if statements (Person.cpp)

11 years agobeautified Person.cpp with AStyle
sf17k [Thu, 4 Apr 2013 21:08:47 +0000 (17:08 -0400)]
beautified Person.cpp with AStyle
astyle --style=kr --pad-header --pad-oper Person.cpp

11 years agooops should've used tabs in Person.h
sf17k [Thu, 4 Apr 2013 20:20:51 +0000 (16:20 -0400)]
oops should've used tabs in Person.h

12 years agorenames for readability
sf17k [Mon, 30 Jul 2012 05:46:44 +0000 (01:46 -0400)]
renames for readability
currentanimation -> animCurrent
targetanimation -> animTarget
currentframe -> frameCurrent
targetframe -> frameTarget

12 years agorename for readability
sf17k [Mon, 30 Jul 2012 04:35:39 +0000 (00:35 -0400)]
rename for readability
findDistancefast -> distsq
findDistancefastflat -> distsqflat

12 years agoclean up formatting in Person.h
sf17k [Mon, 30 Jul 2012 04:15:14 +0000 (00:15 -0400)]
clean up formatting in Person.h

12 years agosome findClosest* refactoring
sf17k [Mon, 30 Jul 2012 01:25:06 +0000 (21:25 -0400)]
some findClosest* refactoring

12 years agoget it to compile on my mingw setup
sf17k [Sat, 12 May 2012 05:38:33 +0000 (01:38 -0400)]
get it to compile on my mingw setup
gcc's float.h is missing _fpclass(). mingw's float.h should work but for some reason it wasn't being used. using math.h fixes the problem.
the linker was being passed .def files, so I removed those.

13 years agoSome debug about textures.
Côme BERNIGAUD [Fri, 19 Aug 2011 20:55:00 +0000 (22:55 +0200)]
Some debug about textures.
blackfur.png file from empire campaign is malformed, made me think there was a bug in png loading.

13 years agoadded alt+enter fullscreen toggle
sf17k [Wed, 8 Jun 2011 13:42:13 +0000 (09:42 -0400)]
added alt+enter fullscreen toggle

13 years agomajor refactor of texture system
sf17k [Wed, 8 Jun 2011 12:51:45 +0000 (08:51 -0400)]
major refactor of texture system

13 years agodon't use gluBuild2DMipmaps
sf17k [Sat, 4 Jun 2011 04:53:14 +0000 (00:53 -0400)]
don't use gluBuild2DMipmaps

13 years agooops, last commit fixed the wrong thing
sf17k [Fri, 3 Jun 2011 22:44:35 +0000 (18:44 -0400)]
oops, last commit fixed the wrong thing

13 years agofix one-pixel offset introduced in menu cleanup
sf17k [Fri, 3 Jun 2011 22:14:37 +0000 (18:14 -0400)]
fix one-pixel offset introduced in menu cleanup

13 years agoglDeleteTextures safely ignores zeroes
sf17k [Fri, 3 Jun 2011 19:57:10 +0000 (15:57 -0400)]
glDeleteTextures safely ignores zeroes

13 years agofixed bad resolution being saved to config on first run
sf17k [Mon, 30 May 2011 17:00:30 +0000 (13:00 -0400)]
fixed bad resolution being saved to config on first run

13 years agocleanup, renamed rotations to yaw/pitch
sf17k [Sun, 29 May 2011 19:26:28 +0000 (15:26 -0400)]
cleanup, renamed rotations to yaw/pitch

13 years agoadd include guard to Texture.h
sf17k [Sun, 29 May 2011 16:30:19 +0000 (12:30 -0400)]
add include guard to Texture.h