fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-09 09:10:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
1129 commits 51 branches 7 tags 218 MiB
Commit graph

1129 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eric Wasylishen
6afd1e5286 Host_Loadgame_f: don't break when there are } characters in quoted strings. Fixes issue loading savegames from retrojam1_skacky 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1145 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-12-08 19:30:21 +00:00
Ozkan Sezer
fd219279f4 oslibs (macosx, windows): recompile FLAC decoder with a fix for an input validation bug from upstream. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1144 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-12-05 20:01:30 +00:00
Ozkan Sezer
97b50566b2 oslibs (macosx, windows): recompiled FLAC decoder with CVE-2014-9028 fixes applied from mainstream. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1143 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-11-27 10:57:07 +00:00
Ozkan Sezer
fa62dd5eab oslibs (macosx, windows): recompiled FLAC decoder with CVE-2014-8962 fix applied from mainstream. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1142 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-11-21 17:24:43 +00:00
Eric Wasylishen
4a2e29f1c1 R_SetupGL: remove some dead code (glGet call that stores GL_MODELVIEW_MATRIX into r_world_matrix, which is not used anywhere.) The glGet calls was stalling the OpenGL pipeline. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1141 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-11-11 23:27:12 +00:00
Eric Wasylishen
1d7a9903e3 Fog_ParseWorldspawn: before reading the worldspawn value, clear the fog rgb color back to the default value (0.3). 
This fixes a bug seen in jam3_tronyn.bsp (which only has a density value in the worldspawn), where the fog color of the last map played would carry over.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1140 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-11-03 21:27:27 +00:00
Ozkan Sezer
6b57f04f57 make sure we have more than one CPUs before enabling multi-threaded OpenGL 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1139 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-11-03 09:20:23 +00:00
Ozkan Sezer
a4b30a4eed add new numcpus field to the quakeparms structure and detect it during Sys_Init time 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1138 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-11-03 09:10:18 +00:00
Eric Wasylishen
2870be2bee GL_Init: on OS X, enable multi-threaded OpenGL mode. 
This moves some of the OpenGL implementation to a background thread, and makes draw calls block for a shorter amount of time. AFAIK, this is the default mode on most other OS'es, not sure why you have to explicitly ask for it on OS X.

N.B. the kCGLCEMPEngine constant is available on 10.4+ so I don't bother checking the OS X version.
More info: https://developer.apple.com/library/mac/technotes/tn2085/_index.html

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1137 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-11-02 23:01:20 +00:00
Sander van Dijk
fce0215843 quakespasm.pak: Another z-fighting workaround. 
This fixes:

e2m3:
- The wallpiece that blocks the way out of the Well of Wishes (when open).


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1136 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-11-02 20:06:35 +00:00
Sander van Dijk
996d692db0 quakespasm.pak: More z-fighting workarounds. 
This fixes:

e2m3:
- The floorpiece (when down) and wallpiece (when open) by the crates opposite the normal exit.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1135 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-11-02 19:36:39 +00:00
Sander van Dijk
e4d99195bf quakespasm.pak: More z-fighting workarounds. 
This fixes:

e1m4:
- The secret doors in the room with the five quake-logo buttons on the floor (when open).

e2m2:
- The platform in the water behind the gold key door (when down).
- The wallpiece that pushes the player into the gold key room (when "closed").


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1134 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-11-02 19:16:35 +00:00
Ozkan Sezer
50a277c1f7 a few more minor stuff from uhexen2 svn 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1133 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-31 13:03:20 +00:00
Ozkan Sezer
ed0eeb149f sync a few minor stuff with uhexen2 svn 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1132 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-30 18:00:06 +00:00
Ozkan Sezer
472bd01fce bump version to 0.90.1 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1131 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-21 20:05:08 +00:00
Eric Wasylishen
b694b513ec Tweak the MH dynamic lighting speedup to be more correct: upload the lightmaps from the current frame instead of the previous frame. 
It was possible, but unlikely, to see artifacts from the previous code in some circumstances, e.g. "host_maxfps 10" and spin around quickly near a flashing light e1m1, you may see a surface drawn with an out-of-date lightmap for one frame.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1130 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-21 19:27:42 +00:00
Ozkan Sezer
25b8df20a7 minor tidy-ups 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1128 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-18 17:00:34 +00:00
Sander van Dijk
9099830d70 Windows/QuakeSpasm.rc: Revert unintended change in r1126. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1127 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-18 16:34:48 +00:00
Sander van Dijk
bc30c6278c sdl: Make our error checking for SDL_Init(SubSystem) consistent with the SDL wiki/test programs. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1126 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-18 16:33:01 +00:00
Ozkan Sezer
ce78a2ea51 run SDL_Quit() at exit 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1125 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-18 11:20:14 +00:00
Ozkan Sezer
42def503ff recompiled SDL2 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1124 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-18 11:04:29 +00:00
Ozkan Sezer
afe02e69d7 update document dates 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1123 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-17 11:34:10 +00:00
Eric Wasylishen
a8d8ab865d readme: add a note that the Windows DPI scaling issues are fixed 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1122 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-17 00:21:20 +00:00
Eric Wasylishen
53288141e7 sys_sdl_win: Sys_SetDPIAware: only call GetProcAddress on a non-NULL library handle 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1121 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-17 00:15:49 +00:00
Eric Wasylishen
336cbb1cb2 readme: remove section about High-DPI workaround as we've got a proper fix now 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1120 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-17 00:15:40 +00:00
Eric Wasylishen
f244f82c64 sys_sdl_win.c: Sys_SetDPIAware: call SetProcessDPIAwareness / SetProcessDPIAware 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1119 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-16 23:01:43 +00:00
Sander van Dijk
5438f83b08 keys.c: Add keynames BACKQUOTE and TILDE, to facilitate (un)binding them from the console. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1118 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-15 17:32:40 +00:00
Sander van Dijk
e06f197879 keys: K_ALT is not a consolekey (it was accidentally added in r1112). 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1117 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-15 06:18:29 +00:00
Sander van Dijk
25d630c1b8 console.c: When toggling the fullscreen console off, clear the current line. 
This is consistent with toggling the in-game console off, and fixes stray '`' or '~' (or '^' or '\' or ..., depending on the keyboard layout) characters.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1116 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-15 06:06:18 +00:00
Sander van Dijk
b2222b0a62 keys.c: Ignore control characters in Char_Event(), to prevent text input when pressing ctrl-c/ctrl-v. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1115 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-15 05:58:54 +00:00
Eric Wasylishen
f607f1b4eb in_sdl: change DBEUG_INPUT preprocessor check to an "in_debugkeys" cvar to make it easier to debug unusual keyboards 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1114 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-14 18:31:49 +00:00
Sander van Dijk
81daee8fcf input: Minor fix in Char_Event(). 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1113 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-14 17:13:03 +00:00
Sander van Dijk
13cfd00787 input: Remove some of stuff obsoleted by r1110. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1112 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-14 17:10:34 +00:00
Eric Wasylishen
3cb6f871f1 in_sdl.c: make key debug logging more verbose 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1111 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-14 04:03:16 +00:00
Eric Wasylishen
1b6abd0e04 in_sdl.c, key.c: Fixes agreed on with Sander: 
1. Remove Key_IgnoreTextInput(), and simple always send a Char_Event when
we receive TEXTINPUT (SDL2) or the unicode field of a KEYDOWN event is
filled (SDL1.).
2. Remove handling of K_KP_* in the menu/console, since they cannot be
relied on to not also send text (see issue described above). The handling
of K_KP_ENTER can stay, since we do know that it never sends text.
3. Remove the interpretation hack for the numpad, since it will no longer
be needed (and doesn't currently work for SDL2 anyway); if a numpad key
generates text we will handle it (because of "1"), if not then it will
simply be if ignored (because of "2”).

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1110 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-14 03:30:44 +00:00
Eric Wasylishen
aeb4ed86d2 in_sdl: remove lastKeyDown hack 
was no longer needed and was causing issues typing underscores (US keyboard layout) on Linux/SDL2 where SDL_TEXTINPUT is delivered before the SDL_KEYDOWN.

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1109 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-13 03:21:47 +00:00
Eric Wasylishen
bd07399747 in_sdl: add some debug logging for key events (only if DEBUG_INPUT is defined) 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1108 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-13 03:21:40 +00:00
Ozkan Sezer
1e4291192c Xcode: rename QuakeSpasmSDL2 target to QuakeSpasm-SDL2 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1107 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-12 17:15:06 +00:00
Sander van Dijk
2c765635bb codeblocks: Remove unused files, minor tuning. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1106 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-12 16:46:21 +00:00
Ozkan Sezer
a6e2753a41 add sdl2 targets to codeblocks projects 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1105 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-12 14:00:07 +00:00
Ozkan Sezer
3de3dc97ad add an sdl2 target to msvc builds 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1104 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-12 12:38:07 +00:00
Ozkan Sezer
5678106819 fix sdl2-msvc build 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1103 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-12 11:20:34 +00:00
Ozkan Sezer
b2eebb0fe0 recompiled SDL1.2 for windows 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1102 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-12 09:27:44 +00:00
Ozkan Sezer
039fdaad6f minor whitespace adjustments 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1101 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-11 19:11:40 +00:00
Eric Wasylishen
dddb9b82b9 changelog: mention -notexturenpot and -novbo 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1100 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-11 18:11:16 +00:00
Ozkan Sezer
5f8e423b6c update documents 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1099 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-11 12:05:25 +00:00
Sander van Dijk
6ae9f2e37e keys: Simplify r1097. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1098 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-11 11:47:05 +00:00
Sander van Dijk
3ecdc28743 keys: Rework the specialkeys[]/consolekeys[] initialization a bit. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1097 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-11 11:22:53 +00:00
Sander van Dijk
1440636ec6 input: Move fullscreen and console toggle from in_sdl.c to keys.c. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1096 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-11 08:49:45 +00:00
Eric Wasylishen
d1b3e7c4a3 Xcode project: adjust settings for debug variants of targets: use default SDK rather than 10.6, native architecture rather than x86_64 + i386, and the default compiler instead of llvm-gcc4.2 
This should make the project build out of the box on a wider variety of systems (i.e. without needing the 10.6 sdk)

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1095 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2014-10-10 06:01:29 +00:00