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

14 years agoRemoved non-SDL codepaths.
Ryan C. Gordon [Fri, 14 May 2010 05:05:09 +0000 (01:05 -0400)]
Removed non-SDL codepaths.

14 years agoRemoved MD5 sources.
Ryan C. Gordon [Fri, 14 May 2010 04:57:48 +0000 (00:57 -0400)]
Removed MD5 sources.

14 years agoFixed Xcode project.
Ryan C. Gordon [Fri, 14 May 2010 04:52:45 +0000 (00:52 -0400)]
Fixed Xcode project.

14 years agoImplemented isFocused().
Ryan C. Gordon [Fri, 14 May 2010 04:46:59 +0000 (00:46 -0400)]
Implemented isFocused().

14 years agoRemoved leftover DevIL support code.
Ryan C. Gordon [Fri, 14 May 2010 04:42:56 +0000 (00:42 -0400)]
Removed leftover DevIL support code.

14 years agomerge
Ryan C. Gordon [Fri, 14 May 2010 04:28:47 +0000 (00:28 -0400)]
merge

14 years agoFixed some strrchr compiler warnings.
Ryan C. Gordon [Fri, 14 May 2010 04:26:43 +0000 (00:26 -0400)]
Fixed some strrchr compiler warnings.

14 years agoApplied patch from issue #4
Harley Laue [Fri, 14 May 2010 04:09:30 +0000 (23:09 -0500)]
Applied patch from issue #4

14 years agoFixed another printf() format string issue.
Ryan C. Gordon [Fri, 14 May 2010 03:32:48 +0000 (23:32 -0400)]
Fixed another printf() format string issue.

14 years agoFixed printf() formatting string.
Ryan C. Gordon [Fri, 14 May 2010 03:30:32 +0000 (23:30 -0400)]
Fixed printf() formatting string.

14 years agoFixed SDL linkage and internal libjpeg linkage breaks
Neal Gompa [Fri, 14 May 2010 03:26:06 +0000 (22:26 -0500)]
Fixed SDL linkage and internal libjpeg linkage breaks

14 years agoFixed paths for MinGW SDL libraries
Neal Gompa [Fri, 14 May 2010 02:46:12 +0000 (21:46 -0500)]
Fixed paths for MinGW SDL libraries

14 years agoReverted internal SDL lib configuration modification, made the problem worse
Neal Gompa [Fri, 14 May 2010 01:43:09 +0000 (20:43 -0500)]
Reverted internal SDL lib configuration modification, made the problem worse

14 years agoModified internal SDL lib configuration to properly set up; Added #undef/#define...
Neal Gompa [Fri, 14 May 2010 01:00:42 +0000 (20:00 -0500)]
Modified internal SDL lib configuration to properly set up; Added #undef/#define to 'openal_wrapper.h' to fix building on Windows

14 years agoFixed CMake detection of internal libs
Neal Gompa [Fri, 14 May 2010 00:10:27 +0000 (19:10 -0500)]
Fixed CMake detection of internal libs

14 years agoMerged
Neal Gompa [Fri, 14 May 2010 00:07:17 +0000 (19:07 -0500)]
Merged

14 years agoSomething screwy with internal headers, added headers from OpenAL-Soft
Neal Gompa [Fri, 14 May 2010 00:06:55 +0000 (19:06 -0500)]
Something screwy with internal headers, added headers from OpenAL-Soft

14 years agoSomething screwy with internal headers, replaced them with headers from OpenAL-Soft
Neal Gompa [Fri, 14 May 2010 00:05:44 +0000 (19:05 -0500)]
Something screwy with internal headers, replaced them with headers from OpenAL-Soft

14 years agoMerged
Harley Laue [Thu, 13 May 2010 23:50:20 +0000 (18:50 -0500)]
Merged

14 years agoFixed CMake so Force internal actually has a chance at working correctly
Harley Laue [Thu, 13 May 2010 23:49:02 +0000 (18:49 -0500)]
Fixed CMake so Force internal actually has a chance at working correctly

14 years agoMissed an fmod header
Harley Laue [Thu, 13 May 2010 23:48:38 +0000 (18:48 -0500)]
Missed an fmod header

14 years agoFixed install paths in CMake so that the compiled binary is properly installed
Neal Gompa [Thu, 13 May 2010 23:46:45 +0000 (18:46 -0500)]
Fixed install paths in CMake so that the compiled binary is properly installed

14 years agoFixed includes in 'openal_wrapper.h' to fit with CMake's detection scheme
Neal Gompa [Thu, 13 May 2010 23:34:13 +0000 (18:34 -0500)]
Fixed includes in 'openal_wrapper.h' to fit with CMake's detection scheme

14 years agoFixed error in handling Lugaru's default Windows install prefix
Neal Gompa [Thu, 13 May 2010 23:26:30 +0000 (18:26 -0500)]
Fixed error in handling Lugaru's default Windows install prefix

14 years agoSeems there were a few things I forgot when I removed FMod. Should be about it
Harley Laue [Thu, 13 May 2010 23:25:02 +0000 (18:25 -0500)]
Seems there were a few things I forgot when I removed FMod. Should be about it

14 years agoOops, forgot to actually pre-define the OpenAL internal library configuration
Neal Gompa [Thu, 13 May 2010 23:23:30 +0000 (18:23 -0500)]
Oops, forgot to actually pre-define the OpenAL internal library configuration

14 years agoOops, forgot to actually commit the MinGW OpenAL libs themselves...
Neal Gompa [Thu, 13 May 2010 23:15:36 +0000 (18:15 -0500)]
Oops, forgot to actually commit the MinGW OpenAL libs themselves...

14 years agoMerged
Neal Gompa [Thu, 13 May 2010 23:14:24 +0000 (18:14 -0500)]
Merged

14 years agoAdded internal OpenAL libs for MinGW on Windows; MSVC internal libs to come soon
Neal Gompa [Thu, 13 May 2010 23:13:24 +0000 (18:13 -0500)]
Added internal OpenAL libs for MinGW on Windows; MSVC internal libs to come soon

14 years agoForgot to update CMake... again...
Harley Laue [Thu, 13 May 2010 22:51:53 +0000 (17:51 -0500)]
Forgot to update CMake... again...

14 years agoMerged FMod changes in
Harley Laue [Thu, 13 May 2010 22:50:33 +0000 (17:50 -0500)]
Merged FMod changes in

14 years agoRemoved FMod from the source.
Harley Laue [Thu, 13 May 2010 22:41:02 +0000 (17:41 -0500)]
Removed FMod from the source.

* This isn't the best fix yet, but it works and should be a good starting point
  in the future.

14 years agoAdded 'mesa_wgl.h' to make OpenGL headers happy on Windows
Neal Gompa [Thu, 13 May 2010 22:09:27 +0000 (17:09 -0500)]
Added 'mesa_wgl.h' to make OpenGL headers happy on Windows

14 years agoAdded win32 SDL libraries for MinGW and MSVC; Modified CMake scripts to properly...
Neal Gompa [Thu, 13 May 2010 22:03:23 +0000 (17:03 -0500)]
Added win32 SDL libraries for MinGW and MSVC; Modified CMake scripts to properly install 'SDL.dll' to install prefix

14 years agoGet rid of dupicated code in the text routines.
Christian Ohm [Thu, 13 May 2010 18:01:23 +0000 (20:01 +0200)]
Get rid of dupicated code in the text routines.

14 years agoFixed dependencies, made them optional (so you can override system libs).
Ryan C. Gordon [Thu, 13 May 2010 20:06:37 +0000 (16:06 -0400)]
Fixed dependencies, made them optional (so you can override system libs).

14 years agoMerge.
Ryan C. Gordon [Thu, 13 May 2010 18:45:07 +0000 (14:45 -0400)]
Merge.

14 years agoReworked CMakeLists.txt.
Ryan C. Gordon [Thu, 13 May 2010 18:43:12 +0000 (14:43 -0400)]
Reworked CMakeLists.txt.

Now it is all contained in one file, instead of spread over subdirs,
 and dependencies will fall back to internal versions if they aren't found
 on the system.

This work is still in progress!

14 years agoRemove 'wincompat.h' from CMake scripts to let it build again
Neal Gompa [Thu, 13 May 2010 16:38:19 +0000 (11:38 -0500)]
Remove 'wincompat.h' from CMake scripts to let it build again

14 years agowincompat.h doesn't seem to be used, and it has a questionable copyright
Harley Laue [Thu, 13 May 2010 16:31:00 +0000 (11:31 -0500)]
wincompat.h doesn't seem to be used, and it has a questionable copyright
notice.

* It's most likely ok, but we don't need it really either way

14 years agoCleaned up the stricmp() nonsense.
Ryan C. Gordon [Thu, 13 May 2010 14:57:49 +0000 (10:57 -0400)]
Cleaned up the stricmp() nonsense.

14 years agoFixed Mac builds with makefile.old.
Ryan C. Gordon [Thu, 13 May 2010 14:43:47 +0000 (10:43 -0400)]
Fixed Mac builds with makefile.old.

14 years agoLooks like UNIX also needs the MacCompatibility.cpp for ConvertFileName.
Harley Laue [Thu, 13 May 2010 13:42:55 +0000 (08:42 -0500)]
Looks like UNIX also needs the MacCompatibility.cpp for ConvertFileName.
* We may look into a better way of doing this in the future...

14 years agoKill Windows line endings in the middle of the file
Harley Laue [Thu, 13 May 2010 13:37:53 +0000 (08:37 -0500)]
Kill Windows line endings in the middle of the file

14 years agoMade fixes for includes in 'openal_wrapper.cpp' and tweaked the CMake scripts a bit
Neal Gompa [Thu, 13 May 2010 08:14:35 +0000 (03:14 -0500)]
Made fixes for includes in 'openal_wrapper.cpp' and tweaked the CMake scripts a bit

14 years agoMore fixes to 'OpenGL_Windows.cpp' to work on Linux and Windows
Neal Gompa [Thu, 13 May 2010 07:51:26 +0000 (02:51 -0500)]
More fixes to 'OpenGL_Windows.cpp' to work on Linux and Windows

14 years agoFixed 'OpenGL_Windows.cpp' to work on Linux and Windows; Fixed 'Sources/CMakeLists...
Neal Gompa [Thu, 13 May 2010 07:35:07 +0000 (02:35 -0500)]
Fixed 'OpenGL_Windows.cpp' to work on Linux and Windows; Fixed 'Sources/CMakeLists.txt' for Windows build

14 years agofixed header include for Windows in 'openal_wrapper.cpp'
Neal Gompa [Thu, 13 May 2010 07:11:05 +0000 (02:11 -0500)]
fixed header include for Windows in 'openal_wrapper.cpp'

14 years agoFixed a typo in setting OpenAL include directory paths
Neal Gompa [Thu, 13 May 2010 07:07:50 +0000 (02:07 -0500)]
Fixed a typo in setting OpenAL include directory paths