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

14 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.

14 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)

14 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)

14 years agoFixed 'string.h' include to make cross compiling work from Linux to Windows
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

14 years agoQuick fix to Lugaru's freezing at going out of focus
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

14 years agoAdded redefinition for MSVC
Neal Gompa [Sun, 30 May 2010 06:04:17 +0000 (01:04 -0500)]
Added redefinition for MSVC

14 years agoThe damage bar now appear in the option menu
Côme BERNIGAUD [Mon, 24 May 2010 20:46:17 +0000 (22:46 +0200)]
The damage bar now appear in the option menu

14 years agoDamage bar disabled by default.
Côme BERNIGAUD [Mon, 24 May 2010 19:48:09 +0000 (21:48 +0200)]
Damage bar disabled by default.

14 years agomerge
Côme BERNIGAUD [Mon, 24 May 2010 19:37:39 +0000 (21:37 +0200)]
merge

14 years agoMerge
Vadim Trochinsky [Sun, 23 May 2010 18:54:11 +0000 (22:54 +0400)]
Merge

14 years agoAdd missing console commands
Alexander Monakov [Sun, 23 May 2010 15:59:01 +0000 (19:59 +0400)]
Add missing console commands

14 years agoFix changing to interlaced mode while running.
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.

14 years agoRemove stereo mode change check. Not needed anymore since interlaced stereo init...
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.

14 years agoRemove glDrawPixels code for initializing interlaced stereo, replace with line drawin...
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

14 years agomerge
Vadim Trochinsky [Fri, 21 May 2010 21:25:34 +0000 (23:25 +0200)]
merge

14 years agoAdd config screen
Vadim Trochinsky [Fri, 21 May 2010 21:23:07 +0000 (23:23 +0200)]
Add config screen

14 years agomerging :-)
Côme BERNIGAUD [Fri, 21 May 2010 11:56:51 +0000 (13:56 +0200)]
merging :-)

14 years agoactivate the damage bar in the config file
Côme BERNIGAUD [Fri, 21 May 2010 11:44:37 +0000 (13:44 +0200)]
activate the damage bar in the config file

14 years agomerge
Vadim Trochinsky [Thu, 20 May 2010 20:57:06 +0000 (22:57 +0200)]
merge

14 years agoWhoops. Forgot to fix one instance of the config writing code.
Vadim Trochinsky [Thu, 20 May 2010 20:56:26 +0000 (22:56 +0200)]
Whoops. Forgot to fix one instance of the config writing code.

14 years agoMoved stereo initialization code to a separate file.
Vadim Trochinsky [Tue, 18 May 2010 17:05:37 +0000 (19:05 +0200)]
Moved stereo initialization code to a separate file.

14 years agoFix writing settings that take effect on restart
Vadim Trochinsky [Mon, 17 May 2010 22:37:12 +0000 (00:37 +0200)]
Fix writing settings that take effect on restart

14 years agoRewrite config file system, remove duplicate config writing code, make a better confi...
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

14 years agoFix separator in screenshot code
Vadim Trochinsky [Mon, 17 May 2010 17:11:58 +0000 (19:11 +0200)]
Fix separator in screenshot code

14 years agoAdded signature for changeset 9b260ab4978b
Vadim Trochinsky [Sun, 16 May 2010 22:44:18 +0000 (02:44 +0400)]
Added signature for changeset 9b260ab4978b

14 years agoMerge
Vadim Trochinsky [Sun, 16 May 2010 22:44:12 +0000 (02:44 +0400)]
Merge

14 years agoAdded signature for changeset 38fd6c455d14
Vadim Trochinsky [Sun, 16 May 2010 20:48:17 +0000 (00:48 +0400)]
Added signature for changeset 38fd6c455d14

14 years agoAdd default stereo settings to config file
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.

14 years agoRemoving plain makefiles -- Deprecated in favor of CMake generated makefiles, which...
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

14 years agoAdded signature for changeset e22c5c02ba45
Vadim Trochinsky [Sun, 16 May 2010 20:22:18 +0000 (00:22 +0400)]
Added signature for changeset e22c5c02ba45

14 years agomerge
Vadim Trochinsky [Sun, 16 May 2010 20:22:11 +0000 (00:22 +0400)]
merge

14 years agoAdded signature for changeset cb8570a4c328
Vadim Trochinsky [Sun, 16 May 2010 20:11:00 +0000 (00:11 +0400)]
Added signature for changeset cb8570a4c328

14 years agoRead stereo settings to config file, and read them back.
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

14 years agoTurn on x86_64 building by default in CMake scripts for OSX
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

14 years agoAdded signature for changeset 308aeba39655
Vadim Trochinsky [Sun, 16 May 2010 19:51:38 +0000 (23:51 +0400)]
Added signature for changeset 308aeba39655

14 years agoMerge
Vadim Trochinsky [Sun, 16 May 2010 19:51:31 +0000 (23:51 +0400)]
Merge

14 years agoAdded signature for changeset a117f6eeffe2
Vadim Trochinsky [Sun, 16 May 2010 19:07:25 +0000 (23:07 +0400)]
Added signature for changeset a117f6eeffe2

14 years agoDo not initialize stencil buffer for interlaced stereo if we're not using interlaced...
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

14 years agoAdded signature for changeset 2c45b18d41b6
Vadim Trochinsky [Sun, 16 May 2010 18:58:30 +0000 (22:58 +0400)]
Added signature for changeset 2c45b18d41b6

14 years agoMove stereo reversing code so that it works for all stereo modes.
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.

14 years agoMerged with parent
Vadim Trochinsky [Sun, 16 May 2010 12:56:33 +0000 (16:56 +0400)]
Merged with parent

14 years agoCleanup handling of console commands
Alexander Monakov [Sun, 16 May 2010 10:54:48 +0000 (14:54 +0400)]
Cleanup handling of console commands

14 years agoAdded a line to enforce inclusion of C99 support headers for MSVC
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

14 years agoRemoved Mac OS X garbage files
Neal Gompa [Sun, 16 May 2010 05:44:48 +0000 (00:44 -0500)]
Removed Mac OS X garbage files

14 years agoFixed Data folder path for OSX bundles
Neal Gompa [Sun, 16 May 2010 03:55:31 +0000 (22:55 -0500)]
Fixed Data folder path for OSX bundles

14 years agoTook off some FORCE markers to allow configuration on OSX
Neal Gompa [Sun, 16 May 2010 03:17:45 +0000 (22:17 -0500)]
Took off some FORCE markers to allow configuration on OSX

14 years agoMoved 'resource.h' inclusion in 'OpenGL_Windows.cpp' to only be included on Win32...
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

14 years agoFixed header include in 'OpenGL_Windows.cpp'
Neal Gompa [Sun, 16 May 2010 02:30:55 +0000 (21:30 -0500)]
Fixed header include in 'OpenGL_Windows.cpp'

14 years agoMade massive change to CMake scripts. Hopefully now CMake scripts will produce workin...
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.

14 years agoInitial stereo code.
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)

14 years agoWhoops. Make sure CMake scripts copy SDL dylib only if it is being linked to it in...
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...

14 years agoLooks like Windows users aren't the only ones that need to be handled carefully....
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.

14 years agoAdd a pretty and desactivable damage bar.
Côme BERNIGAUD [Sat, 15 May 2010 22:22:09 +0000 (00:22 +0200)]
Add a pretty and desactivable damage bar.

14 years agoRemove Compare
Alexander Monakov [Sat, 15 May 2010 21:29:18 +0000 (01:29 +0400)]
Remove Compare

14 years agoClean up skin texture loading
Alexander Monakov [Sat, 15 May 2010 20:13:26 +0000 (00:13 +0400)]
Clean up skin texture loading

14 years agoFix error on forcing inclusion of OpenGL headers on Windows
Neal Gompa [Sat, 15 May 2010 19:10:28 +0000 (14:10 -0500)]
Fix error on forcing inclusion of OpenGL headers on Windows

14 years agoFixed movement sounds
Neal Gompa [Sat, 15 May 2010 18:35:22 +0000 (13:35 -0500)]
Fixed movement sounds

14 years agoRemoving option to not use internal OpenGL headers on Windows; headers for all Window...
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

14 years agoDon't force GL headers if the user doesn't want that
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

14 years agoReplacing the headers yet again, this time from Mesa 7.8.1
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

14 years agoCorrected header include in OpenGL header
Neal Gompa [Sat, 15 May 2010 17:14:35 +0000 (12:14 -0500)]
Corrected header include in OpenGL header

14 years agoReplaced headers with icculus' OpenGL headers, which hopefully fix MSVC building...
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

14 years agoCommented out usage of header in OpenGL headers because it broke MSVC
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

14 years agoFixed compiler warnings about taking the address of a temporary.
Ryan C. Gordon [Sat, 15 May 2010 06:50:03 +0000 (02:50 -0400)]
Fixed compiler warnings about taking the address of a temporary.

14 years agoFixed Build-and-run in the Xcode project.
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.

14 years agoRemoved Quit.png<space> ... it's not used. Maybe a pre-HD texture?
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.

14 years agoAdded a ConvertFileName() to 'GameTick.cpp'
Ryan Hanson [Sat, 15 May 2010 05:44:32 +0000 (00:44 -0500)]
Added a ConvertFileName() to 'GameTick.cpp'

14 years agoAdded a ConvertFileName() to 'Models.cpp'
Ryan Hanson [Sat, 15 May 2010 05:42:45 +0000 (00:42 -0500)]
Added a ConvertFileName() to 'Models.cpp'

14 years agoFixed a mistake in using ConvertFileName() in 'GameInitDispose.cpp'
Neal Gompa [Sat, 15 May 2010 05:27:32 +0000 (00:27 -0500)]
Fixed a mistake in using ConvertFileName() in 'GameInitDispose.cpp'

14 years agoReverted all changes to 'GameTick.cpp' because it broke Lugaru codebase badly
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

14 years agoAnother block of 'GameTick.cpp' converted file paths to use ConvertFileName(), so...
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

14 years agoMade it halfway through 'GameTick.cpp' in converting file paths to use ConvertFileNam...
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

14 years agoMade some filepaths in 'GameTick.cpp' use ConvertFileName(), so it works on Windows...
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

14 years agoMade sound file filepaths use ConvertFileName(), so it works on Windows compiled...
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

14 years agoMade a few more filepaths use ConvertFileName(), so it works on Windows compiled...
Neal Gompa [Fri, 14 May 2010 22:05:32 +0000 (17:05 -0500)]
Made a few more filepaths use ConvertFileName(), so it works on Windows compiled with MinGW

14 years agoMade a couple more filepaths use ConvertFileName(), so it works on Windows compiled...
Ryan Hanson [Fri, 14 May 2010 21:46:07 +0000 (16:46 -0500)]
Made a couple more filepaths use ConvertFileName(), so it works on Windows compiled with MinGW

14 years agoMade filepaths use ConvertFileName(), so it works on Windows compiled with MinGW
Ryan Hanson [Fri, 14 May 2010 21:26:32 +0000 (16:26 -0500)]
Made filepaths use ConvertFileName(), so it works on Windows compiled with MinGW

14 years agoReverting file paths changes; they make the problem a lot worse (segfaults)
Neal Gompa [Fri, 14 May 2010 20:41:14 +0000 (15:41 -0500)]
Reverting file paths changes; they make the problem a lot worse (segfaults)

14 years agoOops, Initial forward slash needs to be removed in POSIX file paths
Neal Gompa [Fri, 14 May 2010 20:19:47 +0000 (15:19 -0500)]
Oops, Initial forward slash needs to be removed in POSIX file paths

14 years agoChanged paths in several files from OS9 style to POSIX-style to make it work better...
Neal Gompa [Fri, 14 May 2010 19:29:24 +0000 (14:29 -0500)]
Changed paths in several files from OS9 style to POSIX-style to make it work better on Linux and Windows

14 years agoMade sure that 'MacCompatibility.h' is used only with UNIX
Neal Gompa [Fri, 14 May 2010 18:17:09 +0000 (13:17 -0500)]
Made sure that 'MacCompatibility.h' is used only with UNIX

14 years agoRemoved DRIVER.CC (unused).
Ryan C. Gordon [Fri, 14 May 2010 16:05:35 +0000 (12:05 -0400)]
Removed DRIVER.CC (unused).

14 years agoFix use of va_copy() on MSVC.
Ryan C. Gordon [Fri, 14 May 2010 15:52:02 +0000 (11:52 -0400)]
Fix use of va_copy() on MSVC.

14 years agoFixed compiler warning.
Ryan C. Gordon [Fri, 14 May 2010 15:49:22 +0000 (11:49 -0400)]
Fixed compiler warning.

14 years agoMaybe fix some MSVC build issues.
Ryan C. Gordon [Fri, 14 May 2010 15:46:59 +0000 (11:46 -0400)]
Maybe fix some MSVC build issues.

14 years agoLighting code cleanup.
Ryan C. Gordon [Fri, 14 May 2010 15:43:54 +0000 (11:43 -0400)]
Lighting code cleanup.

14 years agoRestored old OpenGL headers; hopefully this makes it work on MSVC
Neal Gompa [Fri, 14 May 2010 07:20:12 +0000 (02:20 -0500)]
Restored old OpenGL headers; hopefully this makes it work on MSVC

14 years agoFixed conditional with configuring OpenGL to only activate with MinGW
Neal Gompa [Fri, 14 May 2010 07:14:01 +0000 (02:14 -0500)]
Fixed conditional with configuring OpenGL to only activate with MinGW

14 years agoAdded in 'stdint.h' and 'inttypes.h' files, since MSVC isn't C99 compliant
Neal Gompa [Fri, 14 May 2010 06:47:35 +0000 (01:47 -0500)]
Added in 'stdint.h' and 'inttypes.h' files, since MSVC isn't C99 compliant

14 years agoAdded in 'stdint.h' and 'inttypes.h' for MSVC as Dependencies, since MSVC isn't C99...
Neal Gompa [Fri, 14 May 2010 06:46:37 +0000 (01:46 -0500)]
Added in 'stdint.h' and 'inttypes.h' for MSVC as Dependencies, since MSVC isn't C99 compliant

14 years agoAdded in support for resource compilation in MSVC; Windows support is hopefully compl...
Neal Gompa [Fri, 14 May 2010 06:13:42 +0000 (01:13 -0500)]
Added in support for resource compilation in MSVC; Windows support is hopefully complete from the buildsystem.

14 years agoMerge.
Ryan C. Gordon [Fri, 14 May 2010 06:04:01 +0000 (02:04 -0400)]
Merge.

14 years agoRemoved unused netmessages code.
Ryan C. Gordon [Fri, 14 May 2010 06:03:22 +0000 (02:03 -0400)]
Removed unused netmessages code.

14 years agoAdded in support for MSVC building for MSVC2005 and MSVC2008; Windows support is...
Neal Gompa [Fri, 14 May 2010 05:59:50 +0000 (00:59 -0500)]
Added in support for MSVC building for MSVC2005 and MSVC2008; Windows support is hopefully complete from the builsystem.

14 years agoReplaced Constants.h defines with const ints.
Ryan C. Gordon [Fri, 14 May 2010 05:46:45 +0000 (01:46 -0400)]
Replaced Constants.h defines with const ints.

Credit for this goes to Jookia, whose patch I found here:

  http://github.com/pvtcupcakes/Lugaru/

14 years agoRemoved registration checks.
Ryan C. Gordon [Fri, 14 May 2010 05:21:35 +0000 (01:21 -0400)]
Removed registration checks.

14 years agoRemoved old OS9 code stuff.
Ryan C. Gordon [Fri, 14 May 2010 05:15:18 +0000 (01:15 -0400)]
Removed old OS9 code stuff.

14 years agoMerge.
Ryan C. Gordon [Fri, 14 May 2010 05:05:53 +0000 (01:05 -0400)]
Merge.

14 years agoRemoved 'md5.h' from CMake scripts, as it no longer exists
Neal Gompa [Fri, 14 May 2010 05:05:21 +0000 (00:05 -0500)]
Removed 'md5.h' from CMake scripts, as it no longer exists