]>
git.xonotic.org Git - xonotic/darkplaces.git/log
divverent [Tue, 6 Jan 2015 10:50:47 +0000 (10:50 +0000)]
Statically link to libjpeg again on Linux. Damn jpeg8 vs jpeg62 still...
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12117
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Sun, 4 Jan 2015 13:45:34 +0000 (13:45 +0000)]
Fix the name again.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12116
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a5bf1b9e80132c40dda71e4f6e47b911e631049d
divverent [Sun, 4 Jan 2015 13:45:34 +0000 (13:45 +0000)]
Fix the name again.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12116
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Sun, 4 Jan 2015 13:20:37 +0000 (13:20 +0000)]
Fix an executable name (darkplaces.exe)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12115
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f7793c7299c6f5683a1b390e4444dabb44576e24
divverent [Sun, 4 Jan 2015 13:20:37 +0000 (13:20 +0000)]
Fix an executable name (darkplaces.exe)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12115
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Sat, 3 Jan 2015 15:58:25 +0000 (15:58 +0000)]
Xonotic/Windows: make SDL the default build.
Rename the executables from xonotic-* to darkplaces-*. They are generic DP binaries, after all.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12114
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
38c4650341fa0142708d396aed3f4190e7e5118f
divverent [Sat, 3 Jan 2015 15:58:25 +0000 (15:58 +0000)]
Xonotic/Windows: make SDL the default build.
Rename the executables from xonotic-* to darkplaces-*. They are generic DP binaries, after all.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12114
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Mon, 29 Dec 2014 14:56:27 +0000 (14:56 +0000)]
SDL2: Fix dprint spam in the console when toggling vid_vsync on/off
Signed-off-by: terencehill <piuntn@gmail.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12113
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9973d76822ff8375e07694ea34c812fbbf8ebdbb
divverent [Mon, 29 Dec 2014 14:55:25 +0000 (14:55 +0000)]
Use proper Unicode defined characters for the "..." chat continuation sign
From: Severin Meyer <sev.ch@web.de>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12112
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
3d0b5dff0aa38ab192ac9aebdfe39cd23cfe2ed9
divverent [Mon, 29 Dec 2014 14:56:27 +0000 (14:56 +0000)]
SDL2: Fix dprint spam in the console when toggling vid_vsync on/off
Signed-off-by: terencehill <piuntn@gmail.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12113
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Mon, 29 Dec 2014 14:55:25 +0000 (14:55 +0000)]
Use proper Unicode defined characters for the "..." chat continuation sign
From: Severin Meyer <sev.ch@web.de>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12112
d7cf8633 -e32d-0410-b094-
e92efae38249
eihrul [Tue, 9 Dec 2014 23:30:50 +0000 (23:30 +0000)]
fix Con_Printf in Mod_Q2BSP_LoadNodes
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12110
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
b4488d1563f5fa00036b2ccacfda344c3f0f254e
eihrul [Tue, 9 Dec 2014 23:08:33 +0000 (23:08 +0000)]
more miscellaneous fixes from graphitemaster
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12109
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
cb6472b4ced79f6cd093756c6483699761cf674d
eihrul [Tue, 9 Dec 2014 14:17:22 +0000 (14:17 +0000)]
specify depth and stencil attachments separately (combined attachment is only available in GL >= 3.0)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12108
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
8d5d46a8e8d2d015be6912419960f1a5a65ea49b
eihrul [Tue, 9 Dec 2014 13:38:22 +0000 (13:38 +0000)]
gltexture_t->glisdepthstencil fix
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12107
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
22dac77bc9bd23097c69404c6d0f5160c5330dc1
eihrul [Tue, 9 Dec 2014 13:30:53 +0000 (13:30 +0000)]
miscellaneous fixes from graphitemaster
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12106
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
bd8b9a2b1e5464f18a7a2e6e573201d6aa9dbcca
divverent [Mon, 29 Dec 2014 11:11:15 +0000 (11:11 +0000)]
Realign stack for SDL/win32 builds. Yes, annoying, and costs performance.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12111
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
0afeccfe1289b64245baf48979b6a694d077b6f0
divverent [Mon, 29 Dec 2014 11:11:15 +0000 (11:11 +0000)]
Realign stack for SDL/win32 builds. Yes, annoying, and costs performance.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12111
d7cf8633 -e32d-0410-b094-
e92efae38249
eihrul [Tue, 9 Dec 2014 23:30:50 +0000 (23:30 +0000)]
fix Con_Printf in Mod_Q2BSP_LoadNodes
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12110
d7cf8633 -e32d-0410-b094-
e92efae38249
eihrul [Tue, 9 Dec 2014 23:08:33 +0000 (23:08 +0000)]
more miscellaneous fixes from graphitemaster
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12109
d7cf8633 -e32d-0410-b094-
e92efae38249
eihrul [Tue, 9 Dec 2014 14:17:22 +0000 (14:17 +0000)]
specify depth and stencil attachments separately (combined attachment is only available in GL >= 3.0)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12108
d7cf8633 -e32d-0410-b094-
e92efae38249
eihrul [Tue, 9 Dec 2014 13:38:22 +0000 (13:38 +0000)]
gltexture_t->glisdepthstencil fix
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12107
d7cf8633 -e32d-0410-b094-
e92efae38249
eihrul [Tue, 9 Dec 2014 13:30:53 +0000 (13:30 +0000)]
miscellaneous fixes from graphitemaster
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12106
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Sun, 7 Dec 2014 16:39:43 +0000 (16:39 +0000)]
curl: do not output requirements for files that are local.
Fixes a bug introduced by r12079.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12105
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
85c434c08985337fa476e56fae0fde3e955dbd73
divverent [Sun, 7 Dec 2014 16:39:43 +0000 (16:39 +0000)]
curl: do not output requirements for files that are local.
Fixes a bug introduced by r12079.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12105
d7cf8633 -e32d-0410-b094-
e92efae38249
Rudolf Polzer [Sat, 6 Dec 2014 06:43:47 +0000 (07:43 +0100)]
Empty commit to make Travis retry.
divverent [Wed, 26 Nov 2014 12:58:32 +0000 (12:58 +0000)]
fixes some more Mac OS X buffer overlap errors
Error report: Mac OS X 10.10 (14A389)
Crashed Thread: 0 Dispatch queue: com.apple.main-thread
Exception Type: EXC_CRASH (SIGABRT)
Exception Codes: 0x0000000000000000, 0x0000000000000000
Application Specific Information:
detected source and destination buffer overlap
Thread 0 Crashed:: Dispatch queue: com.apple.main-thread
0 libsystem_kernel.dylib 0x00007fff91017282 __pthread_kill + 10
1 libsystem_c.dylib 0x00007fff922aab73 abort + 129
2 libsystem_c.dylib 0x00007fff922aacea abort_report_np + 181
3 libsystem_c.dylib 0x00007fff922d0dd0 __chk_fail + 48
4 libsystem_c.dylib 0x00007fff922d0de0 __chk_fail_overlap + 16
5 libsystem_c.dylib 0x00007fff922d0e11 __chk_overlap + 49
6 libsystem_c.dylib 0x00007fff922d0e7e __strlcpy_chk + 68
7 darkplaces-sdl 0x0000000102903b3e SV_UpdateToReliableMessages + 398 (sv_main.c:2480)
8 darkplaces-sdl 0x00000001029038bb SV_SendClientMessages + 59 (sv_main.c:2575)
9 darkplaces-sdl 0x000000010278bb5e Host_Main + 3758 (host.c:910)
10 darkplaces-sdl 0x00000001025be64f main + 239 (sys_sdl.c:223)
11 libdyld.dylib 0x00007fff8e7735c9 start + 1
From: nyov <nyov@nexnode.net>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12104
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
a9a2f5f032331adc43ae3bf99118464157b807ab
divverent [Wed, 26 Nov 2014 12:58:29 +0000 (12:58 +0000)]
fix a buffer overlap with newer mac osx strlcpy
this fails on strcpy overlap detection in newer Mac OSX releases.
Error report: Mac OS X 10.10 (14A389)
Crashed Thread: 0 Dispatch queue: com.apple.main-thread
Exception Type: EXC_CRASH (SIGABRT)
Exception Codes: 0x0000000000000000, 0x0000000000000000
Application Specific Information:
detected source and destination buffer overlap
Thread 0 Crashed:: Dispatch queue: com.apple.main-thread
0 libsystem_kernel.dylib 0x00007fff91017282 __pthread_kill + 10
1 libsystem_c.dylib 0x00007fff922aab73 abort + 129
2 libsystem_c.dylib 0x00007fff922aacea abort_report_np + 181
3 libsystem_c.dylib 0x00007fff922d0dd0 __chk_fail + 48
4 libsystem_c.dylib 0x00007fff922d0de0 __chk_fail_overlap + 16
5 libsystem_c.dylib 0x00007fff922d0e11 __chk_overlap + 49
6 libsystem_c.dylib 0x00007fff922d0e7e __strlcpy_chk + 68
7 darkplaces-sdl 0x0000000104a3a29a Mod_LoadTextureFromQ3Shader + 74 (model_shared.c:2446)
8 darkplaces-sdl 0x0000000104a21010 Mod_Q3BSP_Load + 2224 (model_brush.c:5134)
9 darkplaces-sdl 0x0000000104a1e265 Mod_IBSP_Load + 85 (model_brush.c:7956)
10 darkplaces-sdl 0x0000000104a3398b Mod_LoadModel + 1419 (model_shared.c:498)
11 darkplaces-sdl 0x0000000104a37717 Mod_ForName + 55 (model_shared.c:616)
12 darkplaces-sdl 0x0000000104ad3f28 SV_SpawnServer + 424 (sv_main.c:3284)
13 darkplaces-sdl 0x00000001049e497f Host_Map_f + 319 (host_cmd.c:394)
14 darkplaces-sdl 0x00000001049e4bad Host_Changelevel_f + 221 (host_cmd.c:416)
15 darkplaces-sdl 0x000000010494d6f9 Cmd_ExecuteString + 617 (cmd.c:1936)
16 darkplaces-sdl 0x000000010494d14d Cbuf_Execute + 781 (cmd.c:368)
17 darkplaces-sdl 0x000000010494dbd5 Cbuf_Frame + 597 (cmd.c:384)
18 darkplaces-sdl 0x00000001049e0109 Host_Main + 1305 (host.c:781)
19 darkplaces-sdl 0x00000001048c2f06 main + 166 (sys_sdl.c:223)
20 libdyld.dylib 0x00007fff8e7735c9 start + 1
From: nyov <nyov@nexnode.net>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12103
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
8f317e4b0e366bff1ba380af77279c3d16d588e9
divverent [Wed, 26 Nov 2014 12:58:32 +0000 (12:58 +0000)]
fixes some more Mac OS X buffer overlap errors
Error report: Mac OS X 10.10 (14A389)
Crashed Thread: 0 Dispatch queue: com.apple.main-thread
Exception Type: EXC_CRASH (SIGABRT)
Exception Codes: 0x0000000000000000, 0x0000000000000000
Application Specific Information:
detected source and destination buffer overlap
Thread 0 Crashed:: Dispatch queue: com.apple.main-thread
0 libsystem_kernel.dylib 0x00007fff91017282 __pthread_kill + 10
1 libsystem_c.dylib 0x00007fff922aab73 abort + 129
2 libsystem_c.dylib 0x00007fff922aacea abort_report_np + 181
3 libsystem_c.dylib 0x00007fff922d0dd0 __chk_fail + 48
4 libsystem_c.dylib 0x00007fff922d0de0 __chk_fail_overlap + 16
5 libsystem_c.dylib 0x00007fff922d0e11 __chk_overlap + 49
6 libsystem_c.dylib 0x00007fff922d0e7e __strlcpy_chk + 68
7 darkplaces-sdl 0x0000000102903b3e SV_UpdateToReliableMessages + 398 (sv_main.c:2480)
8 darkplaces-sdl 0x00000001029038bb SV_SendClientMessages + 59 (sv_main.c:2575)
9 darkplaces-sdl 0x000000010278bb5e Host_Main + 3758 (host.c:910)
10 darkplaces-sdl 0x00000001025be64f main + 239 (sys_sdl.c:223)
11 libdyld.dylib 0x00007fff8e7735c9 start + 1
From: nyov <nyov@nexnode.net>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12104
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Wed, 26 Nov 2014 12:58:29 +0000 (12:58 +0000)]
fix a buffer overlap with newer mac osx strlcpy
this fails on strcpy overlap detection in newer Mac OSX releases.
Error report: Mac OS X 10.10 (14A389)
Crashed Thread: 0 Dispatch queue: com.apple.main-thread
Exception Type: EXC_CRASH (SIGABRT)
Exception Codes: 0x0000000000000000, 0x0000000000000000
Application Specific Information:
detected source and destination buffer overlap
Thread 0 Crashed:: Dispatch queue: com.apple.main-thread
0 libsystem_kernel.dylib 0x00007fff91017282 __pthread_kill + 10
1 libsystem_c.dylib 0x00007fff922aab73 abort + 129
2 libsystem_c.dylib 0x00007fff922aacea abort_report_np + 181
3 libsystem_c.dylib 0x00007fff922d0dd0 __chk_fail + 48
4 libsystem_c.dylib 0x00007fff922d0de0 __chk_fail_overlap + 16
5 libsystem_c.dylib 0x00007fff922d0e11 __chk_overlap + 49
6 libsystem_c.dylib 0x00007fff922d0e7e __strlcpy_chk + 68
7 darkplaces-sdl 0x0000000104a3a29a Mod_LoadTextureFromQ3Shader + 74 (model_shared.c:2446)
8 darkplaces-sdl 0x0000000104a21010 Mod_Q3BSP_Load + 2224 (model_brush.c:5134)
9 darkplaces-sdl 0x0000000104a1e265 Mod_IBSP_Load + 85 (model_brush.c:7956)
10 darkplaces-sdl 0x0000000104a3398b Mod_LoadModel + 1419 (model_shared.c:498)
11 darkplaces-sdl 0x0000000104a37717 Mod_ForName + 55 (model_shared.c:616)
12 darkplaces-sdl 0x0000000104ad3f28 SV_SpawnServer + 424 (sv_main.c:3284)
13 darkplaces-sdl 0x00000001049e497f Host_Map_f + 319 (host_cmd.c:394)
14 darkplaces-sdl 0x00000001049e4bad Host_Changelevel_f + 221 (host_cmd.c:416)
15 darkplaces-sdl 0x000000010494d6f9 Cmd_ExecuteString + 617 (cmd.c:1936)
16 darkplaces-sdl 0x000000010494d14d Cbuf_Execute + 781 (cmd.c:368)
17 darkplaces-sdl 0x000000010494dbd5 Cbuf_Frame + 597 (cmd.c:384)
18 darkplaces-sdl 0x00000001049e0109 Host_Main + 1305 (host.c:781)
19 darkplaces-sdl 0x00000001048c2f06 main + 166 (sys_sdl.c:223)
20 libdyld.dylib 0x00007fff8e7735c9 start + 1
From: nyov <nyov@nexnode.net>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12103
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Thu, 16 Oct 2014 12:05:04 +0000 (12:05 +0000)]
Fix _alpha image loading.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12102
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
6d56b5f88b61a8c3092d56efafabeaa12fdd8294
divverent [Thu, 16 Oct 2014 12:05:04 +0000 (12:05 +0000)]
Fix _alpha image loading.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12102
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Wed, 15 Oct 2014 12:06:06 +0000 (12:06 +0000)]
In current gccs, it is -mfpmath=sse, not -fpmath=sse.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12101
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
5c0645a1f9104431cd3d4722720d478ec6ecf194
divverent [Wed, 15 Oct 2014 11:56:32 +0000 (11:56 +0000)]
Fix possible endless loop in VM_sprintf.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12100
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
13906da312242ecc431c6a683b9b0b2c5e9d970c
havoc [Sat, 14 Jun 2014 18:48:02 +0000 (18:48 +0000)]
raise system requirements to Pentium3 so that we can force the math
pipeline to SSE, this fixes lightmap alignment issues in several
usermade quake maps (where the x87 increased precision was resulting in
different rounding than in the map compiler)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12088
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
27508c2bb7671a9ddc486c4f379bae0d913a5836
divverent [Wed, 15 Oct 2014 12:06:06 +0000 (12:06 +0000)]
In current gccs, it is -mfpmath=sse, not -fpmath=sse.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12101
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Wed, 15 Oct 2014 11:56:32 +0000 (11:56 +0000)]
Fix possible endless loop in VM_sprintf.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12100
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Thu, 9 Oct 2014 12:24:14 +0000 (12:24 +0000)]
Regenerate SSH key.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12099
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
8989ca05d4347729e66a23acc86be4ade391bfb2
divverent [Thu, 9 Oct 2014 12:24:14 +0000 (12:24 +0000)]
Regenerate SSH key.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12099
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Sat, 4 Oct 2014 20:20:22 +0000 (20:20 +0000)]
If vid_desktopfullscreen is set, manually initialize window with the current desktop resolution instead of with the default values and then letting sdl correct it automatically when they differ. It caused issues switching from fullscreen to window mode in the first game run
Signed-off-by: terencehill <piuntn@gmail.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12098
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
c0eb3105f4f3c4daf3f2025246c516a8195686b7
divverent [Sat, 4 Oct 2014 20:16:54 +0000 (20:16 +0000)]
Implement proper support for utf8 characters in SDL2
From: terencehill <piuntn@gmail.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12097
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
0275b3fc9bbf9bea9dd5b7740ba34295a7514424
divverent [Sat, 4 Oct 2014 20:15:47 +0000 (20:15 +0000)]
SDL2: Make work numeric keypad keys when numlock is off, K_PRINTSCREEN, K_SCROLLOCK and K_NUMLOCK. Also fix a debug print (event.key.keysym.unicode doesn't exist anymore in SDL2)
From: terencehill <piuntn@gmail.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12096
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
244ac040c5cb901177e319dea3fab7891e2bd6f3
divverent [Sat, 4 Oct 2014 20:12:56 +0000 (20:12 +0000)]
Cache corona occlusion buffer
Rather than creating and destroying the occlusion buffer every frame, cache it.
This improves performance slightly.
From: Alex Goins <agoins@nvidia.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12095
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
28e02ce5a65a4eb60187acc1bca5e493d7cb78f9
divverent [Sat, 4 Oct 2014 20:12:51 +0000 (20:12 +0000)]
Implement GPU-side corona fading
Uses GL_ARB_query_buffer_object to retrieve query results directly into a
buffer. This allows corona fading to be moved into the fragment shader,
preventing a round-trip to the CPU and synchronous rendering. Depending on the
machine's configuration, it can give a dramatic performance boost.
From: Alex Goins <agoins@nvidia.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12094
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
121152f1632170629122559482a298ea8b3aaf75
divverent [Sat, 4 Oct 2014 20:20:22 +0000 (20:20 +0000)]
If vid_desktopfullscreen is set, manually initialize window with the current desktop resolution instead of with the default values and then letting sdl correct it automatically when they differ. It caused issues switching from fullscreen to window mode in the first game run
Signed-off-by: terencehill <piuntn@gmail.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12098
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Sat, 4 Oct 2014 20:16:54 +0000 (20:16 +0000)]
Implement proper support for utf8 characters in SDL2
From: terencehill <piuntn@gmail.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12097
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Sat, 4 Oct 2014 20:15:47 +0000 (20:15 +0000)]
SDL2: Make work numeric keypad keys when numlock is off, K_PRINTSCREEN, K_SCROLLOCK and K_NUMLOCK. Also fix a debug print (event.key.keysym.unicode doesn't exist anymore in SDL2)
From: terencehill <piuntn@gmail.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12096
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Sat, 4 Oct 2014 20:12:56 +0000 (20:12 +0000)]
Cache corona occlusion buffer
Rather than creating and destroying the occlusion buffer every frame, cache it.
This improves performance slightly.
From: Alex Goins <agoins@nvidia.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12095
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Sat, 4 Oct 2014 20:12:51 +0000 (20:12 +0000)]
Implement GPU-side corona fading
Uses GL_ARB_query_buffer_object to retrieve query results directly into a
buffer. This allows corona fading to be moved into the fragment shader,
preventing a round-trip to the CPU and synchronous rendering. Depending on the
machine's configuration, it can give a dramatic performance boost.
From: Alex Goins <agoins@nvidia.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12094
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Thu, 28 Aug 2014 12:47:58 +0000 (12:47 +0000)]
Disable SDLmain.m for SDL2.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12093
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
45f4690471d588436f2033dc5af008d40d57b36b
divverent [Thu, 28 Aug 2014 12:47:55 +0000 (12:47 +0000)]
More Travis changes :) Use SDL2 in all builds now.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12092
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
9a2612ff0270451436ef081994bb20dcb4299916
divverent [Thu, 28 Aug 2014 12:47:58 +0000 (12:47 +0000)]
Disable SDLmain.m for SDL2.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12093
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Thu, 28 Aug 2014 12:47:55 +0000 (12:47 +0000)]
More Travis changes :) Use SDL2 in all builds now.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12092
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Wed, 27 Aug 2014 12:46:22 +0000 (12:46 +0000)]
Add Travis-CI integration for Xonotic.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12091
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
d2e14a4b7c95b0cd90fe509c2127e9fd0ce65eee
divverent [Wed, 27 Aug 2014 12:45:55 +0000 (12:45 +0000)]
Fix build on OS X. Previously, building on OS X always assumed to be on an iDevice.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12090
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
283f7b32741d5831cccfd47012da05ea296d6463
divverent [Wed, 27 Aug 2014 12:46:22 +0000 (12:46 +0000)]
Add Travis-CI integration for Xonotic.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12091
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Wed, 27 Aug 2014 12:45:55 +0000 (12:45 +0000)]
Fix build on OS X. Previously, building on OS X always assumed to be on an iDevice.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12090
d7cf8633 -e32d-0410-b094-
e92efae38249
havoc [Sat, 14 Jun 2014 18:48:02 +0000 (18:48 +0000)]
UNMERGE! raise system requirements to Pentium3 so that we can force the math
pipeline to SSE, this fixes lightmap alignment issues in several
usermade quake maps (where the x87 increased precision was resulting in
different rounding than in the map compiler)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12088
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::unmerge=
27508c2bb7671a9ddc486c4f379bae0d913a5836
havoc [Sat, 14 Jun 2014 18:48:02 +0000 (18:48 +0000)]
raise system requirements to Pentium3 so that we can force the math
pipeline to SSE, this fixes lightmap alignment issues in several
usermade quake maps (where the x87 increased precision was resulting in
different rounding than in the map compiler)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12088
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
27508c2bb7671a9ddc486c4f379bae0d913a5836
havoc [Wed, 18 Jun 2014 04:08:58 +0000 (04:08 +0000)]
fix a /* warning in a comment
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12089
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
076e22aeceb449c0e76a85fca00c5593e683725d
havoc [Sun, 8 Jun 2014 16:57:58 +0000 (16:57 +0000)]
Fixed many issues with q2bsp support, it now works properly.
Added sv_mapformat_quake2 cvar so that qc can check for this map format and change behavior if needed (also added sv_mapformat_quake3 cvar).
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12087
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
5aacdd17d58330d1c6f6a312b72e0118895befb4
havoc [Sun, 8 Jun 2014 16:14:54 +0000 (16:14 +0000)]
Make PAK loading case insensitive for quake2 pak files...
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12086
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
78f3036de241fe5128b684eb8296731c242a42a6
havoc [Wed, 18 Jun 2014 04:08:58 +0000 (04:08 +0000)]
fix a /* warning in a comment
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12089
d7cf8633 -e32d-0410-b094-
e92efae38249
havoc [Sat, 14 Jun 2014 18:48:02 +0000 (18:48 +0000)]
raise system requirements to Pentium3 so that we can force the math
pipeline to SSE, this fixes lightmap alignment issues in several
usermade quake maps (where the x87 increased precision was resulting in
different rounding than in the map compiler)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12088
d7cf8633 -e32d-0410-b094-
e92efae38249
havoc [Sun, 8 Jun 2014 16:57:58 +0000 (16:57 +0000)]
Fixed many issues with q2bsp support, it now works properly.
Added sv_mapformat_quake2 cvar so that qc can check for this map format and change behavior if needed (also added sv_mapformat_quake3 cvar).
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12087
d7cf8633 -e32d-0410-b094-
e92efae38249
havoc [Sun, 8 Jun 2014 16:14:54 +0000 (16:14 +0000)]
Make PAK loading case insensitive for quake2 pak files...
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12086
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Wed, 4 Jun 2014 09:08:42 +0000 (09:08 +0000)]
Some fixes to the keyboard handler:
------- WGL -------
* Keyboard handler now returns Unicode chars
* Fix numlock key interpreted as pause key
* Fix numlock, scrollock and capslock binds not working
* When numlock is off numeric keypad keys now return K_END, K_DOWNARROW,
* etc... Previously they always returned K_KP_<num>
regardless of numlock state
------- SDL -------
* Simulate press and release events when numlock and capslock get
* pressed, so that they can work similarly to the other keys
(excluding key repetition, it doesn't and will never work). It's a
workaround for the default SDL behaviour with these keys:
it generate a press event when a key gets enabled, a release event when
the key gets disabled. Scrollock already works as a
normal key.
* When numlock is off numeric keypad keys now return K_END, K_DOWNARROW,
* etc... Previously they always returned K_KP_<num>
regardless of numlock state
------- GLX -------
* Add numlock, scrollock and capslock keys
From: terencehill <piuntn@gmail.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12085
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
97d120bcdc0caf47ecce1f98c4ba7bc455934065
havoc [Sun, 1 Jun 2014 08:15:00 +0000 (08:15 +0000)]
Corrected two comments regarding IBSP version of the Q2 bsp format.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12084
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
ef5c86fa7d4e8c732ee684dd706137765e5cca5f
havoc [Sun, 1 Jun 2014 08:13:34 +0000 (08:13 +0000)]
Added Quake2 BSP support (IBSP38), this is a work in progress.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12083
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
870050f3179e27ee351cc9e1d4e797ef9dc00307
divverent [Thu, 29 May 2014 20:04:10 +0000 (20:04 +0000)]
Clarify comment in CURL_fwrite.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12082
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
27b98f353293437387da06b79f2fc5c5d716ff16
havoc [Thu, 29 May 2014 20:01:57 +0000 (20:01 +0000)]
Fixed a large number of WIN64 type conversion warnings.
Changed FS_Write to do multiple write calls if the size exceeds 1GB, this is to accommodate WIN64 where write() takes a UINT rather than size_t. We have no use of such large writes at this time, so this is a mostly theoretical feature.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12081
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
d090340b054029faddb432e2c66085e6e91abcf7
havoc [Thu, 29 May 2014 19:36:03 +0000 (19:36 +0000)]
Enable multiprocessor compilation in the VS2012 projects, changed their build directories to not conflict with eachother.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12080
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
023e7bc50b3b132f1219a0ac2c57c297ea4d291d
divverent [Wed, 28 May 2014 15:14:24 +0000 (15:14 +0000)]
whichpack: distinguish file not found from file is physical.
csqc: add cltime global.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12079
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
fd726ac9658cd7d684d68a63f255ea6df7baf166
havoc [Tue, 27 May 2014 21:23:33 +0000 (21:23 +0000)]
change the isserver builtin to just return sv.active rather than
checking maxclients and dedicated
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12078
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
fe9fa4139094a17309ff4cba71631e1617d4ad07
havoc [Wed, 21 May 2014 22:23:20 +0000 (22:23 +0000)]
don't miscount the bgmvolume entry in the menu when CONFIG_CD is not
defined
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12077
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
e1ead1c3c1680a1e49298ddd3cac36f9bdf23480
havoc [Tue, 13 May 2014 22:13:15 +0000 (22:13 +0000)]
Changed the collision code used by sv_gameplayfix_nudgeoutofsolid to not consider collision_impactnudge as that is already taken care of by the caller, and the way it was being done would typically reject such collisions anyway.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12076
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
89983a6142ccbec1cfd3690fa55979bbdaf3b8f1
divverent [Wed, 4 Jun 2014 09:08:42 +0000 (09:08 +0000)]
Some fixes to the keyboard handler:
------- WGL -------
* Keyboard handler now returns Unicode chars
* Fix numlock key interpreted as pause key
* Fix numlock, scrollock and capslock binds not working
* When numlock is off numeric keypad keys now return K_END, K_DOWNARROW,
* etc... Previously they always returned K_KP_<num>
regardless of numlock state
------- SDL -------
* Simulate press and release events when numlock and capslock get
* pressed, so that they can work similarly to the other keys
(excluding key repetition, it doesn't and will never work). It's a
workaround for the default SDL behaviour with these keys:
it generate a press event when a key gets enabled, a release event when
the key gets disabled. Scrollock already works as a
normal key.
* When numlock is off numeric keypad keys now return K_END, K_DOWNARROW,
* etc... Previously they always returned K_KP_<num>
regardless of numlock state
------- GLX -------
* Add numlock, scrollock and capslock keys
From: terencehill <piuntn@gmail.com>
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12085
d7cf8633 -e32d-0410-b094-
e92efae38249
havoc [Sun, 1 Jun 2014 08:15:00 +0000 (08:15 +0000)]
Corrected two comments regarding IBSP version of the Q2 bsp format.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12084
d7cf8633 -e32d-0410-b094-
e92efae38249
havoc [Sun, 1 Jun 2014 08:13:34 +0000 (08:13 +0000)]
Added Quake2 BSP support (IBSP38), this is a work in progress.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12083
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Thu, 29 May 2014 20:04:10 +0000 (20:04 +0000)]
Clarify comment in CURL_fwrite.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12082
d7cf8633 -e32d-0410-b094-
e92efae38249
havoc [Thu, 29 May 2014 20:01:57 +0000 (20:01 +0000)]
Fixed a large number of WIN64 type conversion warnings.
Changed FS_Write to do multiple write calls if the size exceeds 1GB, this is to accommodate WIN64 where write() takes a UINT rather than size_t. We have no use of such large writes at this time, so this is a mostly theoretical feature.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12081
d7cf8633 -e32d-0410-b094-
e92efae38249
havoc [Thu, 29 May 2014 19:36:03 +0000 (19:36 +0000)]
Enable multiprocessor compilation in the VS2012 projects, changed their build directories to not conflict with eachother.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12080
d7cf8633 -e32d-0410-b094-
e92efae38249
divverent [Wed, 28 May 2014 15:14:24 +0000 (15:14 +0000)]
whichpack: distinguish file not found from file is physical.
csqc: add cltime global.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12079
d7cf8633 -e32d-0410-b094-
e92efae38249
havoc [Tue, 27 May 2014 21:23:33 +0000 (21:23 +0000)]
change the isserver builtin to just return sv.active rather than
checking maxclients and dedicated
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12078
d7cf8633 -e32d-0410-b094-
e92efae38249
havoc [Wed, 21 May 2014 22:23:20 +0000 (22:23 +0000)]
don't miscount the bgmvolume entry in the menu when CONFIG_CD is not
defined
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12077
d7cf8633 -e32d-0410-b094-
e92efae38249
havoc [Tue, 13 May 2014 22:13:15 +0000 (22:13 +0000)]
Changed the collision code used by sv_gameplayfix_nudgeoutofsolid to not consider collision_impactnudge as that is already taken care of by the caller, and the way it was being done would typically reject such collisions anyway.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12076
d7cf8633 -e32d-0410-b094-
e92efae38249
havoc [Tue, 13 May 2014 17:59:02 +0000 (17:59 +0000)]
Removed collision_enternudge, collision_leavenudge, collision_startnudge, collision_endnudge cvars, all replaced with their current value (0) as other values break collisions too badly to be of practical value.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12075
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
25316c0e938563601f0fb1ae90fe28a5d89a05d9
havoc [Tue, 13 May 2014 17:43:21 +0000 (17:43 +0000)]
Removed collision_prefernudgedfraction cvar and trace.realfraction field, this has been 1 for a very long time and it is time to lock in that value, thus trace.realfraction no longer has any reason to exist.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12074
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
d7c17c4c4c664441f27f7d6d3466dd5da5cce801
havoc [Tue, 13 May 2014 17:03:38 +0000 (17:03 +0000)]
Changed collision_enternudge and collision_leavenudge back to 0 because of massive sticking issues in terrain maps such as the Nexuiz 2.5.2 map ons-reborn.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12073
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
f42a37dfcbf93785b552c3ba3fb3ba7fdc793986
havoc [Tue, 13 May 2014 17:59:02 +0000 (17:59 +0000)]
Removed collision_enternudge, collision_leavenudge, collision_startnudge, collision_endnudge cvars, all replaced with their current value (0) as other values break collisions too badly to be of practical value.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12075
d7cf8633 -e32d-0410-b094-
e92efae38249
havoc [Tue, 13 May 2014 17:43:21 +0000 (17:43 +0000)]
Removed collision_prefernudgedfraction cvar and trace.realfraction field, this has been 1 for a very long time and it is time to lock in that value, thus trace.realfraction no longer has any reason to exist.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12074
d7cf8633 -e32d-0410-b094-
e92efae38249
havoc [Tue, 13 May 2014 17:03:38 +0000 (17:03 +0000)]
Changed collision_enternudge and collision_leavenudge back to 0 because of massive sticking issues in terrain maps such as the Nexuiz 2.5.2 map ons-reborn.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12073
d7cf8633 -e32d-0410-b094-
e92efae38249
havoc [Thu, 8 May 2014 03:10:57 +0000 (03:10 +0000)]
Overhauled the tracebox extending code, it now lives in collision.c rather than cl_collision.c/sv_phys.c and has 3 cvars controlling it:
collision_extendmovelength - affects ALL engine traces (physics, etc), this has a higher value because of how important it is to not get stuck in things.
collision_extendtraceboxlength - affects only the qc tracebox builtin.
collision_extendtracelinelength - affects only the qc traceline builtin (in particular it is a bad idea to set this to a high value because it can interfere with trace_inwater/trace_inair reporting).
Changed collision_enternudge/collision_leavenudge to behave more like Quake2/Quake3, this means that you can not sink into a brush (assuming the brush is detected - see collision_extendmovelength).
Some beautification on the RecursiveHullCheck and RecursiveLightPoint code.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12072
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
05441557527d65d14e141fbf7ae50c9bf11ae486
havoc [Thu, 8 May 2014 03:06:11 +0000 (03:06 +0000)]
Reworked r_useportalculling to use expanded portal bboxes based on r_nearclip, this resolves an issue where a portal could lie entirely behind the nearclip plane of the frustum, but still need to be recursed.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12071
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
cc143f0750869f06bef86f11dcbe1c9bef7105f8
havoc [Thu, 8 May 2014 01:02:39 +0000 (01:02 +0000)]
Fixed LightPoint code to deal better with lightmap bounds checking, this resolves several issues with item pickups in specific maps being lit wrong, thanks to jitspoe for discussion that led to this fix.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12070
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
5dc898f93ba0af06ee3eef1f587caab804d6969f
havoc [Thu, 8 May 2014 00:51:07 +0000 (00:51 +0000)]
Fix a compile error when using COLLISION_PARANOID 3.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12069
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
decd84a4a746070c70b3131770d9d7955beebbb2
havoc [Thu, 8 May 2014 00:48:59 +0000 (00:48 +0000)]
Fix sv_jumpstep cvar, whose behavior was completely inverted (jump stepping worked with it off, and did not work with it on).
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12068
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
6deb337afd3183721d10723fccd629fd3f5b990c
havoc [Wed, 7 May 2014 22:02:04 +0000 (22:02 +0000)]
fix compile error caused by mixing of SDL2 and SDL1 code
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12067
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
c4e49501ff59dbe1b5b0621f239f39538fe6641b
divverent [Wed, 7 May 2014 09:42:41 +0000 (09:42 +0000)]
Turn off alpha blending on vid_softsurface.
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12066
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
2daacad69e21dfef8d014fc67482185e2ea8af4e
havoc [Thu, 1 May 2014 01:50:34 +0000 (01:50 +0000)]
changed macosx default LINK_LIB_JPEG from shared to dlopen as we still distribute the jpeg62 version with it
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12065
d7cf8633 -e32d-0410-b094-
e92efae38249
::stable-branch::merge=
7f727de1f30b85b7f12a347b46a6537b572d3864