]>
git.jsancho.org Git - lugaru.git/log
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
Vadim Trochinsky [Sun, 16 May 2010 20:22:11 +0000 (00:22 +0400)]
merge
Vadim Trochinsky [Sun, 16 May 2010 20:11:00 +0000 (00:11 +0400)]
Added signature for changeset
cb8570a4c328
Vadim Trochinsky [Sun, 16 May 2010 20:08:49 +0000 (00:08 +0400)]
Read stereo settings to config file, and read them back.
Stereo mode now configured as "none" by default
Neal Gompa [Sun, 16 May 2010 19:59:11 +0000 (14:59 -0500)]
Turn on x86_64 building by default in CMake scripts for OSX
Vadim Trochinsky [Sun, 16 May 2010 19:51:38 +0000 (23:51 +0400)]
Added signature for changeset
308aeba39655
Vadim Trochinsky [Sun, 16 May 2010 19:51:31 +0000 (23:51 +0400)]
Merge
Vadim Trochinsky [Sun, 16 May 2010 19:07:25 +0000 (23:07 +0400)]
Added signature for changeset
a117f6eeffe2
Vadim Trochinsky [Sun, 16 May 2010 19:07:21 +0000 (23:07 +0400)]
Do not initialize stencil buffer for interlaced stereo if we're not using interlaced stereo
Vadim Trochinsky [Sun, 16 May 2010 18:58:30 +0000 (22:58 +0400)]
Added signature for changeset
2c45b18d41b6
Vadim Trochinsky [Sun, 16 May 2010 18:57:58 +0000 (22:57 +0400)]
Move stereo reversing code so that it works for all stereo modes.
Fix anaglyph which was accidentally reversed.
Vadim Trochinsky [Sun, 16 May 2010 12:56:33 +0000 (16:56 +0400)]
Merged with parent
Alexander Monakov [Sun, 16 May 2010 10:54:48 +0000 (14:54 +0400)]
Cleanup handling of console commands
Neal Gompa [Sun, 16 May 2010 05:52:55 +0000 (00:52 -0500)]
Added a line to enforce inclusion of C99 support headers for MSVC
Neal Gompa [Sun, 16 May 2010 05:44:48 +0000 (00:44 -0500)]
Removed Mac OS X garbage files
Neal Gompa [Sun, 16 May 2010 03:55:31 +0000 (22:55 -0500)]
Fixed Data folder path for OSX bundles
Neal Gompa [Sun, 16 May 2010 03:17:45 +0000 (22:17 -0500)]
Took off some FORCE markers to allow configuration on OSX
Neal Gompa [Sun, 16 May 2010 03:04:10 +0000 (22:04 -0500)]
Moved 'resource.h' inclusion in 'OpenGL_Windows.cpp' to only be included on Win32 platform
Neal Gompa [Sun, 16 May 2010 02:30:55 +0000 (21:30 -0500)]
Fixed header include in 'OpenGL_Windows.cpp'
Neal Gompa [Sun, 16 May 2010 02:15:57 +0000 (21:15 -0500)]
Made massive change to CMake scripts. Hopefully now CMake scripts will produce working Mac OS X Application bundles in the install step.
Vadim Trochinsky [Sun, 16 May 2010 01:52:10 +0000 (05:52 +0400)]
Initial stereo code.
Anaglyph and horizontal interlacing are supported.
No settings (change in Globals.cpp for now)
Neal Gompa [Sat, 15 May 2010 23:51:02 +0000 (18:51 -0500)]
Whoops. Make sure CMake scripts copy SDL dylib only if it is being linked to it in the first place...
Neal Gompa [Sat, 15 May 2010 23:38:33 +0000 (18:38 -0500)]
Looks like Windows users aren't the only ones that need to be handled carefully. Made CMake scripts copy SDL dylib as part of install build process on Mac OS X.
Côme BERNIGAUD [Sat, 15 May 2010 22:22:09 +0000 (00:22 +0200)]
Add a pretty and desactivable damage bar.
Alexander Monakov [Sat, 15 May 2010 21:29:18 +0000 (01:29 +0400)]
Remove Compare
Alexander Monakov [Sat, 15 May 2010 20:13:26 +0000 (00:13 +0400)]
Clean up skin texture loading
Neal Gompa [Sat, 15 May 2010 19:10:28 +0000 (14:10 -0500)]
Fix error on forcing inclusion of OpenGL headers on Windows
Neal Gompa [Sat, 15 May 2010 18:35:22 +0000 (13:35 -0500)]
Fixed movement sounds
Neal Gompa [Sat, 15 May 2010 18:04:37 +0000 (13:04 -0500)]
Removing option to not use internal OpenGL headers on Windows; headers for all Windows compilers are not sane
Harley Laue [Sat, 15 May 2010 17:55:24 +0000 (12:55 -0500)]
Don't force GL headers if the user doesn't want that
Neal Gompa [Sat, 15 May 2010 17:43:03 +0000 (12:43 -0500)]
Replacing the headers yet again, this time from Mesa 7.8.1
Neal Gompa [Sat, 15 May 2010 17:14:35 +0000 (12:14 -0500)]
Corrected header include in OpenGL header
Neal Gompa [Sat, 15 May 2010 07:30:32 +0000 (02:30 -0500)]
Replaced headers with icculus' OpenGL headers, which hopefully fix MSVC building without breaking MinGW builds
Neal Gompa [Sat, 15 May 2010 07:20:11 +0000 (02:20 -0500)]
Commented out usage of header in OpenGL headers because it broke MSVC
Ryan C. Gordon [Sat, 15 May 2010 06:50:03 +0000 (02:50 -0400)]
Fixed compiler warnings about taking the address of a temporary.
Ryan C. Gordon [Sat, 15 May 2010 06:31:44 +0000 (02:31 -0400)]
Fixed Build-and-run in the Xcode project.
Now it copies SDL and the game data to the app bundle in a custom build step,
so the game can actually work if launched from Xcode.
Thanks to Wolf Mathwig for documenting how to do this.
Ryan C. Gordon [Sat, 15 May 2010 06:23:42 +0000 (02:23 -0400)]
Removed Quit.png<space> ... it's not used. Maybe a pre-HD texture?
Thanks to Aapo Rantalainen for catching this.
Ryan Hanson [Sat, 15 May 2010 05:44:32 +0000 (00:44 -0500)]
Added a ConvertFileName() to 'GameTick.cpp'
Ryan Hanson [Sat, 15 May 2010 05:42:45 +0000 (00:42 -0500)]
Added a ConvertFileName() to 'Models.cpp'
Neal Gompa [Sat, 15 May 2010 05:27:32 +0000 (00:27 -0500)]
Fixed a mistake in using ConvertFileName() in 'GameInitDispose.cpp'
Neal Gompa [Sat, 15 May 2010 00:30:58 +0000 (19:30 -0500)]
Reverted all changes to 'GameTick.cpp' because it broke Lugaru codebase badly
Neal Gompa [Fri, 14 May 2010 23:44:55 +0000 (18:44 -0500)]
Another block of 'GameTick.cpp' converted file paths to use ConvertFileName(), so it works on Windows compiled with MinGW; Don't hold your breath, still a lot of the file to go through
Neal Gompa [Fri, 14 May 2010 23:33:41 +0000 (18:33 -0500)]
Made it halfway through 'GameTick.cpp' in converting file paths to use ConvertFileName(), so it works on Windows compiled with MinGW; Don't hold your breath, still a lot of the file to go through
Neal Gompa [Fri, 14 May 2010 23:17:47 +0000 (18:17 -0500)]
Made some filepaths in 'GameTick.cpp' use ConvertFileName(), so it works on Windows compiled with MinGW; Don't hold your breath, still a lot of the file to go through
Neal Gompa [Fri, 14 May 2010 22:26:03 +0000 (17:26 -0500)]
Made sound file filepaths use ConvertFileName(), so it works on Windows compiled with MinGW