Commit graph

2771 commits

Author SHA1 Message Date
Tim Angus
273b9ab77e Update SDL2 headers... oops 2013-08-20 18:30:56 +01:00
Tim Angus
32a859c680 More updates to SDL2 libs from MAN-AT-ARMS 2013-08-19 23:19:29 +01:00
Tim Angus
e13773de69 Update prebuilt SDL2 libs for Windows 2013-08-18 18:23:14 +01:00
Tim Angus
e6d075e165 SDL2 libs for OSX, thanks to MAN-AT-ARMS 2013-08-18 18:08:03 +01:00
Tim Angus
bde7665462 Merge branch 'master' into sdl2
Conflicts:
	code/sdl/sdl_input.c
2013-08-16 23:34:08 +01:00
Zack Middleton
d4c6711e51 Fix "bind <key>" message for unbound keys
"bind X cmd; unbind X; bind X" now says '"x" is unbound' instead of '"x" = ""'
2013-08-16 15:41:01 -05:00
Zack Middleton
3d69ae9995 Fix OpenAL music stop issues using stream stop code
S_AL_StopBackgroundTrack would sometimes generate AL errors.
S_AL_MusicSourceFree needs to kill source or next track may have short looping buffer.
2013-08-16 15:29:12 -05:00
Zack Middleton
6d5041a960 Remove 5 unused variables from make-macosx scripts 2013-08-04 12:06:38 -05:00
Zack Middleton
81909bb266 Fix text getting appended to vid_restart in command buffer
I was getting unknown command "vid_restart-button2" warning on OSX when trying to use alt-return to toggle fullscreen.
2013-08-03 17:40:50 -05:00
Zack Middleton
2eaee597c9 Fix creating symlinks in make-macosx-app.sh
Create symlink if arch name is found anywhere in info printed by file command, not only if arch name is the last word.
2013-08-03 16:37:28 -05:00
Zack Middleton
3518e7b22e Fix bind commands getting run when closing UI
Introduced in commit "Add togglemenu command" bf2b04.

Don't let UI key event changing key catcher affect bind parsing. Bind parsing itself will never change the key catcher.

Example of issue: if mouse1 is bound to +attack when clicking Resume Game, player will shoot until releasing the mouse button.
Mouse button should have to be released and pressed again before player will shoot.
2013-07-22 17:44:28 -05:00
Henry Stratmann III
db85b61e94 Add assignment below declarations otherwise compiling fails with msvc
Signed-off-by: Zack Middleton <zturtleman@gmail.com>
2013-07-21 19:15:24 -05:00
Zack Middleton
43ea1aebb3 Fix Windows server history scrolling
Update history position when CON_HistNext goes to input line, otherwise
when going to previous a line is skipped.
Don't let CON_HistPrev go to unused lines.
2013-07-21 17:32:56 -05:00
Anthony Pesch
b0f0376a4f Misc fixes to IBO code to correctly use sizeof(glIndex_t) 2013-07-19 14:16:49 -07:00
jeremiah sypult
d9485b696e Makefile builds fall back to traditional archiving when Mac OS X application bundle generation fails 2013-07-18 11:29:23 -05:00
jeremiah sypult
7b9aa77c6b Fix make-macosx-app.sh to make bundle on non-Mac OS X platforms 2013-07-18 10:49:01 -05:00
jeremiah sypult
b7f5971ab8 Another pass at the Mac OS X make scripts.
Ironed out issues with generating an application bundle with universal
binaries on supported systems. Fall back to bundling a single
architecture when support for universal binary generation is not
available. Tested on Mac OS X 10.5.8 (and 10.5 SDK).
2013-07-18 10:39:08 -05:00
jeremiah sypult
ea49d5d2da make-macosx-app.sh doesn't trust the output of 'which', so check for a hard-coded path 2013-07-18 01:28:08 -05:00
jeremiah sypult
ef7031b993 make-macosx-app.sh supports systems without libtool, part 2 2013-07-18 01:14:28 -05:00
jeremiah sypult
fd1e278142 make-macosx-app.sh supports systems without libtool 2013-07-18 01:08:56 -05:00
jeremiah sypult
744651f72f Updated Makefile to only build release OS X app bundles 2013-07-18 00:47:00 -05:00
jeremiah sypult
95138f456e make-macosx-app.sh should use /bin/bash and not /bin/sh 2013-07-18 00:35:44 -05:00
jeremiah sypult
2357f595fb make-macosx-app.sh using single '=' comparisons 2013-07-18 00:28:17 -05:00
jeremiah sypult
0d2a576a43 fix bug in make-macosx-app.sh with older shells 2013-07-18 00:16:38 -05:00
jeremiah sypult
260233d4ec bug 5986 - Configure jenkins to spit out mac .app
https://bugzilla.icculus.org/show_bug.cgi?id=5986
Created make-macosx-app.sh to handle manually creating an app bundle from other scripts.
Updated make-macosx.sh to create bundle with make-macosx-app.sh (TODO: make-macosx-ub.sh support).
Updated Makefile to create bundle with make-macosx-app.sh and zip up the resulting ioquake3.app if ARCHIVE is defined.
2013-07-18 00:11:10 -05:00
Zack Middleton
3cd8b49713 Merge pull request #6 from morturp/patch-2
out seems to be unnecessarily large for one byte per pixel
2013-07-17 19:12:15 -07:00
morturp
7b47c6cf36 out seems to be unnecessarily large for one byte per pixel 2013-07-18 03:00:39 +03:00
jeremiah sypult
9c2ce77d98 Added "all game" and "all ioquake3" schemes to Xcode workspace so that they build properly. 2013-07-17 15:54:53 -05:00
jeremiah sypult
90dcf34eee Fix the speex Xcode project since it was missing its header search path. 2013-07-17 14:59:58 -05:00
jeremiah sypult
0f9eca6546 Initial Xcode workspace & project support (4.6.3).
Updated .gitignore and ioquake3fe Xcode project.
Added Retina-enabled QUAKE III logo icon files.
Details in misc/xcode/xcode-readme.txt
2013-07-13 01:06:26 -05:00
Zack Middleton
690b281e4d Remove unused models from server_t 2013-07-11 23:26:30 -05:00
Zack Middleton
30fcabec65 SDL Mouse Button clean up
Make 'b' variable an int so that key values more than 255 will work (not currently an issue in ioq3 afaik).
Use SDL_BUTTON_* for easier transition to SDL2.
(SDL2 doesn't have SDL_BUTTON_WHEELUP or SDL_BUTTON_WHEELDOWN, X1/X2 are different values.)
2013-07-09 14:41:56 -05:00
Zack Middleton
4776fb4767 (bug #5984) Unload renderer lib 2013-07-08 16:36:30 -06:00
Zack Middleton
6b13806066 Fix getting servers from and being listed on id's q3 master server
Use q3 master protocol when com_gamename is Quake3Arena (the default), otherwise use dpmaster protocol.
2013-07-07 16:31:36 -05:00
Zack Middleton
608e852ac6 Free Team Arena fonts/fontImage_X.dat buffer
Caused temp memory to be present all the time, so Hunk_Alloc ignored memory low/high preference.

May have caused other issues as well.
2013-07-04 15:34:05 -05:00
Zack Middleton
817fe14dcb Merge pull request #5 from morturp/patch-1
Prevent the skip of the glyph if it does not fit
2013-06-26 11:53:54 -07:00
morturp
213b8e2435 Prevent the skip of the glyph if it does not fit 2013-06-26 11:42:59 +03:00
Zack Middleton
d79fe65878 Fix r_mergeLightmaps 0 crashing OpenGL2 renderer
tr.fatLightmapStep was 0 and caused modulus division by 0.
2013-06-20 21:56:04 -05:00
Zack Middleton
872465500e Fix r_nocurves in OpenGL2 renderer
Check r_nocurves in surface cull.
While r_nocurves is enabled, don't use merged surfaces because merged curves would be renderer. (note: surface merging is enabled by r_mergeLeafSurfaces)
2013-06-20 16:27:00 -05:00
Zack Middleton
323e8b9921 Fix r_speeds 4 in OpenGL2 renderer 2013-06-20 16:21:26 -05:00
Zack Middleton
aa2ea68741 Fix IQM tess buffer overflow
Set the variables that use tess.numVertexes after calling RB_CHECKOVERFLOW() as it may set tess.numVertexes to 0!

Could cause visual issues and error "RB_EndSurface() - SHADER_MAX_VERTEXES hit".
2013-06-18 18:00:45 -05:00
Zack Middleton
cb2fa48d65 Only allow model meshes to have SHADER_MAX_VERTEXES - 1 vertexes
The last index is used to check for buffer overflows. See RB_CheckOverflow and RB_EndSurface.
2013-06-18 17:02:47 -05:00
Zack Middleton
00c1831edb Don't try to fog flares with fogNum 0
fogNum 0 means no fog. Shaders don't try to apply fog color if fogNum is 0.

This was done to make things more consistent and fix a crash in iortcw MP using a user made map on GNU/Linux x86_64.
2013-06-11 15:47:00 -05:00
Tim Angus
7b15415042 Rate limit getchallenge 2013-06-10 20:31:15 +01:00
Zack Middleton
2937ac7661 Allow adjusting VoIP gain and mute during SP demo playback 2013-06-04 23:19:47 -05:00
Zack Middleton
e89a1b9f8e Allow adjusting VoIP gain and mute during demo playback 2013-06-04 23:02:23 -05:00
Zack Middleton
21c93736b8 Allow recording VoIP in SP for demo commentaries 2013-06-04 22:28:46 -05:00
Zack Middleton
1315d62491 Make COM_ParseWarning report starting line number of multi-line tokens
COM_ParseWarning use to show last line number of multi-line string tokens, now shows starting line number.
2013-06-03 22:35:57 -05:00
Zack Middleton
d4f785c465 Improve warning for shader missing opening brace 2013-06-02 21:59:01 -05:00
Zack Middleton
3ec2b02dce Check for shaders without closing brace
Shaders without closing brace can eat shaders in other files.
Pass depth to SkipBracedSection instead of reparsing text as it messed up parse line numbers.
2013-06-02 21:55:19 -05:00