]>
git.jsancho.org Git - lugaru.git/log
Alexander Monakov [Sun, 26 Dec 2010 11:08:18 +0000 (14:08 +0300)]
Consolidate bonus externs
Alexander Monakov [Sun, 26 Dec 2010 10:32:06 +0000 (13:32 +0300)]
Make bonuses an enum
Alexander Monakov [Sun, 26 Dec 2010 10:12:32 +0000 (13:12 +0300)]
Add a FIXME reminder
Alexander Monakov [Wed, 22 Dec 2010 22:23:09 +0000 (01:23 +0300)]
Move stats vars and award computation to Awards.cpp
Alexander Monakov [Wed, 22 Dec 2010 22:11:57 +0000 (01:11 +0300)]
Move some global vars from Globals.cpp, add decls to headers
Alexander Monakov [Sun, 19 Dec 2010 21:14:53 +0000 (00:14 +0300)]
Awards.def
Alexander Monakov [Sun, 19 Dec 2010 21:12:41 +0000 (00:12 +0300)]
More const-correctness in Text.{cpp,h}
Alexander Monakov [Sat, 18 Dec 2010 13:48:15 +0000 (16:48 +0300)]
Fix a regression that challenge screen is not shown
Alexander Monakov [Sat, 18 Dec 2010 13:05:13 +0000 (16:05 +0300)]
Slightly squash pack stuff
Alexander Monakov [Sat, 18 Dec 2010 12:53:30 +0000 (15:53 +0300)]
Slightly squash unpack stuff
Alexander Monakov [Sat, 18 Dec 2010 11:25:35 +0000 (14:25 +0300)]
Unused
Alexander Monakov [Sat, 18 Dec 2010 11:20:09 +0000 (14:20 +0300)]
Unify strms and samps
Alexander Monakov [Sat, 18 Dec 2010 09:45:31 +0000 (12:45 +0300)]
More static
Alexander Monakov [Fri, 17 Dec 2010 23:46:27 +0000 (02:46 +0300)]
Make static
Alexander Monakov [Fri, 17 Dec 2010 23:39:47 +0000 (02:39 +0300)]
Move playing stuff to the right wrapper :)
Alexander Monakov [Fri, 17 Dec 2010 23:36:50 +0000 (02:36 +0300)]
Rename channels -> impl_channels in wrapper
Alexander Monakov [Fri, 17 Dec 2010 23:23:08 +0000 (02:23 +0300)]
Drop Doppler
Alexander Monakov [Fri, 17 Dec 2010 23:21:37 +0000 (02:21 +0300)]
Drop commented-out remains of MinMaxDistance
Alexander Monakov [Fri, 17 Dec 2010 23:20:39 +0000 (02:20 +0300)]
Drop Open_Stream
Alexander Monakov [Fri, 17 Dec 2010 22:58:20 +0000 (01:58 +0300)]
Drop remains of Sample_load
Alexander Monakov [Fri, 17 Dec 2010 22:37:02 +0000 (01:37 +0300)]
Drop MinMaxDistance
Alexander Monakov [Sun, 12 Dec 2010 21:56:58 +0000 (00:56 +0300)]
Unused
Alexander Monakov [Sun, 12 Dec 2010 21:32:13 +0000 (00:32 +0300)]
Unused
Alexander Monakov [Sun, 12 Dec 2010 21:29:54 +0000 (00:29 +0300)]
Cleanup sound loading
Alexander Monakov [Sun, 12 Dec 2010 16:14:37 +0000 (19:14 +0300)]
Make sounds an enum
Alexander Monakov [Sun, 12 Dec 2010 15:47:19 +0000 (18:47 +0300)]
Drop sound min_distance
Alexander Monakov [Sun, 12 Dec 2010 15:45:04 +0000 (18:45 +0300)]
Unused
Alexander Monakov [Sun, 12 Dec 2010 14:38:24 +0000 (17:38 +0300)]
Unused
Alexander Monakov [Sun, 12 Dec 2010 13:25:04 +0000 (16:25 +0300)]
Add Animation.cpp missing from second-to-last commit
Alexander Monakov [Sun, 12 Dec 2010 10:28:25 +0000 (13:28 +0300)]
Fix failure to create 'Users' file
Alexander Monakov [Sun, 6 Jun 2010 23:02:26 +0000 (03:02 +0400)]
Cleanup animation loading
Alexander Monakov [Sun, 6 Jun 2010 21:53:29 +0000 (01:53 +0400)]
Unused
Alexander Monakov [Sun, 6 Jun 2010 21:50:22 +0000 (01:50 +0400)]
Prepare to cleanup animation loading
Alexander Monakov [Sun, 6 Jun 2010 21:15:27 +0000 (01:15 +0400)]
Move declaration of animation array into Animation.h
Alexander Monakov [Sun, 6 Jun 2010 21:07:05 +0000 (01:07 +0400)]
Make animation types an enum, move to a separate file
Alexander Monakov [Sun, 6 Jun 2010 17:10:19 +0000 (21:10 +0400)]
Merge
Alexander Monakov [Sun, 6 Jun 2010 17:01:31 +0000 (21:01 +0400)]
Remove commented out code
Côme BERNIGAUD [Sun, 6 Jun 2010 16:44:14 +0000 (18:44 +0200)]
removing unused mainmenu values (11, 13 and 17)
Alexander Monakov [Sun, 6 Jun 2010 16:42:56 +0000 (20:42 +0400)]
Remove HitStruct and associated commented-out code
Alexander Monakov [Sun, 6 Jun 2010 16:08:55 +0000 (20:08 +0400)]
Merge
Côme BERNIGAUD [Sun, 6 Jun 2010 15:51:11 +0000 (17:51 +0200)]
Missing files in the CMakeList.txt
And some clean up.
Alexander Monakov [Sun, 6 Jun 2010 15:35:48 +0000 (19:35 +0400)]
Remove Random.cpp
Alexander Monakov [Sun, 6 Jun 2010 15:33:39 +0000 (19:33 +0400)]
Remove deleted files from CMakeLists.txt
Alexander Monakov [Sun, 6 Jun 2010 15:26:54 +0000 (19:26 +0400)]
Remove commented out code
Alexander Monakov [Sun, 6 Jun 2010 14:47:17 +0000 (18:47 +0400)]
Merge
Côme BERNIGAUD [Sun, 6 Jun 2010 04:31:03 +0000 (06:31 +0200)]
removing unused files
Côme BERNIGAUD [Sun, 6 Jun 2010 04:21:37 +0000 (06:21 +0200)]
removing an unused file
Côme BERNIGAUD [Sun, 6 Jun 2010 04:17:02 +0000 (06:17 +0200)]
cleaning up again.
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)
Côme BERNIGAUD [Sun, 6 Jun 2010 03:02:04 +0000 (05:02 +0200)]
some more clean up.
Côme BERNIGAUD [Sun, 6 Jun 2010 02:39:49 +0000 (04:39 +0200)]
just some clean up.
Alexander Monakov [Sat, 5 Jun 2010 22:08:31 +0000 (02:08 +0400)]
Merge
Alexander Monakov [Sat, 5 Jun 2010 22:07:01 +0000 (02:07 +0400)]
Merge original history
Alexander Monakov [Sat, 5 Jun 2010 21:01:04 +0000 (01:01 +0400)]
Remove include of non-existent file
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
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
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(-)
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(-)
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(-)
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(-)
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(-)
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(-)
Côme BERNIGAUD [Sat, 5 Jun 2010 20:14:40 +0000 (22:14 +0200)]
and removing useless Setting files.
Côme BERNIGAUD [Sat, 5 Jun 2010 20:12:35 +0000 (22:12 +0200)]
finally...
Côme BERNIGAUD [Sat, 5 Jun 2010 19:32:02 +0000 (21:32 +0200)]
oops
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
Côme BERNIGAUD [Fri, 4 Jun 2010 20:04:09 +0000 (22:04 +0200)]
I removed a Macinput include
Côme BERNIGAUD [Fri, 4 Jun 2010 19:48:39 +0000 (21:48 +0200)]
Removed an unused function
Côme BERNIGAUD [Fri, 4 Jun 2010 19:45:46 +0000 (21:45 +0200)]
Some clean up.
No more WinInput.{h,cpp}.
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
Côme BERNIGAUD [Fri, 4 Jun 2010 10:08:12 +0000 (12:08 +0200)]
oops, I forgot to add some files.
Côme BERNIGAUD [Thu, 3 Jun 2010 17:56:13 +0000 (19:56 +0200)]
merge & removing debug printf. (in Settings.cpp, by myself, useless)
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)
Neal Gompa [Tue, 1 Jun 2010 10:07:03 +0000 (05:07 -0500)]
Fixed 'string.h' include to make cross compiling work from Linux to Windows
Ondřej Hošek [Sun, 30 May 2010 06:10:05 +0000 (01:10 -0500)]
Quick fix to Lugaru's freezing at going out of focus
Neal Gompa [Sun, 30 May 2010 06:04:17 +0000 (01:04 -0500)]
Added redefinition for MSVC
Côme BERNIGAUD [Mon, 24 May 2010 20:46:17 +0000 (22:46 +0200)]
The damage bar now appear in the option menu
Côme BERNIGAUD [Mon, 24 May 2010 19:48:09 +0000 (21:48 +0200)]
Damage bar disabled by default.
Côme BERNIGAUD [Mon, 24 May 2010 19:37:39 +0000 (21:37 +0200)]
merge
Vadim Trochinsky [Sun, 23 May 2010 18:54:11 +0000 (22:54 +0400)]
Merge
Alexander Monakov [Sun, 23 May 2010 15:59:01 +0000 (19:59 +0400)]
Add missing console commands
Vadim Trochinsky [Sun, 23 May 2010 13:24:30 +0000 (17:24 +0400)]
Fix changing to interlaced mode while running.
Fix interlaced mode with FSAA enabled.
Vadim Trochinsky [Sun, 23 May 2010 13:23:52 +0000 (17:23 +0400)]
Remove stereo mode change check. Not needed anymore since interlaced stereo init is fast now, and it doesn't do anything useful anymore.
Vadim Trochinsky [Fri, 21 May 2010 21:49:41 +0000 (23:49 +0200)]
Remove glDrawPixels code for initializing interlaced stereo, replace with line drawing code, which is simpler and works much faster
Vadim Trochinsky [Fri, 21 May 2010 21:25:34 +0000 (23:25 +0200)]
merge
Vadim Trochinsky [Fri, 21 May 2010 21:23:07 +0000 (23:23 +0200)]
Add config screen
Côme BERNIGAUD [Fri, 21 May 2010 11:56:51 +0000 (13:56 +0200)]
merging :-)
Côme BERNIGAUD [Fri, 21 May 2010 11:44:37 +0000 (13:44 +0200)]
activate the damage bar in the config file
Vadim Trochinsky [Thu, 20 May 2010 20:57:06 +0000 (22:57 +0200)]
merge
Vadim Trochinsky [Thu, 20 May 2010 20:56:26 +0000 (22:56 +0200)]
Whoops. Forgot to fix one instance of the config writing code.
Vadim Trochinsky [Tue, 18 May 2010 17:05:37 +0000 (19:05 +0200)]
Moved stereo initialization code to a separate file.
Vadim Trochinsky [Mon, 17 May 2010 22:37:12 +0000 (00:37 +0200)]
Fix writing settings that take effect on restart
Vadim Trochinsky [Mon, 17 May 2010 22:29:46 +0000 (00:29 +0200)]
Rewrite config file system, remove duplicate config writing code, make a better config parser
Vadim Trochinsky [Mon, 17 May 2010 17:11:58 +0000 (19:11 +0200)]
Fix separator in screenshot code
Vadim Trochinsky [Sun, 16 May 2010 22:44:18 +0000 (02:44 +0400)]
Added signature for changeset
9b260ab4978b
Vadim Trochinsky [Sun, 16 May 2010 22:44:12 +0000 (02:44 +0400)]
Merge
Vadim Trochinsky [Sun, 16 May 2010 20:48:17 +0000 (00:48 +0400)]
Added signature for changeset
38fd6c455d14
Vadim Trochinsky [Sun, 16 May 2010 20:48:08 +0000 (00:48 +0400)]
Add default stereo settings to config file
When reading the stereo settings, check if we're at EOF, and if so, don't try to read it.
Neal Gompa [Sun, 16 May 2010 20:41:05 +0000 (15:41 -0500)]
Removing plain makefiles -- Deprecated in favor of CMake generated makefiles, which now work on all major platforms
Vadim Trochinsky [Sun, 16 May 2010 20:22:18 +0000 (00:22 +0400)]
Added signature for changeset
e22c5c02ba45