]> git.jsancho.org Git - lugaru.git/log
lugaru.git
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

13 years agomajor refactor of menu system, part 2
sf17k [Sun, 29 May 2011 16:27:39 +0000 (12:27 -0400)]
major refactor of menu system, part 2

13 years agoconvert Game class to namespace
sf17k [Sun, 29 May 2011 06:55:36 +0000 (02:55 -0400)]
convert Game class to namespace

13 years agominor changes in menu system
sf17k [Sun, 29 May 2011 03:29:52 +0000 (23:29 -0400)]
minor changes in menu system

13 years agomajor refactor of menu system, part 1
sf17k [Thu, 26 May 2011 20:20:17 +0000 (16:20 -0400)]
major refactor of menu system, part 1

13 years agomerge
Côme BERNIGAUD [Fri, 20 May 2011 08:07:56 +0000 (10:07 +0200)]
merge

13 years agosupressed a done TODO
Côme BERNIGAUD [Fri, 20 May 2011 08:01:11 +0000 (10:01 +0200)]
supressed a done TODO

13 years agoFixup shipped config
Alexander Monakov [Thu, 19 May 2011 07:32:38 +0000 (11:32 +0400)]
Fixup shipped config

13 years agofixed menu clicks carrying over
sf17k [Thu, 19 May 2011 07:30:04 +0000 (11:30 +0400)]
fixed menu clicks carrying over

13 years agoMerge with p/lugaru
Alexander Monakov [Thu, 19 May 2011 07:11:43 +0000 (11:11 +0400)]
Merge with p/lugaru

13 years agoSome refactor about Person class.
Côme BERNIGAUD [Wed, 18 May 2011 20:56:21 +0000 (22:56 +0200)]
Some refactor about Person class.

13 years agoAdded tag stableRC1 for changeset c3d5e4ac8224
Côme BERNIGAUD [Wed, 18 May 2011 20:55:29 +0000 (22:55 +0200)]
Added tag stableRC1 for changeset c3d5e4ac8224

13 years agobugfix about the console
Côme BERNIGAUD [Wed, 18 May 2011 20:08:49 +0000 (22:08 +0200)]
bugfix about the console

13 years agofixed some unwanted debug output
Côme BERNIGAUD [Wed, 18 May 2011 18:30:03 +0000 (20:30 +0200)]
fixed some unwanted debug output

13 years agoconsole commands works again.
Côme BERNIGAUD [Wed, 18 May 2011 17:44:33 +0000 (19:44 +0200)]
console commands works again.

13 years agoThe console key is now easy to configure. (the option will only be shown in debug...
Côme BERNIGAUD [Wed, 18 May 2011 15:20:42 +0000 (17:20 +0200)]
The console key is now easy to configure. (the option will only be shown in debug mode)

13 years agoadding missing source files
Côme BERNIGAUD [Wed, 18 May 2011 13:44:44 +0000 (15:44 +0200)]
adding missing source files

13 years agoadded a missing texture (the world image for temple campaign)
Côme BERNIGAUD [Wed, 18 May 2011 13:43:58 +0000 (15:43 +0200)]
added a missing texture (the world image for temple campaign)

13 years agoRefactor of the texture system
Côme BERNIGAUD [Tue, 17 May 2011 08:58:51 +0000 (10:58 +0200)]
Refactor of the texture system

13 years agorenaming some maps to be coherent.
Côme BERNIGAUD [Mon, 16 May 2011 15:42:40 +0000 (17:42 +0200)]
renaming some maps to be coherent.

13 years agobugfix about weapons
Côme BERNIGAUD [Mon, 16 May 2011 01:49:03 +0000 (03:49 +0200)]
bugfix about weapons

13 years agobug fix about pause menu
Côme BERNIGAUD [Sun, 15 May 2011 17:03:08 +0000 (19:03 +0200)]
bug fix about pause menu

13 years agoAdded a instruction file for compilation.
Côme BERNIGAUD [Sun, 15 May 2011 11:43:59 +0000 (13:43 +0200)]
Added a instruction file for compilation.

13 years agoA lot of clean up in MenuDraw.
Côme BERNIGAUD [Sat, 14 May 2011 23:43:54 +0000 (01:43 +0200)]
A lot of clean up in MenuDraw.

13 years agocleanup of campaign levels handling.
Côme BERNIGAUD [Sat, 14 May 2011 14:01:18 +0000 (16:01 +0200)]
cleanup of campaign levels handling.

13 years agolittle cleanup about campaign level handling
Côme BERNIGAUD [Sat, 14 May 2011 04:08:23 +0000 (06:08 +0200)]
little cleanup about campaign level handling

13 years agobugfix (world texture was messed when fullscreen/windowed switch) and cleanups
Côme BERNIGAUD [Fri, 13 May 2011 16:58:19 +0000 (18:58 +0200)]
bugfix (world texture was messed when fullscreen/windowed switch) and cleanups

13 years agoSome cleans, fullscreen is back if "--windowed" isn't passed as option.
Côme BERNIGAUD [Fri, 13 May 2011 16:33:39 +0000 (18:33 +0200)]
Some cleans, fullscreen is back if "--windowed" isn't passed as option.

13 years agosome small cleanups
Côme BERNIGAUD [Fri, 13 May 2011 15:47:18 +0000 (17:47 +0200)]
some small cleanups

13 years agobug fix from weapon clean up
Côme BERNIGAUD [Fri, 13 May 2011 15:32:19 +0000 (17:32 +0200)]
bug fix from weapon clean up

13 years agoWeapon clean up.
Côme BERNIGAUD [Fri, 13 May 2011 15:00:35 +0000 (17:00 +0200)]
Weapon clean up.

13 years agobug fix in the campaign screen (lines on the map were not correctly shown)
Côme BERNIGAUD [Fri, 13 May 2011 10:55:26 +0000 (12:55 +0200)]
bug fix in the campaign screen (lines on the map were not correctly shown)

13 years agomerge
Côme BERNIGAUD [Thu, 12 May 2011 17:44:21 +0000 (19:44 +0200)]
merge

13 years agoremoving a debug cout
Côme BERNIGAUD [Thu, 12 May 2011 17:43:57 +0000 (19:43 +0200)]
removing a debug cout

13 years agoSome bug fixes. Now the game remember which campaign you were playing last time.
Côme BERNIGAUD [Thu, 12 May 2011 16:22:06 +0000 (18:22 +0200)]
Some bug fixes. Now the game remember which campaign you were playing last time.

13 years agoupdated xcode project
sf17k [Thu, 12 May 2011 09:46:55 +0000 (05:46 -0400)]
updated xcode project

13 years agoI had added the wrong maps, not it works better
Côme BERNIGAUD [Thu, 12 May 2011 07:35:57 +0000 (09:35 +0200)]
I had added the wrong maps, not it works better

13 years agoAdding the temple campaign so we can test multiple campaigns features.
Côme BERNIGAUD [Wed, 11 May 2011 23:33:44 +0000 (01:33 +0200)]
Adding the temple campaign so we can test multiple campaigns features.

13 years agoThe game now supports multiple campaigns!
Côme BERNIGAUD [Wed, 11 May 2011 19:25:08 +0000 (21:25 +0200)]
The game now supports multiple campaigns!

13 years agoNo more black background for the map, some little cleanup
Côme BERNIGAUD [Wed, 11 May 2011 17:21:56 +0000 (19:21 +0200)]
No more black background for the map, some little cleanup

13 years agoProblem fixed (LoadCampaign added when going back to campaign menu)
Côme BERNIGAUD [Wed, 11 May 2011 16:49:18 +0000 (18:49 +0200)]
Problem fixed (LoadCampaign added when going back to campaign menu)

13 years agoalmost nothing
Côme BERNIGAUD [Wed, 11 May 2011 16:25:47 +0000 (18:25 +0200)]
almost nothing

13 years agoclean ups, and now campaignProgess is well initialized in accounts
Côme BERNIGAUD [Wed, 11 May 2011 11:55:41 +0000 (13:55 +0200)]
clean ups, and now campaignProgess is well initialized in accounts

13 years agocampaign bug fixes
sf17k [Wed, 11 May 2011 08:05:00 +0000 (04:05 -0400)]
campaign bug fixes

13 years agofirst modifications in order to support multiple campaign.
Côme BERNIGAUD [Tue, 10 May 2011 22:31:04 +0000 (00:31 +0200)]
first modifications in order to support multiple campaign.

13 years agosome more unused variables cleanup
Côme BERNIGAUD [Tue, 10 May 2011 21:27:04 +0000 (23:27 +0200)]
some more unused variables cleanup

13 years agomerge
sf17k [Tue, 10 May 2011 20:19:25 +0000 (16:19 -0400)]
merge

13 years agoremoved unused menu animation code
sf17k [Tue, 10 May 2011 20:18:27 +0000 (16:18 -0400)]
removed unused menu animation code

13 years agono more 5000 int array, a nice vector instead.
Côme BERNIGAUD [Tue, 10 May 2011 20:08:00 +0000 (22:08 +0200)]
no more 5000 int array, a nice vector instead.