yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-13 00:24:44 +00:00
Code Issues Projects Releases Packages Wiki Activity
1730 commits 3 branches 12 tags 37 MiB
Commit graph

274 commits

Author SHA1 Message Date
Daniel Gibson
9af707c7a0 use xrandr for x11gamma (still hacky) 2013-08-27 21:54:48 +02:00
Yamagi Burmeister
191513945f Fix printing of the "CDA is disabled" warning 2013-08-27 21:04:55 +02:00
Daniel Gibson
997be0dcd1 Fixes for SDL2 
* Fix input issues (mouse-wheel and mouse input)
* SDL2 is not default anymore in the Makefile (use WITH_SDL2=yes)
* If SDL2 is enabled, CD audio is disabled (SDL2 doesn't support
  that - use OGG/Vorbis instead)
* Small fix to make it compile with SDL1.2 again
 2013-08-26 23:55:34 +02:00
Daniel Gibson
51b7607548 SDL2 support (mostly) 
Makefile is adjusted, it compiles and works mostly, but
* For some reason (bug in SDL_GetRelativeMouseState() ?)
  mouse input doesn't work properly.. it seems to be bound
  to window borders, even if input is grabbed
* some keys can't be used anymore because there's no SDLK_*
  for them anymore (gotta find out if this is important)
* Maybe some of the changes need cleanup
 2013-08-26 00:55:31 +02:00
Yamagi Burmeister
ecc4302f94 Alter Makefile and header pathes following the refresh move 
With this change the "refresh" make target doesn't any longer exists.
It was merged into the "client" target. One will need a "make clean"
before building yQ2 after this change.
 2013-06-15 10:37:11 +02:00
Yamagi Burmeister
9af9f54f36 Remove QGL pointers 
This is a manual merge of Hecatomb Q2 ref b8952d5. Manual since git
couldn't do an automerge for some reasons... Notable changes are:
- QGL function pointers are removed, libGL is linked directly
- The OpenGL log framework is removed. It was disfunctional
- The gl_driver cvar is finaly gone
This change is currently untested on Windows and OS. There should
be no problems but a better Makefile integration of libGL is needed.
 2013-06-15 10:37:11 +02:00
Alejandro Ricoveri
d2304ebcab Makefile fix for Windows 
Refresher sources were not included for the Windows client build
 2013-06-15 10:37:11 +02:00
Alejandro Ricoveri
99dffc3efe Makefile refactoring 
WITH_RETEXTURING for OSX and Win32 (should work)
 2013-06-15 10:27:30 +02:00
Alejandro Ricoveri
a7f02a5b0e The refresher is linked statically into the client, no more 'ref_gl.so'. 2013-06-15 10:27:30 +02:00
Yamagi Burmeister
3ac88e1bda Rename snd_wav.c to wave.c to get in line with other files 2013-04-21 11:32:20 +02:00
Yamagi Burmeister
84020e4d8e Rename snd_vorbis.c to ogg.c. This name is more appropriate 2013-04-21 11:30:07 +02:00
Yamagi Burmeister
78ce1e491c Rename snd_al.c to openal.c 2013-04-21 11:19:01 +02:00
Yamagi Burmeister
e5505f90d7 Rename snd_dma.c to sound.c. yq2 never used DMA. 2013-04-20 15:09:57 +02:00
Yamagi Burmeister
cbecc5b2dc Retire snd_mem.c and integrate it into snd_dma.c and the backends 2013-04-20 09:19:59 +02:00
Yamagi Burmeister
3989ff73b2 Retire snd_mix.c and incorporate it into the SDL backend 2013-04-20 09:03:47 +02:00
Yamagi Burmeister
3e294e5288 Pass -rdynamic to the linker on Linux 
This fixes the backtrace output in the signal handler.
 2013-04-19 18:53:12 +02:00
Joshua Scoggins
24d8f2c0ff Added ia64 to the Makefile under the arch check 2012-11-30 20:22:38 -08:00
Yamagi Burmeister
2246ba80a3 Switch App bundle build on by default and remove unneccesary statement 2012-11-18 10:50:55 +01:00
svdijk
823753dec9 Some minor restructuring and cleanup. 2012-11-07 21:15:18 +01:00
svdijk
63e7855ab7 Makefile whitespace fixes. 2012-11-05 21:33:39 +01:00
Yamagi Burmeister
ba10009aa5 Add support for Mac OS X 
These are the code changes and Makefile changes necessary to build and
run Yamagi Quake II on Max OS X. OS X 10.6 or higher is required, older
version may work but we cannot guarantee it. The documentation will be
added in another commit. This patch was contributed by W. Beser, I made
only some small cosmetical changes.
 2012-09-14 11:21:02 +02:00
Yamagi Burmeister
67fb773a78 Mention OpenBSD in the Makefile, clarify why we reject 64 bit builds on Windows 2012-08-22 17:58:00 +02:00
Jonathan Gray
1f9d6084b6 OpenBSD port 2012-08-18 09:53:03 +02:00
Yamagi Burmeister
8d0dfd2c30 Merge vid.c into 1 generic file 2012-08-01 16:54:09 +02:00
Yamagi Burmeister
f89bb3265e Combine qgl.c glwindow.h into one generic file 2012-08-01 15:51:39 +02:00
Yamagi Burmeister
e5f70fcf40 Merge qal.c into one generic file for all platforms 
To archive this, 3 new functions Sys_GetProcAddress(), Sys_LoadLibrary()
and Sys_FreeLibrary() were added to abstract the library loading code
into a platform independend API.
 2012-08-01 14:54:18 +02:00
Yamagi Burmeister
399c581f06 Move src/windows to src/backends/windows 2012-08-01 14:12:05 +02:00
Yamagi Burmeister
3fb8492398 Move src/unix to src/backends/unix 2012-08-01 13:58:10 +02:00
Yamagi Burmeister
c5bf1e8c93 Move src/sdl to src/backends/sdl 2012-08-01 13:47:32 +02:00
Yamagi Burmeister
b1ddebf552 Update "unzip" to version 1.01h 
This update brings some minor bugfixes, especially for big endian
platforms and LLP64 systems like 64 bit Windows. The support for
encrypted ZIP archives was removed. This is a no-op change, since
there was no way to pass the password to uncrypt. Without the
uncrypt code Yamagi Quake II can be distributed in some countries
with special laws for cryptographic software. The LICENSE was
updated to the most recent version of the INFO-ZIP license.
 2012-07-21 12:02:39 +02:00
Yamagi Burmeister
7ac71db523 Merge branch 'cleanup' 
Conflicts:
	src/common/header/common.h
	src/common/header/shared.h
	src/common/misc.c
	src/unix/main.c
	src/unix/system.c
 2012-07-09 14:35:37 +02:00
Yamagi Burmeister
c80954a65e Remove support for qhost 
qhost was a proprietery management application for Quake II dedicated
servers. Since we don't know if the code is still working and most
likely no one uses it anymore, remove it. This war requested by Daniel.
 2012-06-22 09:06:27 +02:00
Yamagi Burmeister
060235e7dd Merge branch 'windows' into cleanup 
Conflicts:
	src/common/filesystem.c
	src/sdl/input.c
	src/sdl/refresh.c
	src/unix/system.c
 2012-06-11 11:21:16 +02:00
Yamagi Burmeister
1f6d0282ee Add an application icon for Windows 
The Windows icon is embedded into the executable. It's the same as under
Unix platforms, just converted into .ico.
 2012-06-11 11:13:10 +02:00
Yamagi Burmeister
ac6748e7d2 Merge the collision model back into one file 2012-06-07 15:04:45 +02:00
Yamagi Burmeister
d12f0c642f Recombine the message handling back into one file 2012-06-07 14:33:09 +02:00
Yamagi Burmeister
e0faf784a6 Move stuff from common/common/ to common/ 2012-06-07 13:54:08 +02:00
Yamagi Burmeister
56aff1dc89 Recombine the command parser in one file 
Spliting it into several files seemed logical but in retrospect it was
a bad idea, unnecessary complicating the code.
 2012-06-07 13:35:33 +02:00
Yamagi Burmeister
3de98e3b7b Add a comment for WITH_SYSTEMWIDE under Windows 2012-06-05 11:12:23 +02:00
Yamagi Burmeister
e5bc9d08ec No console window for the client 2012-06-05 11:02:48 +02:00
Yamagi Burmeister
bf590cbba5 Clean up the Makefile 2012-06-05 10:37:34 +02:00
Yamagi Burmeister
67a147014a Reenable retexturing 2012-06-05 10:06:13 +02:00
Yamagi Burmeister
d1008a564d Port OpenAL to Windows and enable it by default 2012-06-05 09:57:30 +02:00
Yamagi Burmeister
7b01ac3452 Fix build under !Windows 2012-06-04 14:07:32 +02:00
Yamagi Burmeister
7c41b66821 Merge branch 'windows' of github.com:yquake2/yquake2 into windows 
Conflicts:
	Makefile
	TODO
	src/windows/header/winquake.h
	src/windows/system.c
 2012-06-04 14:04:11 +02:00
Yamagi Burmeister
a8b9183664 Build all targets on Windows 2012-06-04 12:47:28 +02:00
Yamagi Burmeister
51869fbc9d Add qgl.c for Windows 
This file was taken from ioQuake2 and altered for inclusion in Yamagi
Quake II.
 2012-06-04 12:42:55 +02:00
Yamagi Burmeister
6f9b75f89f More changes to the Makefile for the refresher 2012-06-04 12:02:05 +02:00
Yamagi Burmeister
e652f32a64 Makefile support for the refresher under Windows 2012-06-04 11:49:11 +02:00
Yamagi Burmeister
2672495c3f Build the client by default under Windows 2012-06-04 11:15:53 +02:00
Yamagi Burmeister
86f89fce22 Implement vid.c for Windows 
This file was taken from ioQuake2 and modified to work with Yamagi Quake
II. It may not be perfect yet, but should be good enough to the client
up and running.
 2012-06-04 11:09:43 +02:00
Yamagi Burmeister
a4609fc42b Use correct include pathes to SDL under Windows 2012-06-04 10:02:01 +02:00
Yamagi Burmeister
93f518e7b5 Initial Makefile suppport for the client under Windows 2012-06-04 09:51:17 +02:00
Yamagi Burmeister
65a7ac596d Port the game.so to Windows 
The game.so hasn't any platform depended code, therefore this
rudimentary port can be done with Makefile magic. There are
some TODOs left, they'll be resolved later on.
 2012-06-04 09:32:35 +02:00
Yamagi Burmeister
1a3b54b27e Move glob.c and glob.h to common 
We need glob_match() for Windows
 2012-06-04 09:13:30 +02:00
Yamagi Burmeister
9618483d48 Add linker flags for Windows 2012-06-04 09:13:30 +02:00
Yamagi Burmeister
f3bead4f6b Add Windows network functions in network.c 
This file was taken from ioQuake2 and refactored to match Yamagi Quake
II. It would be nice to have IPv6 support and to remove the old IPX
cruft, but that happen now.
 2012-06-04 09:13:30 +02:00
Yamagi Burmeister
05f7e37c77 Add memory handling functions in mem.c 
This code was taken from ioQuake2, refactored into an own file and
altered for the inclusion in Yamagi Quake II.
 2012-06-04 09:13:30 +02:00
Yamagi Burmeister
d80b8e7d37 Alter the Makefile again to bootstrap Windows 
This version of the Makefile adds a horrible workaround for Windows
broken "mkdir". It'll be resolved before the first CFT is released.
 2012-06-04 09:13:30 +02:00
Yamagi Burmeister
0eb042555b Add conproc.c and the coresponding header 
conproc.c implements support functions for the console windows used by
the dedicated server. It was taken from ioQuake2 and cleaned up for the
inclusion in Yamagi Quake II.
 2012-06-04 09:13:30 +02:00
Yamagi Burmeister
09fc72fb60 Add preliminary support for Windows to the Makefile 
This is incomplete but should be sufficent to build q2ded on Windows as
soon as the sourcefile are added.
 2012-06-04 09:13:29 +02:00
Yamagi Burmeister
99520d1331 Implemented the new random generator in shared.h instead of common.h 2012-06-04 09:13:29 +02:00
Yamagi Burmeister
056f4d287b Add rand.c, an implementation of G. Marsaglia KISS PRNG 2012-06-04 09:13:29 +02:00
Yamagi Burmeister
c5cdccb97f Move glob.c and glob.h to common 
We need glob_match() for Windows
 2012-06-03 15:26:31 +02:00
Yamagi Burmeister
a8e402705a Add linker flags for Windows 2012-06-03 15:20:59 +02:00
Yamagi Burmeister
5133dad7a2 Add Windows network functions in network.c 
This file was taken from ioQuake2 and refactored to match Yamagi Quake
II. It would be nice to have IPv6 support and to remove the old IPX
cruft, but that happen now.
 2012-06-03 15:07:36 +02:00
Yamagi Burmeister
6e2bbf2f44 Add memory handling functions in mem.c 
This code was taken from ioQuake2, refactored into an own file and
altered for the inclusion in Yamagi Quake II.
 2012-06-03 14:08:31 +02:00
Yamagi Burmeister
d43e10b1b0 Alter the Makefile again to bootstrap Windows 
This version of the Makefile adds a horrible workaround for Windows
broken "mkdir". It'll be resolved before the first CFT is released.
 2012-06-03 13:06:48 +02:00
Yamagi Burmeister
75425ce987 Add conproc.c and the coresponding header 
conproc.c implements support functions for the console windows used by
the dedicated server. It was taken from ioQuake2 and cleaned up for the
inclusion in Yamagi Quake II.
 2012-06-03 12:14:05 +02:00
Yamagi Burmeister
72145227d7 Add preliminary support for Windows to the Makefile 
This is incomplete but should be sufficent to build q2ded on Windows as
soon as the sourcefile are added.
 2012-06-03 11:18:26 +02:00
Yamagi Burmeister
a0ccf86660 Implemented the new random generator in shared.h instead of common.h 2012-06-02 11:32:45 +02:00
Yamagi Burmeister
97f7ba0610 Add rand.c, an implementation of G. Marsaglia KISS PRNG 2012-06-02 10:56:40 +02:00
Christoph Mallon
3c7539b417 Simplify the test whether the architecture is supported. 2012-04-30 08:35:40 +02:00
Christoph Mallon
2867c00d61 Do not overwrite CC. 2012-04-30 08:35:10 +02:00
Christoph Mallon
ab034114b4 Whitespace fixes. 2012-04-30 08:25:59 +02:00
Yamagi Burmeister
dc3e2bd3b4 Mention openal-soft in the Makefile 2012-04-29 16:16:44 +02:00
Daniel Gibson
8612950e0a Make SYSTEMWIDE options in Makefile configurable from Console 
With the WITH_SYSTEMWIDE (yes/no) and WITH_SYSTEMDIR (actual path) options
 2012-04-29 15:54:15 +02:00
Daniel Gibson
ebccfc63df Remove need to link against libopenal 
libopenal is loaded with dlopen() and for all used alBla and alcBla functions
there are function pointers (just like thee qgl stuff for OpenGL).
Thus there's no need to link against libopenal on compile-time.

There were a few occurences of "normal" openal functions (al* instead of qal*)
- they are fixed now.

This allows to use a yquake2 version compield with WITH_OPENAL=yes to be used
on systems that have no libopenal installed (the standard SDL sound backend
will be used then).
 2012-04-29 15:24:14 +02:00
Daniel Gibson
669a78de12 Compiletime options in Makefile overwritable from console 
And a small fix that shuts up a compiler warning
 2012-04-28 19:38:07 +00:00
Yamagi Burmeister
905b31a918 Integrate OpenAL into the options system 2012-04-25 10:09:30 +00:00
Yamagi Burmeister
2c3c203097 Merge out new options framework from the trunk 2012-04-25 09:57:17 +00:00
Yamagi Burmeister
a00ce8dee3 Typos :/ 2012-04-25 09:32:36 +00:00
Yamagi Burmeister
3d84b624c7 Allow the setting of user defined options in the Makefile 2012-04-25 09:32:11 +00:00
Yamagi Burmeister
03015a686b Hide music playback from CD behind CDA 2012-04-25 08:53:25 +00:00
Yamagi Burmeister
f836cef4c4 Rename qal_api.c to unix/qal.c and qal_api.h to unix/header/qal.h. 
Both files are platform dependend and won't work on non unixoid
platforms.
 2012-04-24 14:20:01 +00:00
Yamagi Burmeister
4ff4bf09e9 Merge the trunk back into the openal branch. 2012-04-23 14:09:33 +00:00
Daniel Gibson
f4d5040a73 Add OpenAL stuff to Makefile, make it compile and work (no streaming sound yet) 
It works \o/
It's still hacky so it needs more work.
And streaming sound (OGG music, sound from videos) is still missing.
 2012-04-22 00:24:50 +00:00
Yamagi Burmeister
df0347bde0 Do not link the X11 libs used for setting the gamma 2012-04-19 13:25:51 +00:00
Yamagi Burmeister
179ec5538e Move strlwr() into shared.c and don't link main.c into the refresher 2012-04-19 13:22:50 +00:00
Yamagi Burmeister
a7aa1e93c0 Rename misc.c to main.c 2012-04-19 13:14:03 +00:00
Yamagi Burmeister
b6bb97e223 - add support for big endian CPUs 
- enable the build on SPARC64
- add runtime-requirements for SPARC64
- bump version number to 4.10
 2012-04-16 06:54:48 +00:00
Yamagi Burmeister
9edf27f103 Reactor yesterdays work 2012-03-12 08:11:22 +00:00
Daniel Gibson
441c988b31 - Add JPEG support 
- Refactor call to LoadTGA so it returns image_t * directly
 2012-03-11 16:50:57 +00:00
Yamagi Burmeister
7358bf50e9 Spelling 2012-02-09 17:01:29 +00:00
Yamagi Burmeister
af5cf7cb50 Fix for Ubuntu (again) not linking libxxvm87dga... 2012-01-07 16:19:10 +00:00
Yamagi Burmeister
ca7445e001 Fix build on Ubuntu 2011-12-26 08:48:33 +00:00
Yamagi Burmeister
9edbca1747 Support for verbose build via "gmake VERBOSE=1" 2011-12-08 11:15:38 +00:00
Yamagi Burmeister
60a2ca3eb9 Add a signal handler to the client 2011-10-10 07:51:16 +00:00
Yamagi Burmeister
3fced8ba12 Don't link common/shared/flash.c into the dedicated server 2011-10-09 17:12:03 +00:00
Yamagi Burmeister
24b5f7fe97 Remove ctf/ from Makefile and simplify it. 2011-10-09 16:55:23 +00:00