]> icculus.org git repositories - divverent/nexuiz.git/log
divverent/nexuiz.git
15 years agor3878 | blub0 | 2008-07-21 20:16:59 +0200 (Mon, 21 Jul 2008) | 1 line
div0 [Tue, 22 Jul 2008 06:34:12 +0000 (06:34 +0000)]
r3878 | blub0 | 2008-07-21 20:16:59 +0200 (Mon, 21 Jul 2008) | 1 line
removed debug code which prevents - from being used for binds :(
r3879 | div0 | 2008-07-22 08:23:11 +0200 (Tue, 22 Jul 2008) | 2 lines
add "teamscores" score log entry (for CTF)
r3880 | div0 | 2008-07-22 08:23:29 +0200 (Tue, 22 Jul 2008) | 2 lines
"teamscores" log entry
r3881 | div0 | 2008-07-22 08:24:03 +0200 (Tue, 22 Jul 2008) | 2 lines
writing NOTHING for nonexisting teams would be better...
r3882 | div0 | 2008-07-22 08:32:17 +0200 (Tue, 22 Jul 2008) | 2 lines
better team scores format
r3883 | div0 | 2008-07-22 08:33:08 +0200 (Tue, 22 Jul 2008) | 2 lines
changed team scores format (sorry)

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3884 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agor3875 | blub0 | 2008-07-21 18:17:48 +0200 (Mon, 21 Jul 2008) | 1 line
div0 [Mon, 21 Jul 2008 17:55:16 +0000 (17:55 +0000)]
r3875 | blub0 | 2008-07-21 18:17:48 +0200 (Mon, 21 Jul 2008) | 1 line
fixed mapname position
r3876 | blub0 | 2008-07-21 18:39:53 +0200 (Mon, 21 Jul 2008) | 1 line
fixed teamsorting, I guess

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3877 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agor3873 | blub0 | 2008-07-21 18:08:26 +0200 (Mon, 21 Jul 2008) | 1 line
div0 [Mon, 21 Jul 2008 16:10:26 +0000 (16:10 +0000)]
r3873 | blub0 | 2008-07-21 18:08:26 +0200 (Mon, 21 Jul 2008) | 1 line
spmspmspm... is officially allowed to go out of the screen :P

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3874 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agofix a file a merge apparently missed
div0 [Mon, 21 Jul 2008 15:57:08 +0000 (15:57 +0000)]
fix a file a merge apparently missed

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3872 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agor3869 | blub0 | 2008-07-21 17:47:18 +0200 (Mon, 21 Jul 2008) | 1 line
div0 [Mon, 21 Jul 2008 15:53:08 +0000 (15:53 +0000)]
r3869 | blub0 | 2008-07-21 17:47:18 +0200 (Mon, 21 Jul 2008) | 1 line
I suck today...
r3870 | div0 | 2008-07-21 17:52:25 +0200 (Mon, 21 Jul 2008) | 2 lines
Argh... use the RIGHT variable, whichpack then works better

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3871 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agoCSQC stuff, map voting; menu; new CTF scoring option; impulse 911; trigger_impulse...
div0 [Mon, 21 Jul 2008 14:44:04 +0000 (14:44 +0000)]
CSQC stuff, map voting; menu; new CTF scoring option; impulse 911; trigger_impulse extension

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3868 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years ago--force feature
div0 [Mon, 21 Jul 2008 14:34:16 +0000 (14:34 +0000)]
--force feature

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3867 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agor3837 | div0 | 2008-07-15 11:38:14 +0200 (Tue, 15 Jul 2008) | 2 lines
div0 [Tue, 15 Jul 2008 09:51:11 +0000 (09:51 +0000)]
r3837 | div0 | 2008-07-15 11:38:14 +0200 (Tue, 15 Jul 2008) | 2 lines
remove some more leaks
r3838 | div0 | 2008-07-15 11:43:53 +0200 (Tue, 15 Jul 2008) | 2 lines
netname is odd
r3839 | div0 | 2008-07-15 11:49:13 +0200 (Tue, 15 Jul 2008) | 2 lines
why do I need this?

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3840 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agoadd extra checks to branch-manager
div0 [Tue, 15 Jul 2008 09:24:41 +0000 (09:24 +0000)]
add extra checks to branch-manager
fix rcon2irc syntax errors :(

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3836 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agor3831 | div0 | 2008-07-15 11:06:17 +0200 (Tue, 15 Jul 2008) | 2 lines
div0 [Tue, 15 Jul 2008 09:16:47 +0000 (09:16 +0000)]
r3831 | div0 | 2008-07-15 11:06:17 +0200 (Tue, 15 Jul 2008) | 2 lines
try to handle read errors
r3832 | div0 | 2008-07-15 11:13:04 +0200 (Tue, 15 Jul 2008) | 3 lines
prvm_leaktest_ignore_classnames "ctf_team dom_team tdm_team"
(these are not actual leaks)

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3833 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agor3828 | div0 | 2008-07-15 08:47:11 +0200 (Tue, 15 Jul 2008) | 2 lines
div0 [Tue, 15 Jul 2008 08:52:15 +0000 (08:52 +0000)]
r3828 | div0 | 2008-07-15 08:47:11 +0200 (Tue, 15 Jul 2008) | 2 lines
fix string leak in teamplay.qc
r3829 | div0 | 2008-07-15 09:45:35 +0200 (Tue, 15 Jul 2008) | 2 lines
fix more leaks

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3830 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agor3825 | div0 | 2008-07-14 16:12:31 +0200 (Mon, 14 Jul 2008) | 2 lines
div0 [Mon, 14 Jul 2008 14:13:33 +0000 (14:13 +0000)]
r3825 | div0 | 2008-07-14 16:12:31 +0200 (Mon, 14 Jul 2008) | 2 lines
fix the suggestions[-1] bug

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3826 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years ago(branch-manager: add "unmerged-diff" command)
div0 [Mon, 14 Jul 2008 13:07:25 +0000 (13:07 +0000)]
(branch-manager: add "unmerged-diff" command)
r3822 | div0 | 2008-07-14 14:48:37 +0200 (Mon, 14 Jul 2008) | 2 lines
add COLOR_SCROLLBAR_C
r3823 | div0 | 2008-07-14 14:58:27 +0200 (Mon, 14 Jul 2008) | 2 lines
add throttling for IRC

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3824 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agor3817 | div0 | 2008-07-13 18:39:06 +0200 (Sun, 13 Jul 2008) | 2 lines
div0 [Sun, 13 Jul 2008 16:39:55 +0000 (16:39 +0000)]
r3817 | div0 | 2008-07-13 18:39:06 +0200 (Sun, 13 Jul 2008) | 2 lines
ZeroRadiant svn now also applied the "bpsurfacedialog" diff, so it is no longer needed here

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3818 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agor3807 | div0 | 2008-07-10 09:37:54 +0200 (Thu, 10 Jul 2008) | 2 lines
div0 [Sun, 13 Jul 2008 16:34:47 +0000 (16:34 +0000)]
r3807 | div0 | 2008-07-10 09:37:54 +0200 (Thu, 10 Jul 2008) | 2 lines
remove the patches that are applied in current GtkRadiant svn
r3808 | div0 | 2008-07-10 10:11:06 +0200 (Thu, 10 Jul 2008) | 2 lines
oops

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3816 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agor3799 | div0 | 2008-07-09 18:06:40 +0200 (Wed, 09 Jul 2008) | 2 lines
div0 [Sun, 13 Jul 2008 16:33:43 +0000 (16:33 +0000)]
r3799 | div0 | 2008-07-09 18:06:40 +0200 (Wed, 09 Jul 2008) | 2 lines
fix func_door description
r3800 | div0 | 2008-07-09 18:10:41 +0200 (Wed, 09 Jul 2008) | 2 lines
add spawnflag boxes
r3801 | div0 | 2008-07-09 18:24:19 +0200 (Wed, 09 Jul 2008) | 2 lines
fix bboxes of items to match FL_ITEM
r3802 | div0 | 2008-07-09 21:30:24 +0200 (Wed, 09 Jul 2008) | 3 lines
Add a benchmark .cfg that runs the server for a predefined "game".
Should only differ by operating system, may be used to benchmark server/QC VM code.
r3803 | div0 | 2008-07-09 21:31:25 +0200 (Wed, 09 Jul 2008) | 2 lines
oops, cvar name
r3804 | div0 | 2008-07-10 07:48:12 +0200 (Thu, 10 Jul 2008) | 2 lines
compilation fix for fteqcc -O0

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3815 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agor3777 | m0rfar | 2008-07-05 13:30:17 +0200 (Sat, 05 Jul 2008) | 2 lines
div0 [Sun, 13 Jul 2008 16:31:29 +0000 (16:31 +0000)]
r3777 | m0rfar | 2008-07-05 13:30:17 +0200 (Sat, 05 Jul 2008) | 2 lines
Added Nexuiz specific compile options, based on compile-settings.txt (Aggressor is still missing...)
Changed health colors a bit. And fixed trigger_hurt descriptions a bit.
r3778 | m0rfar | 2008-07-05 21:00:16 +0200 (Sat, 05 Jul 2008) | 1 line
Fixed Bleach jumpads by using target_position as target.

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3814 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agor3796 | div0 | 2008-07-09 08:02:58 +0200 (Wed, 09 Jul 2008) | 2 lines
div0 [Wed, 9 Jul 2008 14:20:30 +0000 (14:20 +0000)]
r3796 | div0 | 2008-07-09 08:02:58 +0200 (Wed, 09 Jul 2008) | 2 lines
fix ctf bug with flag touching after dead
r3797 | div0 | 2008-07-09 14:25:30 +0200 (Wed, 09 Jul 2008) | 2 lines
add brush primitives fixes

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3798 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agor3787 | m0rfar | 2008-07-07 15:59:33 +0200 (Mon, 07 Jul 2008) | 1 line
div0 [Tue, 8 Jul 2008 18:03:39 +0000 (18:03 +0000)]
r3787 | m0rfar | 2008-07-07 15:59:33 +0200 (Mon, 07 Jul 2008) | 1 line
All cl_movement_* cvars should match sv_* equivalent.. at least 2 where (slighlty) wrong.
r3788 | m0rfar | 2008-07-08 18:41:06 +0200 (Tue, 08 Jul 2008) | 1 line
Fixed Bloodprisonctf's jumppads by targeting target_position instead of info_null.

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3794 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agor3773 | div0 | 2008-07-03 15:25:33 +0200 (Thu, 03 Jul 2008) | 2 lines
div0 [Tue, 8 Jul 2008 18:01:10 +0000 (18:01 +0000)]
r3773 | div0 | 2008-07-03 15:25:33 +0200 (Thu, 03 Jul 2008) | 2 lines
default for trigger_hurt.dmg

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3793 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agor3790 | div0 | 2008-07-08 19:46:58 +0200 (Tue, 08 Jul 2008) | 2 lines
div0 [Tue, 8 Jul 2008 18:00:13 +0000 (18:00 +0000)]
r3790 | div0 | 2008-07-08 19:46:58 +0200 (Tue, 08 Jul 2008) | 2 lines
remove debug prints

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3792 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agor3752 | m0rfar | 2008-07-02 02:03:00 +0200 (Wed, 02 Jul 2008) | 2 lines
div0 [Tue, 8 Jul 2008 17:56:37 +0000 (17:56 +0000)]
r3752 | m0rfar | 2008-07-02 02:03:00 +0200 (Wed, 02 Jul 2008) | 2 lines
Hexedited all texture references in pickups .md3's. So GtkRadiant can find and display the textures in the editor.
And all textures are still fine in-game with my tests.

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3791 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agor3762-3770 | div0 | 2008-07-03 08:32:57 +0200 (Thu, 03 Jul 2008) | 2 lines
div0 [Thu, 3 Jul 2008 12:16:47 +0000 (12:16 +0000)]
r3762-3770 | div0 | 2008-07-03 08:32:57 +0200 (Thu, 03 Jul 2008) | 2 lines
some stuff for ZeroRadiant, and a preliminary new entities.def (some entities still left to document)
oops, remove some wiki syntax from the entities.def
fix info_null
make target_speaker target-able. Not THAT useful yet, but well, why not.
remove unused var
It is done! A brand new entities.def file for Nexuiz, and this time it actually fits!
reformat
add missing gridsize default
remove unused trigger_reactivate

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3772 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agor3758 | div0 | 2008-07-02 12:48:29 +0200 (Wed, 02 Jul 2008) | 2 lines
div0 [Thu, 3 Jul 2008 12:15:48 +0000 (12:15 +0000)]
r3758 | div0 | 2008-07-02 12:48:29 +0200 (Wed, 02 Jul 2008) | 2 lines
fix patches for ZeroRadiant
r3759 | div0 | 2008-07-02 12:49:22 +0200 (Wed, 02 Jul 2008) | 2 lines
fix version string
r3760 | div0 | 2008-07-02 15:45:59 +0200 (Wed, 02 Jul 2008) | 2 lines
more changes needed for Zero

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3771 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agor3755 | div0 | 2008-07-02 11:53:48 +0200 (Wed, 02 Jul 2008) | 2 lines
div0 [Wed, 2 Jul 2008 09:57:17 +0000 (09:57 +0000)]
r3755 | div0 | 2008-07-02 11:53:48 +0200 (Wed, 02 Jul 2008) | 2 lines
this never worked and the wiki works better anyway

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3757 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agor3746 | div0 | 2008-06-30 21:37:50 +0200 (Mon, 30 Jun 2008) | 2 lines
div0 [Wed, 2 Jul 2008 09:56:07 +0000 (09:56 +0000)]
r3746 | div0 | 2008-06-30 21:37:50 +0200 (Mon, 30 Jun 2008) | 2 lines
early start of merge-entities.def.pl. With syntax erorrs. Will finish it later.
r3747 | div0 | 2008-07-01 07:28:38 +0200 (Tue, 01 Jul 2008) | 2 lines
change all function declarations (except builtins and data types) to ANSI C-like syntax, to help source code cross-reference tools.
r3748 | div0 | 2008-07-01 09:32:52 +0200 (Tue, 01 Jul 2008) | 2 lines
fix misnamed trigger_hurt_touch (spawnfunc rename)
r3749 | div0 | 2008-07-01 13:51:56 +0200 (Tue, 01 Jul 2008) | 2 lines
fix the syntax of even more function definitions
r3750 | div0 | 2008-07-01 13:53:47 +0200 (Tue, 01 Jul 2008) | 2 lines
change the crusher spawnflag of func_door from 4 to 8 as 4 is already don't link
r3751 | div0 | 2008-07-01 20:41:09 +0200 (Tue, 01 Jul 2008) | 2 lines
fix name of target_objective_decrease

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3756 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agor3744 | div0 | 2008-06-30 10:30:29 +0200 (Mon, 30 Jun 2008) | 2 lines
div0 [Wed, 2 Jul 2008 09:52:25 +0000 (09:52 +0000)]
r3744 | div0 | 2008-06-30 10:30:29 +0200 (Mon, 30 Jun 2008) | 2 lines
fix the hook alias
r3745 | div0 | 2008-06-30 10:38:11 +0200 (Mon, 30 Jun 2008) | 2 lines
sv_maxidle_spectatorsareidle

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3754 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agomerge 3733-3736 (sv_gentle)
div0 [Wed, 2 Jul 2008 09:47:14 +0000 (09:47 +0000)]
merge 3733-3736 (sv_gentle)

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3753 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agor3742 | div0 | 2008-06-30 08:54:23 +0200 (Mon, 30 Jun 2008) | 2 lines
div0 [Mon, 30 Jun 2008 06:55:02 +0000 (06:55 +0000)]
r3742 | div0 | 2008-06-30 08:54:23 +0200 (Mon, 30 Jun 2008) | 2 lines
moving the mouse is also non-idling. I wonder if chatting should count as not idling too...

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3743 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agor3740 | div0 | 2008-06-30 08:44:55 +0200 (Mon, 30 Jun 2008) | 2 lines
div0 [Mon, 30 Jun 2008 06:45:45 +0000 (06:45 +0000)]
r3740 | div0 | 2008-06-30 08:44:55 +0200 (Mon, 30 Jun 2008) | 2 lines
forgot to add this (defaultNexuiz.cfg option)

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3741 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agor3737 | div0 | 2008-06-30 08:39:41 +0200 (Mon, 30 Jun 2008) | 2 lines
div0 [Mon, 30 Jun 2008 06:42:54 +0000 (06:42 +0000)]
r3737 | div0 | 2008-06-30 08:39:41 +0200 (Mon, 30 Jun 2008) | 2 lines
sv_maxidle system; add #defines for buttons
r3738 | div0 | 2008-06-30 08:41:22 +0200 (Mon, 30 Jun 2008) | 2 lines
use the button macros everywhere

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3739 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agoimprove branch-manager merge output a little
div0 [Sun, 29 Jun 2008 10:37:37 +0000 (10:37 +0000)]
improve branch-manager merge output a little

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3732 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agor3730 | div0 | 2008-06-29 12:31:38 +0200 (Sun, 29 Jun 2008) | 2 lines
div0 [Sun, 29 Jun 2008 10:35:30 +0000 (10:35 +0000)]
r3730 | div0 | 2008-06-29 12:31:38 +0200 (Sun, 29 Jun 2008) | 2 lines
oops... remove some debug spam

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3731 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agolet "unmerged" command detect revision holes that contain no single change in master...
div0 [Sun, 29 Jun 2008 10:28:49 +0000 (10:28 +0000)]
let "unmerged" command detect revision holes that contain no single change in master, and fill these gaps in .patchsets

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3729 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agoin system(), 0 means success
div0 [Sat, 28 Jun 2008 15:25:03 +0000 (15:25 +0000)]
in system(), 0 means success

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3728 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years ago------------------------------------------------------------------------
div0 [Sat, 28 Jun 2008 15:23:47 +0000 (15:23 +0000)]
------------------------------------------------------------------------
r3726 | div0 | 2008-06-28 17:22:50 +0200 (Sat, 28 Jun 2008) | 2 lines

some useful commit just so I can test my branch management script

------------------------------------------------------------------------

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3727 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agoAdded a script to manage this branch. Always use this script when merging over stuff...
div0 [Sat, 28 Jun 2008 15:20:43 +0000 (15:20 +0000)]
Added a script to manage this branch. Always use this script when merging over stuff from trunk!

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3725 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agomerge trunk
div0 [Fri, 27 Jun 2008 20:03:38 +0000 (20:03 +0000)]
merge trunk

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3724 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agoI did not want to do that. Sorry, disk space. Some admin better get rid of that mess.
div0 [Fri, 27 Jun 2008 19:12:04 +0000 (19:12 +0000)]
I did not want to do that. Sorry, disk space. Some admin better get rid of that mess.

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3723 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

15 years agoattempt to merge nexuiz-trunk into the nexuiz 2.0 (rather: 2.x) branch
div0 [Fri, 27 Jun 2008 19:08:16 +0000 (19:08 +0000)]
attempt to merge nexuiz-trunk into the nexuiz 2.0 (rather: 2.x) branch

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3722 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agomove newprojectiles2.blend to modelsource. I think it makes sense.
m0rfar [Mon, 7 Jan 2008 17:47:45 +0000 (17:47 +0000)]
move newprojectiles2.blend to modelsource. I think it makes sense.

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3115 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agochanged g_minstagib_invis_alpha <= 0 to use EF_NODRAW & added restart event to eventl...
kadaverjack [Fri, 4 Jan 2008 21:45:44 +0000 (21:45 +0000)]
changed g_minstagib_invis_alpha <= 0 to use EF_NODRAW & added restart event to eventlog.txt

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3101 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years ago- graphics config changes
div0 [Thu, 27 Dec 2007 14:58:02 +0000 (14:58 +0000)]
- graphics config changes
- evil8 improved
- md3 fixes
- silvercity and reslimed with fog
- onslaught fixes

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3056 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years ago- g_player_brightness cvar (still needs engine support)
div0 [Thu, 20 Dec 2007 11:07:30 +0000 (11:07 +0000)]
- g_player_brightness cvar (still needs engine support)
- leileilol's effect updates
- sv_maxspeed 320 matches Q3
- ZeroRadiant project
- cd tracks now with replaygain
- silvercity fog
- animinfo (with example), tag_weapon support
- electro and crylink now fire a bit faster
- less cvar queries in game, mapinfo system as option
- better reset_map function
- jumppad.noise support
- ctf flag noalign support

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@3038 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agotrunk->branch merge:
div0 [Thu, 29 Nov 2007 07:56:24 +0000 (07:56 +0000)]
trunk->branch merge:
- worldspawn() fixes for precaching
- tuned speed rune
- improved evil1_metals
- Onslaught and Assault models/sprites (these game modes still need testing, but Assault should be in known working state now)
- no more flashblend in *.cfg
- optional mapinfo system (needs testing; compile qcsrc/server with -DMAPINFO to use it)

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2996 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agotoxic
m0rfar [Fri, 16 Nov 2007 13:24:52 +0000 (13:24 +0000)]
toxic

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2970 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agonew item for minstagib: item_minst_cells (disables auto-replacement of nex & rl,...
kadaverjack [Mon, 12 Nov 2007 12:27:16 +0000 (12:27 +0000)]
new item for minstagib: item_minst_cells (disables auto-replacement of nex & rl, so mappers can place ammo where they want)

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2940 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agocrylink
m0rfar [Fri, 9 Nov 2007 10:36:19 +0000 (10:36 +0000)]
crylink

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2926 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agoHide the players for a tic and not 0.2 sec in teleporters. I hope this does not break...
m0rfar [Sun, 4 Nov 2007 17:19:41 +0000 (17:19 +0000)]
Hide the players for a tic and not 0.2 sec in teleporters. I hope this does not break anything

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2901 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agoFixed trans on grate.tga. I don't really see any difference though. :P
m0rfar [Fri, 2 Nov 2007 06:20:33 +0000 (06:20 +0000)]
Fixed trans on grate.tga. I don't really see any difference though. :P

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2886 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agoNew sky for Toxic.
m0rfar [Thu, 1 Nov 2007 16:19:15 +0000 (16:19 +0000)]
New sky for Toxic.

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2884 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agoMore Strength.
div0 [Wed, 31 Oct 2007 12:02:08 +0000 (12:02 +0000)]
More Strength.

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2876 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agochange menu_showteamselect alias to use menu_cmd (compatibility to new menu code)
div0 [Wed, 31 Oct 2007 11:07:10 +0000 (11:07 +0000)]
change menu_showteamselect alias to use menu_cmd (compatibility to new menu code)
water updates
mbuiltin.qc update
fix observer spawn point selection
set _teams_available bitmask (compatibility to new menu code)
add (unused) depth first search function to util.qc (for new menu code)

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2874 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agominor fix
div0 [Sun, 21 Oct 2007 21:52:46 +0000 (21:52 +0000)]
minor fix

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2849 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agotaking back my spammy "feature"
div0 [Sun, 21 Oct 2007 19:02:47 +0000 (19:02 +0000)]
taking back my spammy "feature"

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2847 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agotypo in console vote screen
div0 [Sun, 21 Oct 2007 17:14:25 +0000 (17:14 +0000)]
typo in console vote screen

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2845 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agoremove redundant cullentities_trace settings - use engine defaults instead. Will...
div0 [Sun, 21 Oct 2007 17:00:10 +0000 (17:00 +0000)]
remove redundant cullentities_trace settings - use engine defaults instead. Will commit different values to engine if really needed.

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2843 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agotext mode vote instructions
div0 [Sun, 21 Oct 2007 13:57:40 +0000 (13:57 +0000)]
text mode vote instructions

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2841 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agounwaterfy teleport texture
savagex [Fri, 19 Oct 2007 15:57:23 +0000 (15:57 +0000)]
unwaterfy teleport texture

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2838 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agoUpdateSelectedPlayer in server frames only
div0 [Fri, 19 Oct 2007 12:50:48 +0000 (12:50 +0000)]
UpdateSelectedPlayer in server frames only

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2836 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agomerge of Onslaught mode (beware: it still lacks its models and sounds)
div0 [Mon, 15 Oct 2007 22:48:02 +0000 (22:48 +0000)]
merge of Onslaught mode (beware: it still lacks its models and sounds)

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2831 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agor_water
div0 [Mon, 15 Oct 2007 22:38:42 +0000 (22:38 +0000)]
r_water

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2830 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agofix broken texture in eX (fix by Strahlemann)
div0 [Fri, 12 Oct 2007 11:59:45 +0000 (11:59 +0000)]
fix broken texture in eX (fix by Strahlemann)

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2826 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agonew dprint system
div0 [Wed, 10 Oct 2007 21:24:28 +0000 (21:24 +0000)]
new dprint system

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2824 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agoshtest merge
div0 [Wed, 10 Oct 2007 16:26:13 +0000 (16:26 +0000)]
shtest merge

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2821 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agoreflect, refract, bestweapon
div0 [Sun, 7 Oct 2007 14:43:43 +0000 (14:43 +0000)]
reflect, refract, bestweapon

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2819 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agoadd bestweapon support using DP_CON_BESTWEAPON
div0 [Sat, 6 Oct 2007 19:27:31 +0000 (19:27 +0000)]
add bestweapon support using DP_CON_BESTWEAPON

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2815 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agoprecache... burn, precacher, burn
div0 [Tue, 2 Oct 2007 20:08:14 +0000 (20:08 +0000)]
precache... burn, precacher, burn

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2813 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agofix division by zero, add damage value to RadiusDamage(), fix chmap after the game...
div0 [Wed, 12 Sep 2007 20:08:41 +0000 (20:08 +0000)]
fix division by zero, add damage value to RadiusDamage(), fix chmap after the game ended

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2809 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agoforgot a DAMAGE_YES
div0 [Tue, 4 Sep 2007 21:03:51 +0000 (21:03 +0000)]
forgot a DAMAGE_YES

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2805 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agosprite updates merge
div0 [Tue, 4 Sep 2007 21:03:27 +0000 (21:03 +0000)]
sprite updates merge

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2804 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agoseparate refire timers per weapon; kills the "can switch away from Nex and back for...
div0 [Sat, 1 Sep 2007 12:50:38 +0000 (12:50 +0000)]
separate refire timers per weapon; kills the "can switch away from Nex and back for faster refire" issue

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2800 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agofixed spawnshield
div0 [Thu, 23 Aug 2007 09:06:13 +0000 (09:06 +0000)]
fixed spawnshield

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2799 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agosv_defaultplayercolors no longer depends on sv_defaultcharacter!
div0 [Sat, 11 Aug 2007 12:03:21 +0000 (12:03 +0000)]
sv_defaultplayercolors no longer depends on sv_defaultcharacter!

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2797 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agoa new shirt for fullbright players
div0 [Sat, 11 Aug 2007 10:24:18 +0000 (10:24 +0000)]
a new shirt for fullbright players

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2794 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agonew colors, new noobs
div0 [Fri, 10 Aug 2007 13:16:04 +0000 (13:16 +0000)]
new colors, new noobs

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2792 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agoupdate dpextensions; most recent maps checking
div0 [Thu, 9 Aug 2007 08:14:58 +0000 (08:14 +0000)]
update dpextensions; most recent maps checking

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2790 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agofix pain_finished bug
div0 [Fri, 13 Jul 2007 18:58:15 +0000 (18:58 +0000)]
fix pain_finished bug

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2788 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agoimpulse 77
div0 [Sat, 7 Jul 2007 12:24:17 +0000 (12:24 +0000)]
impulse 77

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2785 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years ago- sv_clmovement_waitforinput 4 now after many requests
div0 [Fri, 6 Jul 2007 21:03:31 +0000 (21:03 +0000)]
- sv_clmovement_waitforinput 4 now after many requests
- impulse 99 now teleports to personal waypoint too

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2782 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agoIP banning!
div0 [Wed, 4 Jul 2007 12:45:56 +0000 (12:45 +0000)]
IP banning!
Voting now displays who is going to be kicked/banned.
Voting now allows leaving out the space between # and the status number.

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2779 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

16 years agoremoved ; from comments from server.cfg example files as DP tends to end comments...
esteel [Sun, 24 Jun 2007 15:49:18 +0000 (15:49 +0000)]
removed ; from comments from server.cfg example files as DP tends to end comments at semicolons.  will CIA print this twice?

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2772 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

17 years agoadded dedicated server scripts to start in pro mode, mentioned it in readme.txt and...
esteel [Fri, 22 Jun 2007 00:43:38 +0000 (00:43 +0000)]
added dedicated server scripts to start in pro mode, mentioned it in readme.txt and changed the order of parameters in the existing scripts

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2771 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

17 years agomore FAQ corrections..
esteel [Thu, 21 Jun 2007 04:44:41 +0000 (04:44 +0000)]
more FAQ corrections..

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2769 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

17 years agomerged hud setting to branch and updated g_maplist in default.cfg and the server...
esteel [Thu, 21 Jun 2007 04:04:50 +0000 (04:04 +0000)]
merged hud setting to branch and updated g_maplist in default.cfg and the server.cfg example file

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2768 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

17 years agofrom trunk: updated reslimed.map with the correct dom-point names
esteel [Thu, 21 Jun 2007 03:54:36 +0000 (03:54 +0000)]
from trunk: updated reslimed.map with the correct dom-point names

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2767 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

17 years agoremoved sv_maxrate so the new engine default is used
esteel [Thu, 21 Jun 2007 03:17:32 +0000 (03:17 +0000)]
removed sv_maxrate so the new engine default is used

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2766 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

17 years agoadded section 'How to report crashes' to FAQ which is still missing info for mac...
esteel [Thu, 21 Jun 2007 00:25:24 +0000 (00:25 +0000)]
added section 'How to report crashes' to FAQ which is still missing info for mac users though

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2765 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

17 years agocl_handicap (PLEASE TEST)
div0 [Tue, 19 Jun 2007 18:55:48 +0000 (18:55 +0000)]
cl_handicap (PLEASE TEST)

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2764 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

17 years agoautoskill
div0 [Tue, 19 Jun 2007 18:55:26 +0000 (18:55 +0000)]
autoskill

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2763 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

17 years ago- disable joysticks by default
kadaverjack [Mon, 11 Jun 2007 18:18:31 +0000 (18:18 +0000)]
- disable joysticks by default
- fixed spawn point names & a dompoint name on reslimed

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2760 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

17 years agocorrected problems with the formating in the new mouse acceleration text
esteel [Fri, 8 Jun 2007 11:02:46 +0000 (11:02 +0000)]
corrected problems with the formating in the new mouse acceleration text

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2758 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

17 years agosorry, made the menu even bigger :) added disconnect and team-auto/red/blue/yellow...
esteel [Thu, 7 Jun 2007 19:27:21 +0000 (19:27 +0000)]
sorry, made the menu even bigger :) added disconnect and team-auto/red/blue/yellow/pink to the bind menu

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2757 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

17 years agomade section about the team selection menu clearer and also mentioned F6 as a shortcu...
esteel [Thu, 7 Jun 2007 17:05:47 +0000 (17:05 +0000)]
made section about the team selection menu clearer and also mentioned F6 as a shortcut for 'automatically join the smaller/weaker team'

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2756 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

17 years agoadded enabling mouse acceration and getting help on irc
esteel [Wed, 6 Jun 2007 12:07:38 +0000 (12:07 +0000)]
added enabling mouse acceration and getting help on irc

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2752 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

17 years agoupdate sb_* TGAs for new HUD; test CIA-1; test CIA-1 again; this message will be...
div0 [Mon, 4 Jun 2007 21:54:53 +0000 (21:54 +0000)]
update sb_* TGAs for new HUD; test CIA-1; test CIA-1 again; this message will be printed four times?

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2751 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

17 years agoadded a few more waypoints on bleach, so bots hopefully won't get stuck anymore when...
kadaverjack [Sat, 2 Jun 2007 03:01:54 +0000 (03:01 +0000)]
added a few more waypoints on bleach, so bots hopefully won't get stuck anymore when spawning near the strength

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2749 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

17 years agoVersion := '2.3';
div0 [Thu, 31 May 2007 09:20:36 +0000 (09:20 +0000)]
Version := '2.3';

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2747 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

17 years agofrom trunk: deleted unused and stolen flash.tga
esteel [Thu, 31 May 2007 07:08:31 +0000 (07:08 +0000)]
from trunk: deleted unused and stolen flash.tga

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2746 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

17 years agofrom trunk: new levelshots for some maps to go with the new item-models (like health...
esteel [Wed, 30 May 2007 14:59:23 +0000 (14:59 +0000)]
from trunk: new levelshots for some maps to go with the new item-models (like health and armor)

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2744 f962a42d-fe04-0410-a3ab-8c8b0445ebaa