]> git.rm.cloudns.org Git - xonotic/darkplaces.git/log
xonotic/darkplaces.git
10 years agoMerge branch 'div0-stable' into nitroxis/irc nitroxis/irc
Mario [Sun, 16 Nov 2014 13:14:49 +0000 (00:14 +1100)]
Merge branch 'div0-stable' into nitroxis/irc

Conflicts:
dpdefs/menudefs.qc
prvm_cmds.c
prvm_cmds.h

10 years agoFix _alpha image loading.
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

10 years agoIn current gccs, it is -mfpmath=sse, not -fpmath=sse.
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

10 years agoFix possible endless loop in VM_sprintf.
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

10 years agoraise system requirements to Pentium3 so that we can force the math
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

10 years agoRegenerate SSH key.
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

10 years agoIf vid_desktopfullscreen is set, manually initialize window with the current desktop...
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

10 years agoImplement proper support for utf8 characters in SDL2
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

10 years agoSDL2: Make work numeric keypad keys when numlock is off, K_PRINTSCREEN, K_SCROLLOCK...
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

10 years agoCache corona occlusion buffer
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

10 years agoImplement GPU-side corona fading
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

10 years agoDisable SDLmain.m for SDL2.
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

10 years agoMore Travis changes :) Use SDL2 in all builds now.
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

10 years agoAdd Travis-CI integration for Xonotic.
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

10 years agoFix build on OS X. Previously, building on OS X always assumed to be on an iDevice.
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

10 years agoUNMERGE! raise system requirements to Pentium3 so that we can force the math
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

10 years agoraise system requirements to Pentium3 so that we can force the math
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

10 years agofix a /* warning in a comment
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

10 years agoFixed many issues with q2bsp support, it now works properly.
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

10 years agoMake PAK loading case insensitive for quake2 pak files...
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

10 years agoSome fixes to the keyboard handler:
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

10 years agoCorrected two comments regarding IBSP version of the Q2 bsp format.
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

10 years agoAdded Quake2 BSP support (IBSP38), this is a work in progress.
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

10 years agoClarify comment in CURL_fwrite.
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

10 years agoFixed a large number of WIN64 type conversion warnings.
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

10 years agoEnable multiprocessor compilation in the VS2012 projects, changed their build directo...
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

10 years agowhichpack: distinguish file not found from file is physical.
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

10 years agochange the isserver builtin to just return sv.active rather than
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

10 years agodon't miscount the bgmvolume entry in the menu when CONFIG_CD is not
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

10 years agoChanged the collision code used by sv_gameplayfix_nudgeoutofsolid to not consider...
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

10 years agoRemoved collision_enternudge, collision_leavenudge, collision_startnudge, collision_e...
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

10 years agoRemoved collision_prefernudgedfraction cvar and trace.realfraction field, this has...
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

10 years agoChanged collision_enternudge and collision_leavenudge back to 0 because of massive...
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

10 years agoOverhauled the tracebox extending code, it now lives in collision.c rather than cl_co...
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

10 years agoReworked r_useportalculling to use expanded portal bboxes based on r_nearclip, this...
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

10 years agoFixed LightPoint code to deal better with lightmap bounds checking, this resolves...
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

10 years agoFix a compile error when using COLLISION_PARANOID 3.
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

10 years agoFix sv_jumpstep cvar, whose behavior was completely inverted (jump stepping worked...
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

10 years agofix compile error caused by mixing of SDL2 and SDL1 code
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

10 years agoTurn off alpha blending on vid_softsurface.
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

10 years agochanged macosx default LINK_LIB_JPEG from shared to dlopen as we still distribute...
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

10 years agoArgh, had to update the VM_sprintf extension spec. No code change.
divverent [Wed, 9 Apr 2014 13:05:42 +0000 (13:05 +0000)]
Argh, had to update the VM_sprintf extension spec. No code change.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12062 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=072bea87c4ac0bafb75912355b248b8dafb5b37e

10 years agopatch from graphitemaster that changes r_fxaa use of texture2D in
havoc [Wed, 9 Apr 2014 04:35:09 +0000 (04:35 +0000)]
patch from graphitemaster that changes r_fxaa use of texture2D in
default.glsl to use dp_texture2D instead (which resolves to the correct
texture function on later GL versions)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12061 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=f6dad5a1884f3d5e6c20ad378af8899bb01e7aba

10 years agoMake r_fxaa also enable postprocessing shaders so only one cvar is
divverent [Sat, 5 Apr 2014 10:07:18 +0000 (10:07 +0000)]
Make r_fxaa also enable postprocessing shaders so only one cvar is
needed to enable FXAA.

From: graphitemaster

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12060 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=7d1d5e0177e2b428999bc585d06e240bdeb24c86

10 years agoProperly make the blur conditional on non empty uservecs 1 and 2.
divverent [Sat, 5 Apr 2014 10:07:15 +0000 (10:07 +0000)]
Properly make the blur conditional on non empty uservecs 1 and 2.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12059 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=4322b75189b0a2b416dfc7a571c94d91337e2c14

10 years agochanged dpmaster.deathmask.net ip4 address, added ip6 address
havoc [Sun, 16 Mar 2014 00:06:53 +0000 (00:06 +0000)]
changed dpmaster.deathmask.net ip4 address, added ip6 address

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12058 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=a3c1266f29afbcf0794252a5ea2f8d0ab6820307

10 years agoFix very stupid typo by me in counting coverage() statements.
divverent [Sat, 15 Mar 2014 12:23:41 +0000 (12:23 +0000)]
Fix very stupid typo by me in counting coverage() statements.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12057 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=bb4204c8238b1f2dc07912c01d50f9a03db6b694

10 years agoClarify what sprintf does on %1$s %s
divverent [Sat, 8 Mar 2014 17:57:10 +0000 (17:57 +0000)]
Clarify what sprintf does on %1$s %s

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12056 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=217d39f7bcfcbbacdc090dd43c624e3d6aa43ce6

10 years agoincrease MAX_PARTICLEEFFECTNAME and MAX_PARTICLEEFFECTINFO limits
havoc [Tue, 4 Mar 2014 23:21:13 +0000 (23:21 +0000)]
increase MAX_PARTICLEEFFECTNAME and MAX_PARTICLEEFFECTINFO limits
(formerly 256,4096 and now 4096,8192)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12055 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=446a6bb71c7ac5f1d7fe4dc1f6b41d0f01f4a91a

10 years agomake R_View_UpdateEntityVisible more readable and consistent
havoc [Wed, 26 Feb 2014 02:38:43 +0000 (02:38 +0000)]
make R_View_UpdateEntityVisible more readable and consistent

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12054 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=dd2a1456eec1f8bbf7a0cc99e13e941e2d179d15

10 years agodon't skip nearclip plane in R_CullBox as it is possible that the view
havoc [Mon, 24 Feb 2014 23:44:45 +0000 (23:44 +0000)]
don't skip nearclip plane in R_CullBox as it is possible that the view
is in ortho mode

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12053 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=8be0763b241d161604c351684c74532a716ec17c

10 years agoallow .rtlights files to have style values outside the range
havoc [Thu, 30 Jan 2014 02:05:50 +0000 (02:05 +0000)]
allow .rtlights files to have style values outside the range
0...MAX_LIGHTSTYLES - in particular, -1 is used by fte for unstyled
lights and this is a compatible behavior, just that the loader was
getting in the way.

for safety the MAX_LIGHTSTYLES comparison has been added to each use of
light->style in rendering.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12052 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=3c414347a82d52139aa5473e15d0b9e9242f5f9e

10 years agoIRC callbacks and built-ins. Some fixes here and there.
nitroxis [Sun, 16 Feb 2014 18:37:23 +0000 (19:37 +0100)]
IRC callbacks and built-ins. Some fixes here and there.

10 years agoFix some d0_blind_id related bugs:
divverent [Fri, 24 Jan 2014 16:39:06 +0000 (16:39 +0000)]
Fix some d0_blind_id related bugs:

- Higher numbered CAs should have priority over lower numbered CAs,
  making CA 0 the "default" CA.
- Fix the "Authenticated connection to ..." message (no more -@- crap).

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12051 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=2eb1f2e3f267600373aaf015b4caf6ea4a4163dc

10 years agoAdded more cvars. Also detect disconnect.
nitroxis [Sat, 18 Jan 2014 13:51:14 +0000 (14:51 +0100)]
Added more cvars. Also detect disconnect.

10 years agoAlways pass CDS_FULLSCREEN to ChangeDisplaySettings, fixes #1797.
divverent [Sat, 18 Jan 2014 11:19:45 +0000 (11:19 +0000)]
Always pass CDS_FULLSCREEN to ChangeDisplaySettings, fixes #1797.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12050 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=5209e22c7ac3a3c254e5d5e12c524e52ec2b140c

10 years agoConnecting to an IRC server and sending commands works now.
nitroxis [Sat, 18 Jan 2014 02:29:58 +0000 (03:29 +0100)]
Connecting to an IRC server and sending commands works now.

10 years agoWorkaround for non-blocking TCP sockets.
nitroxis [Sat, 18 Jan 2014 01:58:47 +0000 (02:58 +0100)]
Workaround for non-blocking TCP sockets.

10 years agoFixes for IRC. Not working though.
nitroxis [Tue, 14 Jan 2014 22:38:28 +0000 (23:38 +0100)]
Fixes for IRC. Not working though.

10 years agoMerge remote-tracking branch 'origin/divVerent/lhnet_tcp' into nitroxis/irc
nitroxis [Sat, 11 Jan 2014 21:31:03 +0000 (22:31 +0100)]
Merge remote-tracking branch 'origin/divVerent/lhnet_tcp' into nitroxis/irc

10 years agoSmall fixes for IRC.
nitroxis [Fri, 10 Jan 2014 19:47:29 +0000 (20:47 +0100)]
Small fixes for IRC.

10 years agoIRC: respond to pings
Jānis Rūcis [Sat, 3 Apr 2010 15:28:23 +0000 (18:28 +0300)]
IRC: respond to pings

10 years agoIRC: fix crash due to a missing prefix
Jānis Rūcis [Fri, 2 Apr 2010 16:57:03 +0000 (19:57 +0300)]
IRC: fix crash due to a missing prefix

10 years agoIRC: use a private memory pool
Jānis Rūcis [Fri, 2 Apr 2010 16:56:28 +0000 (19:56 +0300)]
IRC: use a private memory pool

10 years agoIRC: recognize some more commands and replies
Jānis Rūcis [Fri, 2 Apr 2010 12:23:21 +0000 (15:23 +0300)]
IRC: recognize some more commands and replies

10 years agoIRC: add some readable console output
Jānis Rūcis [Thu, 1 Apr 2010 20:01:35 +0000 (23:01 +0300)]
IRC: add some readable console output

10 years agoIRC: start understanding numeric replies
Jānis Rūcis [Thu, 1 Apr 2010 19:50:24 +0000 (22:50 +0300)]
IRC: start understanding numeric replies

10 years agoIRC: use player name as "real name"
Jānis Rūcis [Thu, 1 Apr 2010 17:49:53 +0000 (20:49 +0300)]
IRC: use player name as "real name"

10 years agoIRC: irc_nickname cvar
Jānis Rūcis [Thu, 1 Apr 2010 16:53:26 +0000 (19:53 +0300)]
IRC: irc_nickname cvar

10 years agoIRC: mark developer prints
Jānis Rūcis [Wed, 31 Mar 2010 17:53:33 +0000 (20:53 +0300)]
IRC: mark developer prints

10 years agoIRC: tweak messages
Jānis Rūcis [Wed, 31 Mar 2010 17:52:39 +0000 (20:52 +0300)]
IRC: tweak messages

10 years agoIRC: check full buffers
Jānis Rūcis [Wed, 31 Mar 2010 16:10:04 +0000 (19:10 +0300)]
IRC: check full buffers

10 years agoIRC: use size_t where-ever appropriate
Jānis Rūcis [Wed, 31 Mar 2010 15:47:45 +0000 (18:47 +0300)]
IRC: use size_t where-ever appropriate

10 years agoIRC: make a struct for input/output buffers
Jānis Rūcis [Wed, 31 Mar 2010 15:47:26 +0000 (18:47 +0300)]
IRC: make a struct for input/output buffers

10 years agoIRC: clean up on engine shutdown
Jānis Rūcis [Wed, 31 Mar 2010 00:19:51 +0000 (03:19 +0300)]
IRC: clean up on engine shutdown

Conflicts:
irc.h

10 years agoIRC: minor cleanup
Jānis Rūcis [Tue, 30 Mar 2010 22:58:36 +0000 (01:58 +0300)]
IRC: minor cleanup

10 years agoIRC: move functions around
Jānis Rūcis [Tue, 30 Mar 2010 20:42:35 +0000 (23:42 +0300)]
IRC: move functions around

10 years agoIRC: factor out message printing
Jānis Rūcis [Tue, 30 Mar 2010 20:18:34 +0000 (23:18 +0300)]
IRC: factor out message printing

10 years agoIRC: argument parsing
Jānis Rūcis [Tue, 30 Mar 2010 19:32:23 +0000 (22:32 +0300)]
IRC: argument parsing

10 years agoIRC: clean up parsing sanity checks
Jānis Rūcis [Tue, 30 Mar 2010 17:40:50 +0000 (20:40 +0300)]
IRC: clean up parsing sanity checks

10 years agoIRC: tweak error messages
Jānis Rūcis [Tue, 30 Mar 2010 17:40:34 +0000 (20:40 +0300)]
IRC: tweak error messages

10 years agoIRC: remove a cast
Jānis Rūcis [Tue, 30 Mar 2010 17:10:42 +0000 (20:10 +0300)]
IRC: remove a cast

10 years agoIRC: tweak registration
Jānis Rūcis [Tue, 30 Mar 2010 17:10:14 +0000 (20:10 +0300)]
IRC: tweak registration

10 years agoIRC: factor out message parsing
Jānis Rūcis [Tue, 30 Mar 2010 15:33:46 +0000 (18:33 +0300)]
IRC: factor out message parsing

10 years agoIRC: primitive message parsing
Jānis Rūcis [Tue, 30 Mar 2010 14:41:01 +0000 (17:41 +0300)]
IRC: primitive message parsing

10 years agoIRC: tweak IRC_Frame
Jānis Rūcis [Tue, 30 Mar 2010 12:54:00 +0000 (15:54 +0300)]
IRC: tweak IRC_Frame

10 years agoIRC: split ProcessMessages into ProcessAllMessages and ProcessMessage
Jānis Rūcis [Tue, 30 Mar 2010 12:53:20 +0000 (15:53 +0300)]
IRC: split ProcessMessages into ProcessAllMessages and ProcessMessage

10 years agoIRC: simplify line splitting
Jānis Rūcis [Tue, 30 Mar 2010 12:45:47 +0000 (15:45 +0300)]
IRC: simplify line splitting

Conflicts:
irc.c

10 years agosdl2: fix mouse wheel
divverent [Fri, 10 Jan 2014 18:53:30 +0000 (18:53 +0000)]
sdl2: fix mouse wheel

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12049 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=2420097dc121c3bf40bd0fb63c2c1be182720e62

10 years agosdl2: fix compile.
divverent [Fri, 10 Jan 2014 18:38:11 +0000 (18:38 +0000)]
sdl2: fix compile.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12048 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=8b71b1316efa1753420f848c919215e6b46479bb

10 years agoSupport statementprofiling in the fast interpreter.
divverent [Wed, 8 Jan 2014 16:02:04 +0000 (16:02 +0000)]
Support statementprofiling in the fast interpreter.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12047 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=5d1056425e3b98f9aed312478e55190a16415c2b

10 years agoRestructure profiling to allow easier statement coverage later.
divverent [Wed, 8 Jan 2014 16:02:01 +0000 (16:02 +0000)]
Restructure profiling to allow easier statement coverage later.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12046 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=66c17456052bcd458a64c76802d04618bd464d05

10 years agoUse PreError() for warnings too. Simpler code!
divverent [Wed, 8 Jan 2014 16:01:58 +0000 (16:01 +0000)]
Use PreError() for warnings too. Simpler code!

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12045 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=a98016316992f6daad635aba23295bee1ebeb3fb

10 years agoUse an explicit jump table for QCVM instruction dispatch.
divverent [Tue, 7 Jan 2014 19:22:59 +0000 (19:22 +0000)]
Use an explicit jump table for QCVM instruction dispatch.

Also, duplicate the dispatch into the end of each case for additional
speedup (each of these branches gets a separate branch prediction slot
on many CPUs, which pays off quickly).

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12044 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=91efd4d4260983eae86f644ff1813cc391d3c27e

10 years agoBetter coverage output.
divverent [Tue, 7 Jan 2014 16:29:29 +0000 (16:29 +0000)]
Better coverage output.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12043 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=15f3ecf8b59f74d65d3382c729034790650f6264

10 years agoCOVERAGE! Also fixes prvm always running as PRVMSLOWINTERPRETER :(
divverent [Tue, 7 Jan 2014 16:29:25 +0000 (16:29 +0000)]
COVERAGE! Also fixes prvm always running as PRVMSLOWINTERPRETER :(

Very basic implementation. Needs a persistent store later, I suppose, as
well as better output (e.g. for statements and coverage(), also show
function, file and line).

prvm_coverage 1: report function call coverage
prvm_coverage 2: report coverage() builtin coverage (compiler aided)
prvm_coverage 4: report statement coverage (SLOW)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12042 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=f77d65db40fde1a5e3191628c8b1f9a47b76ba08

10 years agoFix some warnings.
divverent [Tue, 7 Jan 2014 16:29:21 +0000 (16:29 +0000)]
Fix some warnings.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12041 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=b314e889bc28c04da19258529b3215f37baa6629

10 years agoExtra commit so the top commit doesn't look like a merge.
Rudolf Polzer [Mon, 6 Jan 2014 12:15:54 +0000 (13:15 +0100)]
Extra commit so the top commit doesn't look like a merge.

Fixes "upstream rebase detected" issues.

10 years ago::stable-branch::reset=48dd658f8bbfa60efbd5f56d1c208727c4418078
Rudolf Polzer [Mon, 6 Jan 2014 10:16:12 +0000 (11:16 +0100)]
::stable-branch::reset=48dd658f8bbfa60efbd5f56d1c208727c4418078

10 years agoPatch by graphitemaster to support column number enhanced lno format.
divverent [Mon, 6 Jan 2014 10:00:04 +0000 (10:00 +0000)]
Patch by graphitemaster to support column number enhanced lno format.

From: Dale Weiler <killfieldengine@gmail.com>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12040 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=48dd658f8bbfa60efbd5f56d1c208727c4418078