]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
13 years agoMerge remote branch 'origin/master' into samual/mutator_ctf
Samual [Tue, 17 Apr 2012 15:17:40 +0000 (11:17 -0400)]
Merge remote branch 'origin/master' into samual/mutator_ctf

13 years agodetect headshots for minstanex again
Rudolf Polzer [Tue, 17 Apr 2012 09:36:30 +0000 (11:36 +0200)]
detect headshots for minstanex again

13 years agoCleanup/quick improvement to auto_helpme_when_damaged
Samual [Thu, 12 Apr 2012 16:25:06 +0000 (12:25 -0400)]
Cleanup/quick improvement to auto_helpme_when_damaged

13 years agoMiscellaneous stuff
Samual [Wed, 11 Apr 2012 22:10:39 +0000 (18:10 -0400)]
Miscellaneous stuff

13 years agoAutomatically do the "help me" ping if flag carrier gets damaged. TODO: make it based...
Samual [Wed, 11 Apr 2012 20:52:50 +0000 (16:52 -0400)]
Automatically do the "help me" ping if flag carrier gets damaged. TODO: make it based on damage... i.e., if their health gets below X level, THEN do it automatically.

13 years agoMove this where it belongs
Samual [Wed, 11 Apr 2012 20:45:22 +0000 (16:45 -0400)]
Move this where it belongs

13 years agoChange team flagcarrier waypointsprite color to ALWAYS be yellow instead of attemptin...
Samual [Wed, 11 Apr 2012 20:44:17 +0000 (16:44 -0400)]
Change team flagcarrier waypointsprite color to ALWAYS be yellow instead of attempting a team based color.

13 years agoImplement full stalemate detection code (shows enemy flag carrier locations after...
Samual [Wed, 11 Apr 2012 20:42:40 +0000 (16:42 -0400)]
Implement full stalemate detection code (shows enemy flag carrier locations after 30 seconds of both teams having the enemy flag)

13 years agoMerge remote branch 'origin/master' into samual/mutator_ctf
Samual [Wed, 11 Apr 2012 18:07:19 +0000 (14:07 -0400)]
Merge remote branch 'origin/master' into samual/mutator_ctf

13 years agoUkrainian charset fixes by Harmata
Rudolf Polzer [Wed, 11 Apr 2012 14:53:35 +0000 (16:53 +0200)]
Ukrainian charset fixes by Harmata

13 years agofix the Nexposee hacks in Item/Label
Rudolf Polzer [Wed, 11 Apr 2012 14:48:55 +0000 (16:48 +0200)]
fix the Nexposee hacks in Item/Label

13 years agofix build breakage
Rudolf Polzer [Mon, 9 Apr 2012 07:40:40 +0000 (09:40 +0200)]
fix build breakage

13 years agoprint the IP address, not the name, when a banned client tried to join
Rudolf Polzer [Sun, 8 Apr 2012 18:29:12 +0000 (20:29 +0200)]
print the IP address, not the name, when a banned client tried to join

13 years agoenforce bans on first clientcommand too, not just on ClientConnect
Rudolf Polzer [Sun, 8 Apr 2012 18:25:47 +0000 (20:25 +0200)]
enforce bans on first clientcommand too, not just on ClientConnect

13 years agoMerge remote-tracking branch 'origin/terencehill/lang_files_update'
Rudolf Polzer [Fri, 6 Apr 2012 18:24:24 +0000 (20:24 +0200)]
Merge remote-tracking branch 'origin/terencehill/lang_files_update'

13 years agofix recalcPos usage in items/label for dynamic entities
Rudolf Polzer [Fri, 6 Apr 2012 18:08:34 +0000 (20:08 +0200)]
fix recalcPos usage in items/label for dynamic entities

13 years agofix a stupid typo
Rudolf Polzer [Thu, 5 Apr 2012 14:40:43 +0000 (16:40 +0200)]
fix a stupid typo

13 years agowhen "a CSQC entity changed its type", make sure ALL entity fields are cleared
Rudolf Polzer [Thu, 5 Apr 2012 13:15:28 +0000 (15:15 +0200)]
when "a CSQC entity changed its type", make sure ALL entity fields are cleared

13 years agoCleanliness
Samual [Tue, 3 Apr 2012 16:52:08 +0000 (12:52 -0400)]
Cleanliness

13 years agofix new toys visibility
Rudolf Polzer [Tue, 3 Apr 2012 12:31:25 +0000 (14:31 +0200)]
fix new toys visibility

13 years agoMerge branch 'master' of /var/cache/git/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Tue, 3 Apr 2012 09:34:54 +0000 (11:34 +0200)]
Merge branch 'master' of /var/cache/git/xonotic/xonotic-data.pk3dir

13 years agoCSQCmodel LOD: don't screw up mins/maxs ;)
Rudolf Polzer [Tue, 3 Apr 2012 09:34:07 +0000 (11:34 +0200)]
CSQCmodel LOD: don't screw up mins/maxs ;)

13 years agoremove space
Samual [Mon, 2 Apr 2012 22:51:04 +0000 (18:51 -0400)]
remove space

13 years agoUse separate messages for different return types
Samual [Mon, 2 Apr 2012 22:49:59 +0000 (18:49 -0400)]
Use separate messages for different return types

13 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

13 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

13 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

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

13 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

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

13 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

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

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

13 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

13 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.)

13 years agodon't let respawn sound move with player (attach it to world instead)
Rudolf Polzer [Mon, 2 Apr 2012 11:08:17 +0000 (13:08 +0200)]
don't let respawn sound move with player (attach it to world instead)

13 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

13 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

13 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

13 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'

13 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

13 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

13 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

13 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.

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

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

13 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

13 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

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

13 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

13 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)

13 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

13 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)

13 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

13 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

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

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

13 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

13 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

13 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

13 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

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

13 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

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

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

13 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)

13 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

13 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

13 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()

13 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

13 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)

13 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.

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

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

13 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

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

13 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

13 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

13 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

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

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

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

13 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

13 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

13 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

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

13 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

13 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

13 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

13 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

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

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

13 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

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

13 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()

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

13 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

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

13 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)

13 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