Commit graph

479 commits

Author SHA1 Message Date
sezero
7851cda724 just properly use (u)intptr_t where necessary and don't do the cheap hack
of using size_t instead of it.  include stdint.h in q_stdinc.h for it.
for Visual Studio earlier than version 2010, use the header provided by
the msinttypes project.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@439 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-04-01 14:55:45 +00:00
sezero
3e894adf1b updated README files. added Misc/README.music as a new reference document.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@438 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-03-31 09:50:24 +00:00
kristianduske
d85741e19c Removed unused XCode user files.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@436 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-03-28 15:17:30 +00:00
kristianduske
ba47bf9ae9 Added fat binary for libmpg123 v 1.12.1 with support for ppc, i386 and x86_64.
Adapted paths for libraries within the dylibs.
Added header files for ogg, vorbis and libmpg123 to MacOSX build to avoid people having to get ahold of the music decorders when they want to build on OS X.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@435 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-03-28 14:28:18 +00:00
sezero
2f8cc178a9 added native sound code snd_alsa.c, snd_oss.c, snd_win.c and for future
reference and/or probable use.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@434 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-03-28 11:37:44 +00:00
kristianduske
877c63a9d3 Added vorbis fat binaries to SVN to avoid future headaches.
Adapted XCode project so that the dylibs are copied into the App bundle (untested).

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@433 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-03-28 11:16:43 +00:00
kristianduske
5ccef9778c Launcher window is now centered and will launch Quake when Return key is pressed.
Enabled PPC builds.
All OS X builds are without music support for now.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@432 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-03-28 10:04:08 +00:00
kristianduske
71465aedc7 Launcher window is now centered and will launch Quake when Return key is pressed.
Enabled PPC builds.
All OS X builds are without music support for now.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@431 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-03-28 10:03:28 +00:00
sezero
17df4c702d minor documentation updates, final touches for 0.85.4.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@430 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-03-27 14:00:31 +00:00
stevenaaus
e9d05ae12a Trivial doco updates
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@429 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-03-05 10:20:00 +00:00
sezero
49f0fc353a * gl_model.c: relaxed searchpath requirements for external lit file
loading: they are now allowed from the same game directory as the
  map itself as well as from a searchpath with a higher priority.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@428 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-03-01 18:00:30 +00:00
sezero
a8c685d391 cvar'ize the game loop throttling by adding the new sys_throttle with
a default value of 0.02.  changing its value to 0 disables throttling.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@427 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-02-27 07:05:18 +00:00
sezero
5f858ac355 recopiled windows mpg123 libraries with debug/error/warning console messages disabled
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@426 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-02-24 10:01:03 +00:00
sezero
c03be37a37 * Windows/codecs: update libmpg123 header, import libraries and dlls
to version 1.13.2.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@425 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-02-23 10:27:38 +00:00
sezero
50d5076443 snd_mix.c, minor cleanup: eliminated stupid multiple casting in SND_PaintChannelFrom8(),
added braces to the inner for loop in SND_InitScaletable().

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@424 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-02-21 18:03:35 +00:00
sezero
781d85bba2 spelling fixes from Sander
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@423 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-02-18 14:00:28 +00:00
sezero
cee96e480f re-diff'ed the user directories patch
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@422 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-02-18 14:00:13 +00:00
sezero
3ca6f16b94 updated documentation (again..)
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@421 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-02-17 10:20:26 +00:00
sezero
2130f17bc9 * snd_mpg123.c: Print a message if mpg123_init() fails.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@420 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-02-17 07:02:47 +00:00
sezero
3e3a563c36 updated documentation
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@419 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-02-17 06:56:28 +00:00
sezero
3f8f259567 * gl_model.c: changed the `ignored' messages from Con_DPrintf
to Con_Printf for external lit files.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@418 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-02-17 06:38:52 +00:00
sezero
ea14bd5b1a bgmusic.c, bgmusic.h: small updates and tidy-ups from uHexen2.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@417 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-02-16 15:20:20 +00:00
sezero
7972de8af4 bgmusic.c: renamed -nomusic command line switch to -noextmusic. minor update.
updated documentation for the command line option name change.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@416 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-02-15 21:30:32 +00:00
sezero
4420e50084 added libmpg123 header, import libraries and dlls for windows builds
using libmpg123 for mp3 support.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@415 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-02-15 09:27:52 +00:00
sezero
81a318c09b * snd_mpg123.c: added new codec for mp3 playback using libmpg123 as
an alternative to the existing one using libmad. requires at least
  mpg123-1.12.0, i.e. api version 25.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@414 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-02-14 20:02:52 +00:00
sezero
119e534bd0 updated changelog entries in the REDAME for 0.85.4
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@413 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-02-13 16:50:18 +00:00
sezero
9ab31790b6 README punctuation patch from Sander van Dijk
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@412 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-02-12 22:20:09 +00:00
sezero
1be80dc881 snd_codec.c (S_CodecUtilOpen): fix again after rev.410.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@411 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-02-10 18:23:50 +00:00
sezero
ed1958d1ff snd_codec.c (S_CodecUtilOpen): minor cleanup (better type for length.)
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@410 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-02-10 18:20:33 +00:00
sezero
0099434147 documentation updates
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@409 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-02-10 18:15:19 +00:00
sezero
de3f97016a * common.c (COM_FileExists): changed return type to qboolean.
(COM_filelength): new procedure.
(COM_FindFile): adjustments to avoid multiple file open/close operations just a
little.
* common.h (COM_FileExists): adjusted prototype.
* bgmusic.c (BGM_PlayCDtrack): adjusted for COM_FileExists() return type change.
* sys_sdl_win.c, sys_sdl_unix.c (Sys_filelength): changed return type to long.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@408 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-02-10 17:25:43 +00:00
sezero
cd97cf2507 support for mouse buttons 4 and 5:
* keys.h: add KMOUSE4 and K_MOUSE5 defines after K_MWHEELDOWN
* keys.c: add KMOUSE4 and K_MOUSE5 to the keynames table.
* main_sdl.c: handle SDL_BUTTON_X1 and SDL_BUTTON_X2 for mouse
button events.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@407 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-02-10 16:10:53 +00:00
sezero
c851a07cc6 * common.c (FS_fread): fixed coding style.
* bgmusic.c:  minor updates from uhexen2.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@406 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-02-08 11:00:29 +00:00
sezero
687eb577cd * snd_mp3.c: removed useless rudimentary info checks.
* updated copyright years for several sound related sources.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@405 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-01-30 21:34:12 +00:00
sezero
d8ffad069b * snd_mp3.c: sync with sox project CVS repo and add mp3_madseek()
as a new private function. make S_MP3_CodecRewindStream() to use
  the new mp3_madseek() function.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@404 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-01-30 18:23:20 +00:00
sezero
30d44eac5b gl_vidsdl.c (VID_Menu_ChooseNextRate): refresh rates not implemented for SDL.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@403 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-01-29 07:21:04 +00:00
sezero
fde82ec3ac fixed a typo in a comment, noticed by Sander van Dijk.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@402 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-01-22 20:11:46 +00:00
sezero
26735b7ba9 * snd_mix.c (SND_PaintChannelFrom16): multiplication might cause
integer overflow as observed in the warpspasm mod depending on
  the volume level. so, moved the left shifting to left/right
  volume before the multiplication.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@401 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-01-18 06:50:35 +00:00
sezero
593463dafd added linux, bsd and windows native cdaudio code from uhexen2.
will integrate to build later.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@400 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-01-15 09:50:17 +00:00
sezero
faa16971d9 updated visual studio project file.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@399 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-01-13 14:10:16 +00:00
sezero
2493d3e1f8 * net_sys.h: revert previous commit undefining EWOULDBLOCK and
ECONNREFUSED for windows.  define new macros NET_EWOULDBLOCK and
  NET_ECONNREFUSED for both unix and for windows and change the
  users accordingly.
* net_udp.c, net_wins.c, net_wipx.c:
  adjust for the new NET_EWOULDBLOCK and NET_ECONNREFUSED macros.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@398 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-01-12 20:10:34 +00:00
sezero
8be7c0ebad net_sys.h: the new MS SDKs define EWOULDBLOCK and ECONNREFUSED,
so we must undefine them before redefining.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@397 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-01-12 12:39:24 +00:00
sezero
edee6c7c21 removed references to Misc/Todo.txt and Misc/Changelog.txt from the Xcode
project files.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@396 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-01-12 10:20:24 +00:00
sezero
b3c944b4dd removed Misc/Todo.txt and Misc/Changelog.txt. Appended old Misc/Changelog.txt
content to Misc/fitzquake080sdl.txt for future reference.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@395 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-01-12 10:12:33 +00:00
sezero
0221c58370 removed the cdplayer facility added in 0.85.3
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@394 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-01-12 10:02:16 +00:00
stevenaaus
46a276a66f Update Todo list
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@393 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-01-12 09:55:01 +00:00
sezero
65f2ac04aa changed makefiles to use 1/0 instead of yes/no for the codec options.
made quakespasm custom conback embedding optional, still defaulting to 1.
the code requires USE_QS_CONBACK preprocessor definition.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@392 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-01-12 09:32:22 +00:00
sezero
35d839abc7 updated the user directories patch to apply and function properly after
the latset changes.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@391 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-01-11 20:05:12 +00:00
stevenaaus
3723fc3935 Make Makefile.darwin consistent with Makefile
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@390 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-01-11 08:19:22 +00:00
stevenaaus
651d2c522b Documentation typos
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@389 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-01-11 08:06:03 +00:00