]>
git.jsancho.org Git - lugaru.git/log
Ryan C. Gordon [Thu, 13 May 2010 18:45:07 +0000 (14:45 -0400)]
Merge.
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!
Neal Gompa [Thu, 13 May 2010 16:38:19 +0000 (11:38 -0500)]
Remove 'wincompat.h' from CMake scripts to let it build again
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
Ryan C. Gordon [Thu, 13 May 2010 14:57:49 +0000 (10:57 -0400)]
Cleaned up the stricmp() nonsense.
Ryan C. Gordon [Thu, 13 May 2010 14:43:47 +0000 (10:43 -0400)]
Fixed Mac builds with makefile.old.
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...
Harley Laue [Thu, 13 May 2010 13:37:53 +0000 (08:37 -0500)]
Kill Windows line endings in the middle of the file
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
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
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
Neal Gompa [Thu, 13 May 2010 07:11:05 +0000 (02:11 -0500)]
fixed header include for Windows in 'openal_wrapper.cpp'
Neal Gompa [Thu, 13 May 2010 07:07:50 +0000 (02:07 -0500)]
Fixed a typo in setting OpenAL include directory paths
Ryan C. Gordon [Thu, 13 May 2010 07:05:00 +0000 (03:05 -0400)]
Fixed command key sticking (where Mac users might quit game by accident).
Thanks to Kao Felix for the fix!
Ryan C. Gordon [Thu, 13 May 2010 06:44:41 +0000 (02:44 -0400)]
Some Windows build fixes.
Ryan C. Gordon [Thu, 13 May 2010 05:25:44 +0000 (01:25 -0400)]
Merge.
Neal Gompa [Thu, 13 May 2010 05:08:25 +0000 (00:08 -0500)]
Removed superfluous files from CMakeLists source tree listing
Ryan C. Gordon [Thu, 13 May 2010 04:56:34 +0000 (00:56 -0400)]
Removed some commented code that isn't coming back.
Ryan C. Gordon [Thu, 13 May 2010 04:55:13 +0000 (00:55 -0400)]
Removed some unneeded source files.
Ryan C. Gordon [Thu, 13 May 2010 04:49:03 +0000 (00:49 -0400)]
Merge.
Neal Gompa [Thu, 13 May 2010 04:37:25 +0000 (23:37 -0500)]
Added a conditional to fix for Windows
Ryan C. Gordon [Thu, 13 May 2010 04:25:48 +0000 (00:25 -0400)]
Fixed makemac.sh
Neal Gompa [Thu, 13 May 2010 04:09:20 +0000 (23:09 -0500)]
Removed redundant OpenGL utility function definition
Ryan C. Gordon [Thu, 13 May 2010 04:08:21 +0000 (00:08 -0400)]
Make RUNDIR be "." in makefile.old.
...since you have to run below the Data directory.
Ryan C. Gordon [Thu, 13 May 2010 04:06:46 +0000 (00:06 -0400)]
Updated Xcode project for new dependencies.
Ryan C. Gordon [Thu, 13 May 2010 03:44:34 +0000 (23:44 -0400)]
Updated makefile.old with the new dependencies stuff.
Ryan C. Gordon [Thu, 13 May 2010 03:41:54 +0000 (23:41 -0400)]
Added a basic libjpeg config header.
Neal Gompa [Thu, 13 May 2010 03:16:28 +0000 (22:16 -0500)]
Fixed 'head' define to C++ style constant to fix breakage with zlib
Ryan C. Gordon [Thu, 13 May 2010 02:24:44 +0000 (22:24 -0400)]
Moved prebuilt Mac OS X SDL libs to Dependencies.
Ryan C. Gordon [Thu, 13 May 2010 02:22:46 +0000 (22:22 -0400)]
Upgraded libvorbis from 1.0.1 to 1.3.1 and moved it to Dependencies.
Ryan C. Gordon [Thu, 13 May 2010 02:21:19 +0000 (22:21 -0400)]
Upgraded libogg from 1.0 to 2.0 and moved it to Dependencies.
Ryan C. Gordon [Thu, 13 May 2010 02:20:08 +0000 (22:20 -0400)]
Upgraded libpng from 1.2.8 to 1.4.1 and moved it to Dependencies.
Ryan C. Gordon [Thu, 13 May 2010 01:39:48 +0000 (21:39 -0400)]
Upgraded zlib from 1.2.3 to 1.2.5 and moved it to Dependencies.
Ryan C. Gordon [Thu, 13 May 2010 01:38:41 +0000 (21:38 -0400)]
Upgraded libjpeg from 6b to 8a and moved it to Dependencies.
Neal Gompa [Thu, 13 May 2010 01:38:35 +0000 (20:38 -0500)]
Added extern structure to 'OpenGL_Windows.cpp' and fixed header inclusion order
Ryan C. Gordon [Thu, 13 May 2010 01:29:25 +0000 (21:29 -0400)]
Moving OpenAL into dependencies.
Ryan C. Gordon [Thu, 13 May 2010 01:28:55 +0000 (21:28 -0400)]
Moving GL headers into Dependencies.
Ryan C. Gordon [Thu, 13 May 2010 01:28:32 +0000 (21:28 -0400)]
Removing GL headers we don't need.
Ryan C. Gordon [Thu, 13 May 2010 01:26:47 +0000 (21:26 -0400)]
Moving SDL12 headers into Dependencies.
Ryan C. Gordon [Thu, 13 May 2010 01:26:22 +0000 (21:26 -0400)]
Moving GLU sources into a Dependencies directory.
Neal Gompa [Thu, 13 May 2010 01:18:49 +0000 (20:18 -0500)]
Merged changes for 'CMakeLists.txt'
Neal Gompa [Thu, 13 May 2010 01:17:36 +0000 (20:17 -0500)]
Huge fix in 'WinInput.cpp'! Added conditional code for key mappings
Harley Laue [Thu, 13 May 2010 01:15:36 +0000 (20:15 -0500)]
Oops, BZip2 isn't really a dependency!
Neal Gompa [Thu, 13 May 2010 00:49:24 +0000 (19:49 -0500)]
More Windows include fixes in 'OpenGL_Windows.cpp' and some in 'TGALoader.cpp'
Neal Gompa [Thu, 13 May 2010 00:38:56 +0000 (19:38 -0500)]
Disabled inclusion of 'vld.h' in 'OpenGL_Windows.cpp' because we don't need Visual Leak Detector
Neal Gompa [Thu, 13 May 2010 00:08:00 +0000 (19:08 -0500)]
Disabled inclusion of unneeded Windows header files in 'gamegl.h'
Neal Gompa [Wed, 12 May 2010 23:29:52 +0000 (18:29 -0500)]
Switching to default branch and closing cmake branch; Merged with Icculus's repository
Neal Gompa [Wed, 12 May 2010 23:17:19 +0000 (18:17 -0500)]
Fixed Windows conditionals for building resources and OpenGL library linkage in CMake scripts; Switching to default branch
Neal Gompa [Wed, 12 May 2010 22:48:24 +0000 (17:48 -0500)]
Added Win32 conditional to CMake scripts for building on Windows
Ryan C. Gordon [Wed, 12 May 2010 22:45:27 +0000 (18:45 -0400)]
Merged latest cmake branch to default.
Neal Gompa [Wed, 12 May 2010 22:43:19 +0000 (17:43 -0500)]
Made initial fixes towards building in MinGW for 32-bit Windows
Ryan C. Gordon [Wed, 12 May 2010 22:27:07 +0000 (18:27 -0400)]
Removed Logger (it's not GPL compatible).
Ryan C. Gordon [Wed, 12 May 2010 22:25:58 +0000 (18:25 -0400)]
Added prebuilt Mac SDL libraries.
Reece Dunn [Wed, 12 May 2010 21:40:52 +0000 (22:40 +0100)]
Use const char * for string arguments to avoid deprecated conversion warnings.
Ryan C. Gordon [Thu, 13 May 2010 00:56:47 +0000 (20:56 -0400)]
Merge to unconfuse my repo.
Ryan C. Gordon [Thu, 13 May 2010 00:48:06 +0000 (20:48 -0400)]
makemac.sh updated for Data directory.
Ryan C. Gordon [Thu, 13 May 2010 00:47:46 +0000 (20:47 -0400)]
jpeglib (etc) need to be wrapped in extern "C". :/
Marcus Comstedt [Wed, 12 May 2010 22:13:57 +0000 (00:13 +0200)]
Use system g++ and SDL/OpenAL on Linux
Ryan C. Gordon [Wed, 12 May 2010 23:09:17 +0000 (19:09 -0400)]
Merge to mainline.
Ryan C. Gordon [Wed, 12 May 2010 20:50:59 +0000 (16:50 -0400)]
Merging cmake branch to the default branch.
Neal Gompa [Wed, 12 May 2010 18:46:50 +0000 (13:46 -0500)]
Updated 'FindOggVorbis.cmake' to work better on Linux (hopefully fixes Windows Ogg detection too)
Neal Gompa [Wed, 12 May 2010 05:04:20 +0000 (00:04 -0500)]
Added 'CONTENT-LICENSE.txt' with info about game asset licensing
Harley Laue [Wed, 12 May 2010 04:50:48 +0000 (23:50 -0500)]
Pulled full demo content back in so installing installs a playable game
Neal Gompa [Wed, 12 May 2010 04:46:53 +0000 (23:46 -0500)]
Added the new Windows source code files to the CMake scripts
Harley Laue [Wed, 12 May 2010 04:19:19 +0000 (23:19 -0500)]
merged
Harley Laue [Wed, 12 May 2010 04:11:51 +0000 (23:11 -0500)]
Added a couple missing Windows files
Neal Gompa [Wed, 12 May 2010 04:10:02 +0000 (23:10 -0500)]
Added support for compiling Windows *.rc files included into the CMake scripts
Neal Gompa [Wed, 12 May 2010 03:14:18 +0000 (22:14 -0500)]
Resolved merges again
Neal Gompa [Wed, 12 May 2010 03:09:34 +0000 (22:09 -0500)]
Resolved merges of FindOggVorbis.cmake and CMakeLists.txt
Neal Gompa [Wed, 12 May 2010 02:27:16 +0000 (21:27 -0500)]
Renaming old makefile to makefile.old - Indicating deprecation of makefile
Neal Gompa [Wed, 12 May 2010 02:22:23 +0000 (21:22 -0500)]
Removing Visual Studio Projects -- superseded by CMake
Neal Gompa [Wed, 12 May 2010 02:21:26 +0000 (21:21 -0500)]
Added support for 'make install' target in CMake scripts
Neal Gompa [Wed, 12 May 2010 00:42:14 +0000 (19:42 -0500)]
Added in support for the CMake module for searching for and configuring to use libvorbisfile and libogg
Harley Laue [Wed, 12 May 2010 00:12:05 +0000 (19:12 -0500)]
Find Vorbis via CMake instead of just assuming it's installed
Harley Laue [Tue, 11 May 2010 23:57:59 +0000 (18:57 -0500)]
Renamed old Makefile, updated .hgignore, and made changes to png functions to remove references to old defines
Harley Laue [Tue, 11 May 2010 21:53:46 +0000 (16:53 -0500)]
Source changes to make Linux CMake build use system libs
* I also opted to use C++'s true/false instead of #define's
Harley Laue [Tue, 11 May 2010 21:50:02 +0000 (16:50 -0500)]
Quickly created CMake to build the source
* The next commit will most likely be required to actually be able to compile
the sources correctly (or have a chance at it)
Ryan C. Gordon [Tue, 11 May 2010 16:25:50 +0000 (12:25 -0400)]
Added GPL license and headers.
Ryan C. Gordon [Tue, 11 May 2010 06:46:15 +0000 (02:46 -0400)]
Changed data dir mentioned in makefile.
Ryan C. Gordon [Tue, 11 May 2010 06:42:42 +0000 (02:42 -0400)]
Added (more or less) demo data files.
Ryan C. Gordon [Tue, 11 May 2010 06:41:40 +0000 (02:41 -0400)]
Ignore some other Xcode metadata.
Ryan C. Gordon [Tue, 11 May 2010 06:31:52 +0000 (02:31 -0400)]
Added initial Xcode project.
Ryan C. Gordon [Thu, 18 Feb 2010 15:22:01 +0000 (10:22 -0500)]
This ugly hack makes text input usable on fast systems. :(
Ryan C. Gordon [Thu, 18 Feb 2010 15:08:36 +0000 (10:08 -0500)]
Drop keyboard input if it was part of the grab or window/fullscreen toggle.
Ryan C. Gordon [Tue, 16 Feb 2010 15:43:18 +0000 (10:43 -0500)]
Don't reference glFinish() directly.
Ryan C. Gordon [Tue, 16 Feb 2010 05:54:08 +0000 (00:54 -0500)]
Fixed motion blur.
Ryan C. Gordon [Tue, 17 Nov 2009 09:03:57 +0000 (04:03 -0500)]
Force a double-buffered GL context.
Ryan C. Gordon [Tue, 17 Nov 2009 05:47:59 +0000 (00:47 -0500)]
Reworked build system to make Mac Universal Binaries correctly on one machine.
Ryan C. Gordon [Thu, 12 Nov 2009 05:42:05 +0000 (00:42 -0500)]
Implemented OPENAL_Sample_SetMinMaxDistance().
Fixes volume levels to what the original game produced, I think.
Ryan C. Gordon [Sun, 8 Nov 2009 08:22:11 +0000 (03:22 -0500)]
Make Apple-Q work like the Carbonized version.
Ryan C. Gordon [Sun, 8 Nov 2009 07:56:44 +0000 (02:56 -0500)]
Allow user to set any reasonable resolution.
Ryan C. Gordon [Sun, 8 Nov 2009 07:56:14 +0000 (02:56 -0500)]
Try fallbacks if we can't set video mode.
Ryan C. Gordon [Sun, 8 Nov 2009 06:29:19 +0000 (01:29 -0500)]
Allow Mac OS X builds to quit with Apple-Q hotkey.
Ryan C. Gordon [Sun, 8 Nov 2009 06:28:58 +0000 (01:28 -0500)]
Mac OS X builds sanity check.
Ryan C. Gordon [Sun, 8 Nov 2009 05:38:40 +0000 (00:38 -0500)]
Another regcode fix.
Ryan C. Gordon [Sun, 8 Nov 2009 03:45:16 +0000 (22:45 -0500)]
Use the correct registration string for a given platform.
Ryan C. Gordon [Tue, 3 Nov 2009 17:09:44 +0000 (12:09 -0500)]
Removed unnecessary std::vectors.
Static constructors were crashing on Tiger.
Ryan C. Gordon [Tue, 3 Nov 2009 06:48:57 +0000 (01:48 -0500)]
Fixed audio playback on PowerPC systems.
Ryan C. Gordon [Tue, 3 Nov 2009 06:37:38 +0000 (01:37 -0500)]
Fixed data loading on PowerPC builds compiled with GCC.
(sizeof (bool) == 4 here.)
Ryan C. Gordon [Sun, 1 Nov 2009 21:41:49 +0000 (16:41 -0500)]
chdir to base of app bundle on the Mac.