]> git.jsancho.org Git - lugaru.git/log
lugaru.git
13 years agoMore PlaySoundEx eradication
Alexander Monakov [Mon, 3 Jan 2011 16:23:10 +0000 (19:23 +0300)]
More PlaySoundEx eradication

13 years agoRemove more comments that also confuse Vim
Alexander Monakov [Sat, 1 Jan 2011 22:12:01 +0000 (01:12 +0300)]
Remove more comments that also confuse Vim

13 years agoReindent Person::Reverse
Alexander Monakov [Sat, 1 Jan 2011 22:06:21 +0000 (01:06 +0300)]
Reindent Person::Reverse

13 years agoSimplify DoMipmaps
Alexander Monakov [Sat, 1 Jan 2011 21:43:13 +0000 (00:43 +0300)]
Simplify DoMipmaps
* * *
foldme

13 years agoA bit more readable CheckKick
Alexander Monakov [Sat, 1 Jan 2011 20:36:53 +0000 (23:36 +0300)]
A bit more readable CheckKick

13 years agoDrop last remains of PlaySoundEx from Person.cpp
Alexander Monakov [Sat, 1 Jan 2011 20:11:04 +0000 (23:11 +0300)]
Drop last remains of PlaySoundEx from Person.cpp

13 years agoDrop useless ATM zero-initialization
Alexander Monakov [Sat, 1 Jan 2011 19:52:07 +0000 (22:52 +0300)]
Drop useless ATM zero-initialization

13 years agoSimplify walljump animations
Alexander Monakov [Fri, 31 Dec 2010 01:18:22 +0000 (04:18 +0300)]
Simplify walljump animations

13 years agoSimplify landhard and flip animations
Alexander Monakov [Fri, 31 Dec 2010 01:16:27 +0000 (04:16 +0300)]
Simplify landhard and flip animations

13 years agoSimplify land animations
Alexander Monakov [Fri, 31 Dec 2010 01:10:34 +0000 (04:10 +0300)]
Simplify land animations

13 years agoSimplify stop animations
Alexander Monakov [Fri, 31 Dec 2010 01:08:50 +0000 (04:08 +0300)]
Simplify stop animations

13 years agoSimplify run animations
Alexander Monakov [Fri, 31 Dec 2010 00:43:55 +0000 (03:43 +0300)]
Simplify run animations

13 years agoSimplify crouch animations
Alexander Monakov [Fri, 31 Dec 2010 00:41:20 +0000 (03:41 +0300)]
Simplify crouch animations

13 years agoSimplify sleep animations
Alexander Monakov [Fri, 31 Dec 2010 00:38:30 +0000 (03:38 +0300)]
Simplify sleep animations

13 years agoSimplify sit animations
Alexander Monakov [Fri, 31 Dec 2010 00:34:04 +0000 (03:34 +0300)]
Simplify sit animations

13 years agoSimplify idle animations
Alexander Monakov [Fri, 31 Dec 2010 00:29:23 +0000 (03:29 +0300)]
Simplify idle animations

13 years agoAdd bits as last arg to DECLARE_ANIM
Alexander Monakov [Thu, 30 Dec 2010 23:39:43 +0000 (02:39 +0300)]
Add bits as last arg to DECLARE_ANIM

13 years agoPrepare to add animation bits
Alexander Monakov [Thu, 30 Dec 2010 23:37:13 +0000 (02:37 +0300)]
Prepare to add animation bits

13 years agoCleanup sound emission
Alexander Monakov [Wed, 29 Dec 2010 00:02:38 +0000 (03:02 +0300)]
Cleanup sound emission

13 years agoPrepare to cleanup sound emission
Alexander Monakov [Tue, 28 Dec 2010 22:42:20 +0000 (01:42 +0300)]
Prepare to cleanup sound emission

13 years agoDrop dead code
Alexander Monakov [Sun, 26 Dec 2010 23:52:43 +0000 (02:52 +0300)]
Drop dead code

13 years agoRemove comments that confuse Vim
Alexander Monakov [Sun, 26 Dec 2010 23:51:15 +0000 (02:51 +0300)]
Remove comments that confuse Vim

13 years agoSolidHitBonus simplification
Alexander Monakov [Sun, 26 Dec 2010 23:41:12 +0000 (02:41 +0300)]
SolidHitBonus simplification

13 years agoA tiny cleanup
Alexander Monakov [Sun, 26 Dec 2010 23:27:18 +0000 (02:27 +0300)]
A tiny cleanup

13 years agoForgont one instance of Wolfbonus
Alexander Monakov [Sun, 26 Dec 2010 23:25:31 +0000 (02:25 +0300)]
Forgont one instance of Wolfbonus

13 years agoBonus Score deduplication
Alexander Monakov [Sun, 26 Dec 2010 23:22:53 +0000 (02:22 +0300)]
Bonus Score deduplication

13 years agoMove bonusnum too
Alexander Monakov [Sun, 26 Dec 2010 22:26:42 +0000 (01:26 +0300)]
Move bonusnum too

13 years agoConsolidate bonus externs
Alexander Monakov [Sun, 26 Dec 2010 11:08:18 +0000 (14:08 +0300)]
Consolidate bonus externs

13 years agoMake bonuses an enum
Alexander Monakov [Sun, 26 Dec 2010 10:32:06 +0000 (13:32 +0300)]
Make bonuses an enum

13 years agoAdd a FIXME reminder
Alexander Monakov [Sun, 26 Dec 2010 10:12:32 +0000 (13:12 +0300)]
Add a FIXME reminder

13 years agoMove stats vars and award computation to Awards.cpp
Alexander Monakov [Wed, 22 Dec 2010 22:23:09 +0000 (01:23 +0300)]
Move stats vars and award computation to Awards.cpp

13 years agoMove some global vars from Globals.cpp, add decls to headers
Alexander Monakov [Wed, 22 Dec 2010 22:11:57 +0000 (01:11 +0300)]
Move some global vars from Globals.cpp, add decls to headers

13 years agoAwards.def
Alexander Monakov [Sun, 19 Dec 2010 21:14:53 +0000 (00:14 +0300)]
Awards.def

13 years agoMore const-correctness in Text.{cpp,h}
Alexander Monakov [Sun, 19 Dec 2010 21:12:41 +0000 (00:12 +0300)]
More const-correctness in Text.{cpp,h}

13 years agoFix a regression that challenge screen is not shown
Alexander Monakov [Sat, 18 Dec 2010 13:48:15 +0000 (16:48 +0300)]
Fix a regression that challenge screen is not shown

13 years agoSlightly squash pack stuff
Alexander Monakov [Sat, 18 Dec 2010 13:05:13 +0000 (16:05 +0300)]
Slightly squash pack stuff

13 years agoSlightly squash unpack stuff
Alexander Monakov [Sat, 18 Dec 2010 12:53:30 +0000 (15:53 +0300)]
Slightly squash unpack stuff

13 years agoUnused
Alexander Monakov [Sat, 18 Dec 2010 11:25:35 +0000 (14:25 +0300)]
Unused

13 years agoUnify strms and samps
Alexander Monakov [Sat, 18 Dec 2010 11:20:09 +0000 (14:20 +0300)]
Unify strms and samps

13 years agoMore static
Alexander Monakov [Sat, 18 Dec 2010 09:45:31 +0000 (12:45 +0300)]
More static

13 years agoMake static
Alexander Monakov [Fri, 17 Dec 2010 23:46:27 +0000 (02:46 +0300)]
Make static

13 years agoMove playing stuff to the right wrapper :)
Alexander Monakov [Fri, 17 Dec 2010 23:39:47 +0000 (02:39 +0300)]
Move playing stuff to the right wrapper :)

13 years agoRename channels -> impl_channels in wrapper
Alexander Monakov [Fri, 17 Dec 2010 23:36:50 +0000 (02:36 +0300)]
Rename channels -> impl_channels in wrapper

13 years agoDrop Doppler
Alexander Monakov [Fri, 17 Dec 2010 23:23:08 +0000 (02:23 +0300)]
Drop Doppler

13 years agoDrop commented-out remains of MinMaxDistance
Alexander Monakov [Fri, 17 Dec 2010 23:21:37 +0000 (02:21 +0300)]
Drop commented-out remains of MinMaxDistance

13 years agoDrop Open_Stream
Alexander Monakov [Fri, 17 Dec 2010 23:20:39 +0000 (02:20 +0300)]
Drop Open_Stream

13 years agoDrop remains of Sample_load
Alexander Monakov [Fri, 17 Dec 2010 22:58:20 +0000 (01:58 +0300)]
Drop remains of Sample_load

13 years agoDrop MinMaxDistance
Alexander Monakov [Fri, 17 Dec 2010 22:37:02 +0000 (01:37 +0300)]
Drop MinMaxDistance

13 years agoUnused
Alexander Monakov [Sun, 12 Dec 2010 21:56:58 +0000 (00:56 +0300)]
Unused

13 years agoUnused
Alexander Monakov [Sun, 12 Dec 2010 21:32:13 +0000 (00:32 +0300)]
Unused

13 years agoCleanup sound loading
Alexander Monakov [Sun, 12 Dec 2010 21:29:54 +0000 (00:29 +0300)]
Cleanup sound loading

13 years agoMake sounds an enum
Alexander Monakov [Sun, 12 Dec 2010 16:14:37 +0000 (19:14 +0300)]
Make sounds an enum

13 years agoDrop sound min_distance
Alexander Monakov [Sun, 12 Dec 2010 15:47:19 +0000 (18:47 +0300)]
Drop sound min_distance

13 years agoUnused
Alexander Monakov [Sun, 12 Dec 2010 15:45:04 +0000 (18:45 +0300)]
Unused

13 years agoUnused
Alexander Monakov [Sun, 12 Dec 2010 14:38:24 +0000 (17:38 +0300)]
Unused

13 years agoAdd Animation.cpp missing from second-to-last commit
Alexander Monakov [Sun, 12 Dec 2010 13:25:04 +0000 (16:25 +0300)]
Add Animation.cpp missing from second-to-last commit

13 years agoFix failure to create 'Users' file
Alexander Monakov [Sun, 12 Dec 2010 10:28:25 +0000 (13:28 +0300)]
Fix failure to create 'Users' file

13 years agoCleanup animation loading
Alexander Monakov [Sun, 6 Jun 2010 23:02:26 +0000 (03:02 +0400)]
Cleanup animation loading

13 years agoUnused
Alexander Monakov [Sun, 6 Jun 2010 21:53:29 +0000 (01:53 +0400)]
Unused

13 years agoPrepare to cleanup animation loading
Alexander Monakov [Sun, 6 Jun 2010 21:50:22 +0000 (01:50 +0400)]
Prepare to cleanup animation loading

13 years agoMove declaration of animation array into Animation.h
Alexander Monakov [Sun, 6 Jun 2010 21:15:27 +0000 (01:15 +0400)]
Move declaration of animation array into Animation.h

13 years agoMake animation types an enum, move to a separate file
Alexander Monakov [Sun, 6 Jun 2010 21:07:05 +0000 (01:07 +0400)]
Make animation types an enum, move to a separate file

13 years agoMerge
Alexander Monakov [Sun, 6 Jun 2010 17:10:19 +0000 (21:10 +0400)]
Merge

13 years agoRemove commented out code
Alexander Monakov [Sun, 6 Jun 2010 17:01:31 +0000 (21:01 +0400)]
Remove commented out code

13 years agoremoving unused mainmenu values (11, 13 and 17)
Côme BERNIGAUD [Sun, 6 Jun 2010 16:44:14 +0000 (18:44 +0200)]
removing unused mainmenu values (11, 13 and 17)

13 years agoRemove HitStruct and associated commented-out code
Alexander Monakov [Sun, 6 Jun 2010 16:42:56 +0000 (20:42 +0400)]
Remove HitStruct and associated commented-out code

13 years agoMerge
Alexander Monakov [Sun, 6 Jun 2010 16:08:55 +0000 (20:08 +0400)]
Merge

13 years agoMissing files in the CMakeList.txt
Côme BERNIGAUD [Sun, 6 Jun 2010 15:51:11 +0000 (17:51 +0200)]
Missing files in the CMakeList.txt
And some clean up.

13 years agoRemove Random.cpp
Alexander Monakov [Sun, 6 Jun 2010 15:35:48 +0000 (19:35 +0400)]
Remove Random.cpp

13 years agoRemove deleted files from CMakeLists.txt
Alexander Monakov [Sun, 6 Jun 2010 15:33:39 +0000 (19:33 +0400)]
Remove deleted files from CMakeLists.txt

13 years agoRemove commented out code
Alexander Monakov [Sun, 6 Jun 2010 15:26:54 +0000 (19:26 +0400)]
Remove commented out code

13 years agoMerge
Alexander Monakov [Sun, 6 Jun 2010 14:47:17 +0000 (18:47 +0400)]
Merge

13 years agoremoving unused files
Côme BERNIGAUD [Sun, 6 Jun 2010 04:31:03 +0000 (06:31 +0200)]
removing unused files

13 years agoremoving an unused file
Côme BERNIGAUD [Sun, 6 Jun 2010 04:21:37 +0000 (06:21 +0200)]
removing an unused file

13 years agocleaning up again.
Côme BERNIGAUD [Sun, 6 Jun 2010 04:17:02 +0000 (06:17 +0200)]
cleaning up again.

13 years agoAdding back Settings files. (sorry about that).
Côme BERNIGAUD [Sun, 6 Jun 2010 03:37:25 +0000 (05:37 +0200)]
Adding back Settings files. (sorry about that).
Some clean up again.
And removing some unused functions (MD5)

13 years agosome more clean up.
Côme BERNIGAUD [Sun, 6 Jun 2010 03:02:04 +0000 (05:02 +0200)]
some more clean up.

13 years agojust some clean up.
Côme BERNIGAUD [Sun, 6 Jun 2010 02:39:49 +0000 (04:39 +0200)]
just some clean up.

13 years agoMerge
Alexander Monakov [Sat, 5 Jun 2010 22:08:31 +0000 (02:08 +0400)]
Merge

13 years agoMerge original history
Alexander Monakov [Sat, 5 Jun 2010 22:07:01 +0000 (02:07 +0400)]
Merge original history

13 years agoRemove include of non-existent file
Alexander Monakov [Sat, 5 Jun 2010 21:01:04 +0000 (01:01 +0400)]
Remove include of non-existent file

13 years agoVarious SDL input and Game::* cleanups
Côme BERNIGAUD [Sat, 5 Jun 2010 20:51:18 +0000 (00:51 +0400)]
Various SDL input and Game::* cleanups
---
 CMakeLists.txt             |    5 +-
 Source/Game.cpp            |  357 +++++++++++++++
 Source/Game.h              |  468 ++++++++++----------
 Source/GameDraw.cpp        |  105 +++--
 Source/GameInitDispose.cpp |  197 --------
 Source/GameTick.cpp        | 1088 ++++++++++++--------------------------------
 Source/Globals.cpp         |    3 +-
 Source/Input.cpp           |   68 +++
 Source/Input.h             |   44 ++
 Source/OpenGL_Windows.cpp  |  247 +----------
 Source/Settings.cpp        |   82 ++--
 Source/WinInput.cpp        | 1008 ----------------------------------------
 Source/WinInput.h          |  156 -------
 13 files changed, 1107 insertions(+), 2721 deletions(-)
 create mode 100644 Source/Game.cpp
 create mode 100644 Source/Input.cpp
 create mode 100644 Source/Input.h
 delete mode 100644 Source/WinInput.cpp
 delete mode 100644 Source/WinInput.h

13 years agoMove player account handling into separate class
Côme BERNIGAUD [Sat, 5 Jun 2010 20:51:18 +0000 (00:51 +0400)]
Move player account handling into separate class
---
 CMakeLists.txt             |    2 +
 Source/Account.cpp         |  221 ++++++++++++++++++++++++++++++
 Source/Account.h           |   90 ++++++++++++
 Source/GameDraw.cpp        |  142 ++++++++-----------
 Source/GameInitDispose.cpp |  117 +----------------
 Source/GameTick.cpp        |  324 ++++++++++----------------------------------
 Source/Globals.cpp         |   14 --
 7 files changed, 452 insertions(+), 458 deletions(-)
 create mode 100644 Source/Account.cpp
 create mode 100644 Source/Account.h

13 years agoDo not open browser for registering the game
Côme BERNIGAUD [Sat, 5 Jun 2010 20:51:18 +0000 (00:51 +0400)]
Do not open browser for registering the game
---
 Source/OpenGL_Windows.cpp |   11 -----------
 1 files changed, 0 insertions(+), 11 deletions(-)

13 years agoRemove early exit Linux-specific hack
Côme BERNIGAUD [Sat, 5 Jun 2010 20:51:18 +0000 (00:51 +0400)]
Remove early exit Linux-specific hack
---
 Source/OpenGL_Windows.cpp |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

13 years agoCleanup SDL video routines
Côme BERNIGAUD [Sat, 5 Jun 2010 20:51:18 +0000 (00:51 +0400)]
Cleanup SDL video routines
---
 Source/OpenGL_Windows.cpp |  124 ++++++++++++++++-----------------------------
 1 files changed, 43 insertions(+), 81 deletions(-)

13 years agoMinor code simplifications
Côme BERNIGAUD [Sat, 5 Jun 2010 20:51:18 +0000 (00:51 +0400)]
Minor code simplifications
---
 Source/GameDraw.cpp       |   12 +-
 Source/GameTick.cpp       |  411 +++++++++++++++++++--------------------------
 Source/OpenGL_Windows.cpp |   19 +--
 3 files changed, 178 insertions(+), 264 deletions(-)

13 years agoAdjust source code formatting
Côme BERNIGAUD [Sat, 5 Jun 2010 20:51:18 +0000 (00:51 +0400)]
Adjust source code formatting
---
 Source/GameDraw.cpp       |    4 ++--
 Source/GameTick.cpp       |   24 ++++++++++--------------
 Source/Globals.cpp        |    2 +-
 Source/OpenGL_Windows.cpp |    6 +++---
 4 files changed, 16 insertions(+), 20 deletions(-)

13 years agoRemove commented out code
Côme BERNIGAUD [Sat, 5 Jun 2010 20:51:18 +0000 (00:51 +0400)]
Remove commented out code
---
 Source/GameDraw.cpp        |   32 +--
 Source/GameInitDispose.cpp |   32 ---
 Source/GameTick.cpp        |  652 +-------------------------------------------
 Source/Person.cpp          |   19 --
 Source/Weapons.cpp         |    7 -
 5 files changed, 6 insertions(+), 736 deletions(-)

13 years agoand removing useless Setting files.
Côme BERNIGAUD [Sat, 5 Jun 2010 20:14:40 +0000 (22:14 +0200)]
and removing useless Setting files.

13 years agofinally...
Côme BERNIGAUD [Sat, 5 Jun 2010 20:12:35 +0000 (22:12 +0200)]
finally...

13 years agooops
Côme BERNIGAUD [Sat, 5 Jun 2010 19:32:02 +0000 (21:32 +0200)]
oops

13 years agoCleanning up Sprite class. More can be done, but it's already prettier.
Côme BERNIGAUD [Sat, 5 Jun 2010 18:06:55 +0000 (20:06 +0200)]
Cleanning up Sprite class. More can be done, but it's already prettier.
I also corrected a little warning in openal_wrapper.h

13 years agoI removed a Macinput include
Côme BERNIGAUD [Fri, 4 Jun 2010 20:04:09 +0000 (22:04 +0200)]
I removed a Macinput include

13 years agoRemoved an unused function
Côme BERNIGAUD [Fri, 4 Jun 2010 19:48:39 +0000 (21:48 +0200)]
Removed an unused function

13 years agoSome clean up.
Côme BERNIGAUD [Fri, 4 Jun 2010 19:45:46 +0000 (21:45 +0200)]
Some clean up.
No more WinInput.{h,cpp}.

13 years agoNo more thread for text field, SDLPollEvent is used instead. There is still a thread...
Côme BERNIGAUD [Fri, 4 Jun 2010 17:27:05 +0000 (19:27 +0200)]
No more thread for text field, SDLPollEvent is used instead. There is still a thread for key configuration. (I do not plan to remove it)
Chatting and Console are fixed (in debug mode)
Useless functions removed from WinInput.h

13 years agooops, I forgot to add some files.
Côme BERNIGAUD [Fri, 4 Jun 2010 10:08:12 +0000 (12:08 +0200)]
oops, I forgot to add some files.

13 years agomerge & removing debug printf. (in Settings.cpp, by myself, useless)
Côme BERNIGAUD [Thu, 3 Jun 2010 17:56:13 +0000 (19:56 +0200)]
merge & removing debug printf. (in Settings.cpp, by myself, useless)

13 years agoHUGE refactoring:
Côme BERNIGAUD [Thu, 3 Jun 2010 17:40:28 +0000 (19:40 +0200)]
HUGE refactoring:
-Accounts are now handled by a pretty Account class.
-Keys inputs are now handled the Input class (with static methods) and use directly SDL, no more #define MAC_CRAP
-For that I had to add thread for two things:
-the entername field
-the key configuration
Maybe when the menu system will have been cleaned up (reorganized) the threads won't be needed anymore.
This commit can read old Users files, but not completely old config.txt files (you'll have to reconfigure keyboards bindings)