fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2024-11-15 09:21:36 +00:00
Code Issues Projects Releases Packages Wiki Activity
487 commits 51 branches 7 tags 218 MiB
Commit graph

487 commits

This branch
This branch
All branches
Author SHA1 Message Date
sezero
f1ed5896cc screen.h (canvastype): Added CANVAS_INVALID as a new enumerated value (-1). 
gl_draw.c (GL_Set2D): Use CANVAS_INVALID instead of -1.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@295 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-24 09:20:19 +00:00
sezero
8315ed0198 main_sdl.c: removed dedicated setup TODO notes. added a new TODO note about 
setting up the dedicated server with less memory.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@294 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-24 09:11:57 +00:00
sezero
7b2134168b cd_sdl.c: cleaned up the latest mess a little. restricted track progressing 
to the cd player facility only.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@293 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-24 09:04:16 +00:00
stevenaaus
83a08ef79a cd fix needed fo gameplay 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@292 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-24 01:28:40 +00:00
stevenaaus
a8de20a97d Make "cd play" progress tracks 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@291 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-24 00:35:22 +00:00
sezero
30b71faa55 * cd_sdl.c (export_cddev_arg): make putevn() actually work. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@290 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-23 23:46:16 +00:00
sezero
8138aa8608 * cd_sdl.c (export_cddev_arg): fixed bad snprintf and the crash it was 
causing.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@289 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-23 23:20:16 +00:00
sezero
a7dba17c55 cd_sdl.c: no need for uhexen2's CVS version identifier to stay here. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@288 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-23 17:23:39 +00:00
sezero
339fd92605 * cd_sdl.c (get_cddev_arg): fix stupid typo in uppercasing. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@287 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-23 15:55:54 +00:00
sezero
201ae03fdb * cd_sdl.c (get_cddev_arg): check for null or empty arguments also 
for non-windows platforms.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@286 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-23 14:32:34 +00:00
sezero
905f6e8ed7 * cd_sdl.c: Remove unnecessary SDL_getenv.h include. 
(CDAudio_Init): Move the bad ugly hack about SDL_CDROM environment
variable into the new export_cddev_arg() helper. FOr the -cddev option,
call the new get_cddev_arg() helper.

(export_cddev_arg): SDL_CDROM environment variable hack moved from
CDAudio_Init() to here. Fixed bad strcat() usage orto the array. Made it
for non-windows platforms only.

(get_cddev_arg): Added for checking the argument to the -cddev option.
For non-windows platforms just return the argument itself. For windows,
arg should be like "D:\", make sure it is so, but tolerate args like "D"
or "D:", as well.

(CDAudio_Next): Make static. Minor cleanups.

(CDAudio_Prev): Make static. Minor cleanups.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@285 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-23 14:05:32 +00:00
stevenaaus
0494f72f2b cd command tweaks 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@284 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-23 10:31:00 +00:00
stevenaaus
a0f158b276 Add "cd next" and "cd prev" commands. Add a new "-cd" option , which in combination with "-dedicated", allows QS to be a stand-alone cd player... Useful\! 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@283 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-23 09:49:03 +00:00
stevenaaus
01218ee9ae Set SDL_CDROM environment variable when using -cddev. Some doco updates. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@282 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-23 04:12:19 +00:00
sezero
a441851f2b MS Visual Studio support: 
* Quake/console.c, net_udp.c: replace snprintf by q_snprintf.
* Quake/common.h: Define q_snprintf as _snprintf for windows and as
snprintf for all others. Likewise for q_vsnprintf. Disable several
MSVC warnings. Define fmin and fmax as min and max macros for MSVC.
* Windows/quakespasm.vcproj, quakespasm.sln: Add Visual Studio 2005
project files.
* Windows/SDL_x64.zip: Add SDL x64 import libraries for MSVC.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@281 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-20 02:25:22 +00:00
sezero
bc333b5bc8 Makefile.w32, Makefile.w64: made them a little bit more flexible by adding 
CROSS_COMPILE and TARGET variables.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@280 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-17 19:30:35 +00:00
kristianduske
159aa49a15 OS X launcher now uses -fullscreen argument to switch into fullscreen mode instead of just omitting the -windowed argument. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@279 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-14 22:31:28 +00:00
sezero
4bbc06e5c7 pr_cmds.c (PF_traceline): Added a FIXME note about the NaN issue with certain progs.dat 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@278 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-14 21:02:31 +00:00
sezero
78cbc8cc5f added q_stdinc.h, adapted from uhexen2, to tidy up several includes and 
macros in one place.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@277 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-14 20:55:39 +00:00
sezero
b4b84d9526 pr_cmds.c (PF_traceline): fix entity number printing. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@276 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-14 20:50:31 +00:00
sezero
6e94af1372 mathlib.h, mathlib.c: changed nanmask from being a global to being 
a macro.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@275 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-14 20:10:20 +00:00
sezero
aee8fe5f2f * pr_cmd.c: replaced isnan() calls with quake's own ISNAN() macro. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@274 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-14 20:06:06 +00:00
sezero
9f7fce8ced added note that the "homedir" patch here is outdated 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@273 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-14 19:44:58 +00:00
kristianduske
78f8041715 git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@272 af15c1b1-3010-417e-b628-4374ebc0bcbd 2010-08-14 19:41:09 +00:00
stevenaaus
24503db905 README tweaks 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@271 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-14 11:59:39 +00:00
stevenaaus
ecdc407d9c README changes 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@270 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-14 07:40:48 +00:00
stevenaaus
02c566eec0 Miscellaneous doco updates 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@269 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-14 05:01:12 +00:00
stevenaaus
41d8164068 PF_traceline causes program to die badly if given non-numeric (isnan) vectors. So we must check to not allow this happening. Additionally, stop program execution is developer cvar is set. Note: Compiling program with gcc option \'-ffast-math\' (and more specifically, -funsafe-math-optimizations) is an alternative fix than this patch. It performs FPU opts that gloss over the issue 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@268 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-14 03:59:29 +00:00
stevenaaus
d9ed158672 Swap left and right arrow keys in the videomode menu. (Right arrow now increases resolution, which is more standard) 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@267 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-14 03:42:52 +00:00
kristianduske
7817c3271a Changed base SDK to 10.4. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@266 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-13 12:05:26 +00:00
kristianduske
593f36ee98 Mac OS X launcher can be suppressed by passing "-nolauncher" on the command line. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@265 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-12 15:41:32 +00:00
kristianduske
ade148f09b Mac OS X launcher can be suppressed by passing "-nolauncher" on the command line. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@264 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-12 15:41:15 +00:00
kristianduske
47f5a1b812 Trying to recover broken XCode project files. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@263 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-10 17:51:17 +00:00
sezero
a67c4ddf4a net_sys.h: update comments and tidy up. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@262 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-09 14:03:07 +00:00
kristianduske
789dd2a686 Replaced SDL network driver with BSD driver for Mac OS X. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@261 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-09 12:44:44 +00:00
sezero
40b6d80f99 struct sockaddr has unsigned char sa_len as the first member in BSD 
in BSD variants and the family member is also an unsigned char instead
of (unsigned) short. So we define HAVE_SA_LEN for those BDS variants
and check for the offsetof for the sa_family member and also change
the struct qsockaddr to mirror that.  This should matter only when
PLATFORM_UNIX is defined.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@260 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-09 12:20:39 +00:00
kristianduske
38c31f616f Added the Sparkle framework to OS X launcher for automatic updates (this is not entirely ready for release yet). 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@254 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-08 13:17:35 +00:00
stevenaaus
26d6246ff9 Add a "prev weapon" menu item (from Sander) 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@253 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-04 03:09:07 +00:00
sezero
427d671c24 host_cmd.c, menu.c: sanitize whitespace/formatting. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@252 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-02 19:45:16 +00:00
sezero
11b6986944 menu.c: Added an options enum for the options menu. Added an options menu 
entry for mouse look toggling.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@251 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-02 18:28:23 +00:00
sezero
edd2a2a34f revert incorrect changes to NUM_GAMEOPTIONS and gameoptions_cursor_table from rev. 246. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@250 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-02 17:33:03 +00:00
sezero
6bbb06b490 gl_mesh.c (BuildTris): worked around a type-punned pointer. adapted from quakeforge. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@249 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-01 21:11:16 +00:00
sezero
e1046e68c6 * renamed Length() to VectorLength() for consistency with its friends. 
* mathlib.c: Removed the unnecessary sqrt() prototype.
(VectorLength): Made it to just return sqrt(DotProduct(arg,arg))
(VectorNormalize): Calculate the length as sqrt(DotProduct(arg,arg)).
* mathlib.h (CLAMP): Renamed the macro arguments from min and max to
_minval and _maxval.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@248 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-08-01 19:22:46 +00:00
stevenaaus
57bf6f49b9 Add a statusbar alpha slider, and change default scr_sbaralpha to 0.95 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@247 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-07-29 06:48:25 +00:00
stevenaaus
86dea5717b Link the status bar size to the scale slider, though it's size only increases half as fast 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@246 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-07-29 01:52:04 +00:00
stevenaaus
630499ae8f History fixed - Ozkan's newline fix seems ok. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@245 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-07-28 07:50:27 +00:00
stevenaaus
57484778cd Make some fixes for command line history now that history is persistent 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@244 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-07-28 07:08:16 +00:00
stevenaaus
30d9246c7b There seems bugs in the command-line code. Revert this "blank newline" fix first, then look for more 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@243 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-07-27 21:45:33 +00:00
stevenaaus
b9f418d276 -bgvolume switch stays... Allows CD music/ambient music to play while minimized 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@242 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-07-26 08:47:11 +00:00
sezero
f81f9f5e05 Under windows, run the game (windowed), go into a saved game, 
press Esc to get the menu, minimize using the mouse on the
window's minimize icon and then restore and you'll have sound
all the same.  HOWEVER: If you minimize by pressing the icon
on the start bar, sound will be lost upon restoring. Or, if
you use alt-tab to get away from the game window the same will
happen. Or, if you run the game fullscreen and use alt-tab to
go to the desktop (alt-tab is the only way I know) you will
lose the sound again.  Here, we are probably are hitting an
SDL_APPACTIVE or SDL_APPINPUTFOCUS event more than once and
since the block counter goes > 1 we are not restoring properly.
For now, making snd_blocked to act as a boolean and not as a
counter fixes the issue.  Hmmm...

* main_sdl.c: Revert revision 238 change, no longer necessary.
* snd_dma.c: Make snd_blocked act as a boolean and not as a
counter.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@241 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-07-25 12:20:17 +00:00