]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
12 years agoClean up something in FlagThink method
Samual [Mon, 2 Apr 2012 21:57:46 +0000 (17:57 -0400)]
Clean up something in FlagThink method

12 years agoForce angles '0 0 0' for dropped/passing flags, in case they get warped or such
Samual [Mon, 2 Apr 2012 17:59:45 +0000 (13:59 -0400)]
Force angles '0 0 0' for dropped/passing flags, in case they get warped or such

12 years agoNew entity property: "teleportable" -- also use it to enable CTF flags to teleport
Samual [Mon, 2 Apr 2012 17:50:58 +0000 (13:50 -0400)]
New entity property: "teleportable" -- also use it to enable CTF flags to teleport

12 years agoMake flags float in water
Samual [Mon, 2 Apr 2012 16:18:21 +0000 (12:18 -0400)]
Make flags float in water

12 years agoGameover check is not needed in matchend hook
Samual [Mon, 2 Apr 2012 15:51:57 +0000 (11:51 -0400)]
Gameover check is not needed in matchend hook

12 years agoMake captureshield work properly
Samual [Mon, 2 Apr 2012 15:48:09 +0000 (11:48 -0400)]
Make captureshield work properly

12 years agoRemove deprecated CTF code in cl_client.qc and teamplay.qc
Samual [Mon, 2 Apr 2012 15:34:00 +0000 (11:34 -0400)]
Remove deprecated CTF code in cl_client.qc and teamplay.qc

12 years agoRemove blank line
Samual [Mon, 2 Apr 2012 15:27:05 +0000 (11:27 -0400)]
Remove blank line

12 years agoHandle vehicles better
Samual [Mon, 2 Apr 2012 15:24:32 +0000 (11:24 -0400)]
Handle vehicles better

12 years agoUse MatchEnd mutator hook for game over handling
Samual [Mon, 2 Apr 2012 14:48:43 +0000 (10:48 -0400)]
Use MatchEnd mutator hook for game over handling

12 years agoCheck game over in the flag think function -- if a flag is dropped or passing, instan...
Samual [Mon, 2 Apr 2012 14:17:46 +0000 (10:17 -0400)]
Check game over in the flag think function -- if a flag is dropped or passing, instantly stop it from moving (game is over, everything should pause.)

12 years agoClean up more game mode specific code
Samual [Mon, 2 Apr 2012 07:17:26 +0000 (03:17 -0400)]
Clean up more game mode specific code

12 years agoMerge remote branch 'origin/master' into samual/mutator_ctf
Samual [Mon, 2 Apr 2012 06:58:00 +0000 (02:58 -0400)]
Merge remote branch 'origin/master' into samual/mutator_ctf

Conflicts:
qcsrc/server/mutators/base.qh

12 years agoActually, re-re-think that even more
Samual [Mon, 2 Apr 2012 06:50:22 +0000 (02:50 -0400)]
Actually, re-re-think that even more

12 years agoMerge remote-tracking branch 'origin/divVerent/weapons-field-rewrite'
Rudolf Polzer [Mon, 2 Apr 2012 06:49:53 +0000 (08:49 +0200)]
Merge remote-tracking branch 'origin/divVerent/weapons-field-rewrite'

12 years agoActually, re-think that a little bit
Samual [Mon, 2 Apr 2012 06:48:39 +0000 (02:48 -0400)]
Actually, re-think that a little bit

12 years agodon't allow passing if the player is in a vehicle
Samual [Mon, 2 Apr 2012 06:46:36 +0000 (02:46 -0400)]
don't allow passing if the player is in a vehicle

12 years agoClean up centerprints for enemyflagcarrier announcement
Samual [Mon, 2 Apr 2012 06:40:10 +0000 (02:40 -0400)]
Clean up centerprints for enemyflagcarrier announcement

12 years agoAdd mutator hooks for vehicle entrance and exit -- this way CTF code can handle it...
Samual [Mon, 2 Apr 2012 05:56:28 +0000 (01:56 -0400)]
Add mutator hooks for vehicle entrance and exit -- this way CTF code can handle it directly.

12 years agoTweak settings
Samual [Mon, 2 Apr 2012 05:31:26 +0000 (01:31 -0400)]
Tweak settings

12 years agoAdd comments
Samual [Mon, 2 Apr 2012 05:26:26 +0000 (01:26 -0400)]
Add comments

12 years agoImplement new mutator hook to handle the "help me" ping for mutators that need to...
Samual [Mon, 2 Apr 2012 05:18:43 +0000 (01:18 -0400)]
Implement new mutator hook to handle the "help me" ping for mutators that need to adjust it

12 years agoRemove more game mode dependent code from other files
Samual [Mon, 2 Apr 2012 04:38:19 +0000 (00:38 -0400)]
Remove more game mode dependent code from other files

12 years agoRemove useless declaration
Samual [Mon, 2 Apr 2012 03:25:56 +0000 (23:25 -0400)]
Remove useless declaration

12 years agoNo need to use macros for this, just declare them directly
Samual [Mon, 2 Apr 2012 03:17:43 +0000 (23:17 -0400)]
No need to use macros for this, just declare them directly

12 years agoDon't send centerprints to non-real clients, fix potential bug with returning, and...
Samual [Mon, 2 Apr 2012 03:06:46 +0000 (23:06 -0400)]
Don't send centerprints to non-real clients, fix potential bug with returning, and make dropped flags use newtonian physics. (so if the fc dies while jumping in a certain direction, the flag will keep that momentum)

12 years agoMore waypoint_for_enemy flagcarrier stuff, plus some cleanups/tweaks
Samual [Mon, 2 Apr 2012 02:44:56 +0000 (22:44 -0400)]
More waypoint_for_enemy flagcarrier stuff, plus some cleanups/tweaks

12 years agoImplementing several new waypointsprite features (like time limits until enemy flag...
Samual [Mon, 2 Apr 2012 01:45:11 +0000 (21:45 -0400)]
Implementing several new waypointsprite features (like time limits until enemy flag carriers are given waypointsprites)

12 years agoAdd g_ctf_portalteleport cvar to toggle whether flag carriers can go through portal...
Samual [Sun, 1 Apr 2012 21:25:24 +0000 (17:25 -0400)]
Add g_ctf_portalteleport cvar to toggle whether flag carriers can go through portal gun teleporters- also clean up/improve some of the other cvars

12 years agoAdd collect delay for returning flags too
Samual [Sun, 1 Apr 2012 21:05:08 +0000 (17:05 -0400)]
Add collect delay for returning flags too

12 years agoMove DROP_RESET case slightly
Samual [Sun, 1 Apr 2012 20:58:16 +0000 (16:58 -0400)]
Move DROP_RESET case slightly

12 years agoFix more bugs
Samual [Sun, 1 Apr 2012 20:57:09 +0000 (16:57 -0400)]
Fix more bugs

12 years agoImprovements to how dropped flags are handled
Samual [Sun, 1 Apr 2012 17:54:36 +0000 (13:54 -0400)]
Improvements to how dropped flags are handled

12 years agoFix flag throwing bug and dropped capture bug
Samual [Sun, 1 Apr 2012 17:13:17 +0000 (13:13 -0400)]
Fix flag throwing bug and dropped capture bug

12 years agoAlso clean up dropping code a little bit
Samual [Sun, 1 Apr 2012 08:27:43 +0000 (04:27 -0400)]
Also clean up dropping code a little bit

12 years agoMerge capture code and update other status sharing code
Samual [Sun, 1 Apr 2012 08:12:52 +0000 (04:12 -0400)]
Merge capture code and update other status sharing code

12 years agoMerge flag pickup handling code
Samual [Sun, 1 Apr 2012 07:29:55 +0000 (03:29 -0400)]
Merge flag pickup handling code

12 years agoEVEN MORE cleanup of redundant code
Samual [Sun, 1 Apr 2012 06:36:03 +0000 (02:36 -0400)]
EVEN MORE cleanup of redundant code

12 years agoRemove more redundant code
Samual [Sun, 1 Apr 2012 05:26:38 +0000 (01:26 -0400)]
Remove more redundant code

12 years agoRemove unused cvar
Samual [Sun, 1 Apr 2012 04:51:20 +0000 (00:51 -0400)]
Remove unused cvar

12 years agoFix two bugs (multiple captures at once bug, and issue with flag touching bug)
Samual [Sun, 1 Apr 2012 04:46:17 +0000 (00:46 -0400)]
Fix two bugs (multiple captures at once bug, and issue with flag touching bug)

12 years agoFix record keeping for flag capture times
Samual [Sun, 1 Apr 2012 04:04:32 +0000 (00:04 -0400)]
Fix record keeping for flag capture times

12 years agoFix several bugs, also only pass the flag if the team mate isn't behind a wall
Samual [Sun, 1 Apr 2012 02:00:38 +0000 (22:00 -0400)]
Fix several bugs, also only pass the flag if the team mate isn't behind a wall

12 years agoFinish implementing ctf_Handle_Failed_Pass()
Samual [Sun, 1 Apr 2012 01:10:42 +0000 (21:10 -0400)]
Finish implementing ctf_Handle_Failed_Pass()

12 years agoUse MOVETYPE_FLY while passing the flag instead of MOVETYPE_TOSS -- this helps agains...
Samual [Sun, 1 Apr 2012 00:50:52 +0000 (20:50 -0400)]
Use MOVETYPE_FLY while passing the flag instead of MOVETYPE_TOSS -- this helps against the flag getting stuck in a corner

12 years agoMake bots automatically pass you the flag if you send them a request (so if you ...
Samual [Sun, 1 Apr 2012 00:33:32 +0000 (20:33 -0400)]
Make bots automatically pass you the flag if you send them a request (so if you +use while next to a bot flagcarrier on your team, they will throw you the flag instantly)

12 years agoImplement whole new passing/throwing system which *actually* throws the flag to team...
Samual [Sun, 1 Apr 2012 00:24:25 +0000 (20:24 -0400)]
Implement whole new passing/throwing system which *actually* throws the flag to team mates, allows for interception by enemies and has a cool animation.

12 years agoMore small things
Samual [Sat, 31 Mar 2012 20:56:47 +0000 (16:56 -0400)]
More small things

12 years agoQuick fixes
Samual [Sat, 31 Mar 2012 20:53:26 +0000 (16:53 -0400)]
Quick fixes

12 years agoBegin adding FLAG_PASSING flag status and think/touch methods
Samual [Sat, 31 Mar 2012 20:46:17 +0000 (16:46 -0400)]
Begin adding FLAG_PASSING flag status and think/touch methods

12 years agoClean up more redundant code
Samual [Sat, 31 Mar 2012 20:45:09 +0000 (16:45 -0400)]
Clean up more redundant code

12 years agoMove pass/throw/drop code out of the event handler section and give it a special...
Samual [Sat, 31 Mar 2012 20:35:37 +0000 (16:35 -0400)]
Move pass/throw/drop code out of the event handler section and give it a special section, allow team mates to request the flag carrier to pass the flag to them, new antispam for passing, remove duplicate code for setting records upon capture events

12 years agoEnable droppedcapture code to actually work
Samual [Sat, 31 Mar 2012 19:47:34 +0000 (15:47 -0400)]
Enable droppedcapture code to actually work

12 years agoChange dropperid/pickupid to just reference the entity of the players directly instea...
Samual [Sat, 31 Mar 2012 18:05:16 +0000 (14:05 -0400)]
Change dropperid/pickupid to just reference the entity of the players directly instead of using .playerid

12 years agostuff
Rudolf Polzer [Sat, 31 Mar 2012 17:38:55 +0000 (19:38 +0200)]
stuff

12 years agocomment stuff
Rudolf Polzer [Sat, 31 Mar 2012 17:37:32 +0000 (19:37 +0200)]
comment stuff

12 years agoAdd antispam for passing flags
Samual [Sat, 31 Mar 2012 17:33:20 +0000 (13:33 -0400)]
Add antispam for passing flags

12 years agoAdd the cvars back for flagcarrier stuffz and fix some whitespace issues
Samual [Sat, 31 Mar 2012 16:46:52 +0000 (12:46 -0400)]
Add the cvars back for flagcarrier stuffz and fix some whitespace issues

12 years agoreenable the other spawn funcs for now
Rudolf Polzer [Sat, 31 Mar 2012 16:40:01 +0000 (18:40 +0200)]
reenable the other spawn funcs for now

12 years agoMerge branch 'master' into divVerent/weapons-field-rewrite
Rudolf Polzer [Sat, 31 Mar 2012 16:36:38 +0000 (18:36 +0200)]
Merge branch 'master' into divVerent/weapons-field-rewrite

Conflicts:
qcsrc/server/t_items.qc

12 years agoAdd proper checks for NEEDKILL
Samual [Sat, 31 Mar 2012 16:29:54 +0000 (12:29 -0400)]
Add proper checks for NEEDKILL

12 years agoMerge remote branch 'origin/master' into samual/mutator_ctf
Samual [Sat, 31 Mar 2012 16:13:43 +0000 (12:13 -0400)]
Merge remote branch 'origin/master' into samual/mutator_ctf

12 years agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Sat, 31 Mar 2012 11:08:09 +0000 (13:08 +0200)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

12 years agoclean up content flags checks for killing items/flags
Rudolf Polzer [Sat, 31 Mar 2012 11:06:38 +0000 (13:06 +0200)]
clean up content flags checks for killing items/flags

12 years agoI swear i'm going to sleep after this
Samual [Sat, 31 Mar 2012 06:55:05 +0000 (02:55 -0400)]
I swear i'm going to sleep after this

12 years agoMOAR FIXES.
Samual [Sat, 31 Mar 2012 06:26:46 +0000 (02:26 -0400)]
MOAR FIXES.

12 years agoMore fixes...
Samual [Sat, 31 Mar 2012 06:03:05 +0000 (02:03 -0400)]
More fixes...

12 years agoAdd pushable property, and a small fix for performance
Samual [Sat, 31 Mar 2012 05:58:56 +0000 (01:58 -0400)]
Add pushable property, and a small fix for performance

12 years agoMore fixes/cleanups
Samual [Sat, 31 Mar 2012 05:42:26 +0000 (01:42 -0400)]
More fixes/cleanups

12 years agoBegin implementing ctf_Handle_Dropped_Capture()
Samual [Sat, 31 Mar 2012 04:37:27 +0000 (00:37 -0400)]
Begin implementing ctf_Handle_Dropped_Capture()

12 years agoConsistency, consistency, consistency...
Samual [Sat, 31 Mar 2012 02:26:54 +0000 (22:26 -0400)]
Consistency, consistency, consistency...

12 years agoMore cleanup, more fixes, and also make the passing trace look for the closest target...
Samual [Sat, 31 Mar 2012 02:25:17 +0000 (22:25 -0400)]
More cleanup, more fixes, and also make the passing trace look for the closest target instead of just the first one it hits

12 years agoFix that last commit
Samual [Sat, 31 Mar 2012 01:18:29 +0000 (21:18 -0400)]
Fix that last commit

12 years agoImplement "FLAG_TOUCHRATE" to limit the sounds/effects used when a flag is touched...
Samual [Sat, 31 Mar 2012 01:03:42 +0000 (21:03 -0400)]
Implement "FLAG_TOUCHRATE" to limit the sounds/effects used when a flag is touched (stops spamming of it)

12 years agoFinish implementing passing and fix a few other things
Samual [Sat, 31 Mar 2012 00:56:39 +0000 (20:56 -0400)]
Finish implementing passing and fix a few other things

12 years agoNew passing/dropping system, flags are now "thrown" instead of dropped, and some...
Samual [Sat, 31 Mar 2012 00:07:19 +0000 (20:07 -0400)]
New passing/dropping system, flags are now "thrown" instead of dropped, and some other fixes/clean ups for centerprint messages. Also, make the "dropped flag" waypoint be colored slightly like the flag color

12 years agoAutomatically return the flag if it touches trigger_hurt or lava/slime
Samual [Fri, 30 Mar 2012 19:59:53 +0000 (15:59 -0400)]
Automatically return the flag if it touches trigger_hurt or lava/slime

12 years agoMerge remote branch 'origin/master' into samual/mutator_ctf
Samual [Fri, 30 Mar 2012 18:35:45 +0000 (14:35 -0400)]
Merge remote branch 'origin/master' into samual/mutator_ctf

12 years agoUpdate return message a bit
Samual [Fri, 30 Mar 2012 18:35:12 +0000 (14:35 -0400)]
Update return message a bit

12 years agoEnable/fix verbosename centerprints, and add cvar for showing dropped flag waypointsp...
Samual [Fri, 30 Mar 2012 18:29:53 +0000 (14:29 -0400)]
Enable/fix verbosename centerprints, and add cvar for showing dropped flag waypointsprites

12 years agoMany more bug fixes/new features/cleanups
Samual [Fri, 30 Mar 2012 17:50:04 +0000 (13:50 -0400)]
Many more bug fixes/new features/cleanups

12 years agosv_vote_nospectators, sv_chat_nospectators: treat warmup and gameover state the same.
Rudolf Polzer [Fri, 30 Mar 2012 13:01:37 +0000 (15:01 +0200)]
sv_vote_nospectators, sv_chat_nospectators: treat warmup and gameover state the same.

12 years agoCreate separate FLAG_SCALE constant
Samual [Fri, 30 Mar 2012 03:36:31 +0000 (23:36 -0400)]
Create separate FLAG_SCALE constant

12 years agoLittle cleanup/fix the flag think method
Samual [Fri, 30 Mar 2012 02:58:13 +0000 (22:58 -0400)]
Little cleanup/fix the flag think method

12 years agoDelete two useless declarations
Samual [Fri, 30 Mar 2012 00:03:58 +0000 (20:03 -0400)]
Delete two useless declarations

12 years agoFix quite a lot of bugs/finish bringing back the old features. MIGHT be stable now...
Samual [Thu, 29 Mar 2012 23:57:09 +0000 (19:57 -0400)]
Fix quite a lot of bugs/finish bringing back the old features. MIGHT be stable now, with a few placeholders remaining.

12 years agoDebugging some stuff, etc
Samual [Wed, 28 Mar 2012 03:34:02 +0000 (23:34 -0400)]
Debugging some stuff, etc

12 years agoMake the flag respawn when it touches lava/slime
Samual [Wed, 28 Mar 2012 01:03:03 +0000 (21:03 -0400)]
Make the flag respawn when it touches lava/slime

12 years agoMerge remote branch 'origin/master' into samual/mutator_ctf
Samual [Tue, 27 Mar 2012 22:28:37 +0000 (18:28 -0400)]
Merge remote branch 'origin/master' into samual/mutator_ctf

Conflicts:
qcsrc/server/arena.qc
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src

12 years agomake net_slist_queriespersecond saved
Rudolf Polzer [Mon, 26 Mar 2012 13:11:36 +0000 (15:11 +0200)]
make net_slist_queriespersecond saved

12 years agofix hook names for gamestart etc.
Rudolf Polzer [Mon, 19 Mar 2012 16:07:36 +0000 (17:07 +0100)]
fix hook names for gamestart etc.

12 years agodon't crash Xonotic 0.6.0 release by using checkpvs on client (it's broken)
Rudolf Polzer [Sun, 18 Mar 2012 21:22:57 +0000 (22:22 +0100)]
don't crash Xonotic 0.6.0 release by using checkpvs on client (it's broken)

12 years agofix a stupid interaction between weapon throwing and weapon load (loaded ammo was...
Rudolf Polzer [Wed, 14 Mar 2012 09:33:13 +0000 (10:33 +0100)]
fix a stupid interaction between weapon throwing and weapon load (loaded ammo was not thrown)

12 years agostart loading update URL earlier
Rudolf Polzer [Mon, 12 Mar 2012 16:34:26 +0000 (17:34 +0100)]
start loading update URL earlier

12 years agotry to restore old menu status
Rudolf Polzer [Mon, 12 Mar 2012 16:32:07 +0000 (17:32 +0100)]
try to restore old menu status

12 years agosupport update pk3s (+menu_updatecheck_getpacks 0 to opt out)
Rudolf Polzer [Mon, 12 Mar 2012 16:25:56 +0000 (17:25 +0100)]
support update pk3s (+menu_updatecheck_getpacks 0 to opt out)

12 years agoMerge remote-tracking branch 'origin/nyov/dedicated-startupscreen'
Rudolf Polzer [Mon, 12 Mar 2012 09:24:38 +0000 (10:24 +0100)]
Merge remote-tracking branch 'origin/nyov/dedicated-startupscreen'

12 years agomatch the weapon bind properly
Rudolf Polzer [Mon, 12 Mar 2012 08:21:26 +0000 (09:21 +0100)]
match the weapon bind properly

12 years agoMerge remote-tracking branch 'origin/cbrutail/hungarian_0601fix'
Rudolf Polzer [Sun, 11 Mar 2012 17:47:03 +0000 (18:47 +0100)]
Merge remote-tracking branch 'origin/cbrutail/hungarian_0601fix'

12 years agofix a QC crash instead of warning in case of missing .bgs (bgmscript) file
Rudolf Polzer [Sun, 11 Mar 2012 13:47:51 +0000 (14:47 +0100)]
fix a QC crash instead of warning in case of missing .bgs (bgmscript) file