]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
7 years agoMerge branch 'master' into Mario/wepent_experimental
Mario [Wed, 5 Oct 2016 09:16:34 +0000 (19:16 +1000)]
Merge branch 'master' into Mario/wepent_experimental

# Conflicts:
# qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
# qcsrc/common/mutators/mutator/overkill/sv_overkill.qc

7 years agoPort nexball ball held too long by team message to the notifications system, also...
Mario [Wed, 5 Oct 2016 09:13:30 +0000 (19:13 +1000)]
Port nexball ball held too long by team message to the notifications system, also fix ball not properly resetting in this case

7 years agoPurge some more 0 slot cases
Mario [Wed, 5 Oct 2016 08:58:04 +0000 (18:58 +1000)]
Purge some more 0 slot cases

7 years agoUnhardcode a few more 0 slot cases
Mario [Wed, 5 Oct 2016 07:24:29 +0000 (17:24 +1000)]
Unhardcode a few more 0 slot cases

7 years agoPurge hardcoded slot 0 weapon entity use from most of the bot AI
Mario [Wed, 5 Oct 2016 06:38:35 +0000 (16:38 +1000)]
Purge hardcoded slot 0 weapon entity use from most of the bot AI

7 years agoFix excessive rocket jump force
Mario [Wed, 5 Oct 2016 04:20:45 +0000 (14:20 +1000)]
Fix excessive rocket jump force

7 years agoClean up old remote jump feature, no longer consumes extra CPU time whenever a rocket...
Mario [Tue, 4 Oct 2016 17:59:55 +0000 (03:59 +1000)]
Clean up old remote jump feature, no longer consumes extra CPU time whenever a rocket is detonated

7 years agoMake vortex switch delay match other weapons
Mario [Tue, 4 Oct 2016 09:53:59 +0000 (19:53 +1000)]
Make vortex switch delay match other weapons

7 years agoAdopt some overkill balance changes from the LX server configs
Mario [Tue, 4 Oct 2016 03:02:16 +0000 (13:02 +1000)]
Adopt some overkill balance changes from the LX server configs

7 years agoAdd an option to disable the extra weapon on switch
Mario [Mon, 3 Oct 2016 15:13:43 +0000 (01:13 +1000)]
Add an option to disable the extra weapon on switch

7 years agoMerge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2
Mario [Mon, 3 Oct 2016 14:58:09 +0000 (00:58 +1000)]
Merge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2

7 years agoFix mines getting stuck at world origin
Mario [Mon, 3 Oct 2016 14:57:33 +0000 (00:57 +1000)]
Fix mines getting stuck at world origin

7 years agoMerge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2
Mario [Mon, 3 Oct 2016 14:54:12 +0000 (00:54 +1000)]
Merge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2

7 years agoPossible fix for minelayer mines
Mario [Mon, 3 Oct 2016 14:53:57 +0000 (00:53 +1000)]
Possible fix for minelayer mines

7 years agoMerge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2
Mario [Mon, 3 Oct 2016 14:48:36 +0000 (00:48 +1000)]
Merge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2

7 years agoHopefully fix mine layer and seeker to be weapon entity independent
Mario [Mon, 3 Oct 2016 14:48:22 +0000 (00:48 +1000)]
Hopefully fix mine layer and seeker to be weapon entity independent

7 years agoRevert owner check (breaks projectile prediction)
Mario [Mon, 3 Oct 2016 14:36:34 +0000 (00:36 +1000)]
Revert owner check (breaks projectile prediction)

7 years agoMerge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2
Mario [Mon, 3 Oct 2016 14:15:09 +0000 (00:15 +1000)]
Merge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2

7 years agoGive wr_setup a weaponentity parameter so it isn't resetting the other weapon entitie...
Mario [Mon, 3 Oct 2016 14:14:50 +0000 (00:14 +1000)]
Give wr_setup a weaponentity parameter so it isn't resetting the other weapon entities on switch

7 years agoMerge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2
Mario [Mon, 3 Oct 2016 13:43:20 +0000 (23:43 +1000)]
Merge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2

7 years agoDon't explode projectiles if they have the same owner
Mario [Mon, 3 Oct 2016 13:43:02 +0000 (23:43 +1000)]
Don't explode projectiles if they have the same owner

7 years agoFix start items in some special arena mutators
Mario [Mon, 3 Oct 2016 13:06:11 +0000 (23:06 +1000)]
Fix start items in some special arena mutators

7 years agoMerge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2
Mario [Mon, 3 Oct 2016 13:00:52 +0000 (23:00 +1000)]
Merge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2

7 years agoFix shot alignment
Mario [Mon, 3 Oct 2016 13:00:27 +0000 (23:00 +1000)]
Fix shot alignment

7 years agoFix hook alignment
Mario [Mon, 3 Oct 2016 12:42:15 +0000 (22:42 +1000)]
Fix hook alignment

7 years agoMerge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2
Mario [Mon, 3 Oct 2016 10:34:11 +0000 (20:34 +1000)]
Merge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2

7 years agoRewrite gun alignment setting to be more reliable
Mario [Mon, 3 Oct 2016 10:33:32 +0000 (20:33 +1000)]
Rewrite gun alignment setting to be more reliable

7 years agoMerge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2
Mario [Mon, 3 Oct 2016 10:19:09 +0000 (20:19 +1000)]
Merge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2

7 years agoSet gun alignment on the server (hopefully more reliable)
Mario [Mon, 3 Oct 2016 10:19:05 +0000 (20:19 +1000)]
Set gun alignment on the server (hopefully more reliable)

7 years agoMerge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2
Mario [Mon, 3 Oct 2016 08:43:06 +0000 (18:43 +1000)]
Merge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2

7 years agoClean up the use of slots on some things that could be weapon
Mario [Mon, 3 Oct 2016 08:42:33 +0000 (18:42 +1000)]
Clean up the use of slots on some things that could be weapon

7 years agoMerge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2
Mario [Mon, 3 Oct 2016 08:29:33 +0000 (18:29 +1000)]
Merge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2

7 years agoFix sometimes starting with 2 weapons
Mario [Mon, 3 Oct 2016 08:29:14 +0000 (18:29 +1000)]
Fix sometimes starting with 2 weapons

7 years agoMerge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2
Mario [Mon, 3 Oct 2016 07:32:14 +0000 (17:32 +1000)]
Merge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2

7 years agoClean up ammo_field handling
Mario [Mon, 3 Oct 2016 07:31:23 +0000 (17:31 +1000)]
Clean up ammo_field handling

7 years agoMerge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2
Mario [Mon, 3 Oct 2016 07:05:04 +0000 (17:05 +1000)]
Merge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2

7 years agoMove weapon load to the weapon entity
Mario [Mon, 3 Oct 2016 07:04:41 +0000 (17:04 +1000)]
Move weapon load to the weapon entity

7 years agoMerge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2
Mario [Mon, 3 Oct 2016 06:54:30 +0000 (16:54 +1000)]
Merge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2

7 years agoHold weapon clip on the weapon entity
Mario [Mon, 3 Oct 2016 06:54:00 +0000 (16:54 +1000)]
Hold weapon clip on the weapon entity

7 years agoUse the CSQC player origin if in 3rd person mode
Mario [Sat, 1 Oct 2016 12:34:36 +0000 (22:34 +1000)]
Use the CSQC player origin if in 3rd person mode

7 years agoMerge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2
Mario [Sat, 1 Oct 2016 11:12:10 +0000 (21:12 +1000)]
Merge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2

# Conflicts:
# qcsrc/server/impulse.qc

7 years agoMake per-weapon reticles an attribute instead of a global string
Mario [Sat, 1 Oct 2016 10:51:01 +0000 (20:51 +1000)]
Make per-weapon reticles an attribute instead of a global string

7 years agoUnhardcode a few more weapon entity checks
Mario [Sat, 1 Oct 2016 10:34:19 +0000 (20:34 +1000)]
Unhardcode a few more weapon entity checks

7 years agoFix compile
Mario [Sat, 1 Oct 2016 08:19:46 +0000 (18:19 +1000)]
Fix compile

7 years agoMake impulses apply to both weapon entities (testing)
Mario [Sat, 1 Oct 2016 08:17:49 +0000 (18:17 +1000)]
Make impulses apply to both weapon entities (testing)

7 years agoMake auto switch functional for both weapon slots
Mario [Sat, 1 Oct 2016 07:15:43 +0000 (17:15 +1000)]
Make auto switch functional for both weapon slots

7 years agoFix second model sticking after death
Mario [Fri, 30 Sep 2016 20:49:56 +0000 (06:49 +1000)]
Fix second model sticking after death

7 years agoClear up a few more hardcoded slot 0 cases
Mario [Fri, 30 Sep 2016 09:07:19 +0000 (19:07 +1000)]
Clear up a few more hardcoded slot 0 cases

7 years agoFix another hardcoded slot 0
Mario [Thu, 29 Sep 2016 15:23:30 +0000 (01:23 +1000)]
Fix another hardcoded slot 0

7 years agoFix some minor issues
Mario [Thu, 29 Sep 2016 14:32:07 +0000 (00:32 +1000)]
Fix some minor issues

7 years agoMake a few more weapons work properly in secondary slots
Mario [Thu, 29 Sep 2016 13:57:39 +0000 (23:57 +1000)]
Make a few more weapons work properly in secondary slots

7 years agoAdd weaponentity parameter to ammo checking
Mario [Thu, 29 Sep 2016 13:47:18 +0000 (23:47 +1000)]
Add weaponentity parameter to ammo checking

7 years agoFix animations when weapon states do not match
Mario [Thu, 29 Sep 2016 12:36:00 +0000 (22:36 +1000)]
Fix animations when weapon states do not match

7 years agoFix a few weapons
Mario [Thu, 29 Sep 2016 09:33:17 +0000 (19:33 +1000)]
Fix a few weapons

7 years agoAttempt to make hook depend on weaponentity instead of the player
Mario [Thu, 29 Sep 2016 08:54:53 +0000 (18:54 +1000)]
Attempt to make hook depend on weaponentity instead of the player

7 years agoSend alpha as part of weapon state, rather than when firing
Mario [Thu, 29 Sep 2016 02:48:50 +0000 (12:48 +1000)]
Send alpha as part of weapon state, rather than when firing

7 years agoBegin reintroducing old gun alignment hack
Mario [Thu, 29 Sep 2016 02:10:47 +0000 (12:10 +1000)]
Begin reintroducing old gun alignment hack

7 years agoFix weaplast
Mario [Thu, 29 Sep 2016 01:59:10 +0000 (11:59 +1000)]
Fix weaplast

7 years agoAdd a networked entity to hold weapon state
Mario [Thu, 29 Sep 2016 01:50:28 +0000 (11:50 +1000)]
Add a networked entity to hold weapon state

7 years agoMinor performance improvement in bot movement code
Mario [Wed, 28 Sep 2016 14:56:50 +0000 (00:56 +1000)]
Minor performance improvement in bot movement code

7 years agoClean up monster spawn function a little, allow setting invasion spawnpoints to spawn...
Mario [Wed, 28 Sep 2016 14:53:50 +0000 (00:53 +1000)]
Clean up monster spawn function a little, allow setting invasion spawnpoints to spawn specific monsters with the spawnmob field

7 years agoMerge branch 'martin-t/nades' into 'master'
Mario [Wed, 28 Sep 2016 07:09:07 +0000 (07:09 +0000)]
Merge branch 'martin-t/nades' into 'master'

fix nades colliding with the player himself (unless g_nades_nade_small is 1)

I am not sure if this is a good enough fix but it seems to work. Previously, the nades were often thrown from the "backup" location because with the default offset they were partially inside the player.

See merge request !367

7 years agoFix respawning instantly while jump button is held and respawning is forced
Mario [Mon, 26 Sep 2016 10:47:28 +0000 (20:47 +1000)]
Fix respawning instantly while jump button is held and respawning is forced

7 years agoSet it in default config with a description
Mario [Mon, 26 Sep 2016 10:35:10 +0000 (20:35 +1000)]
Set it in default config with a description

7 years agoAdd sv_aircontrol_backwards to allow strafing backwards
Mario [Mon, 26 Sep 2016 10:26:18 +0000 (20:26 +1000)]
Add sv_aircontrol_backwards to allow strafing backwards

7 years agoReduce default waypoint health bar size
terencehill [Sat, 24 Sep 2016 21:38:41 +0000 (23:38 +0200)]
Reduce default waypoint health bar size

7 years agoDefault curl maxspeed to unlimited and allow 3 downloads at the same time (it's not...
Mario [Fri, 23 Sep 2016 17:23:31 +0000 (03:23 +1000)]
Default curl maxspeed to unlimited and allow 3 downloads at the same time (it's not 2005 anymore)
Rework download speed slider to show more sane values, including an "unlimited" option

7 years agoDelay health regen once the player gets revived rather than every frame while they...
terencehill [Thu, 22 Sep 2016 16:40:18 +0000 (18:40 +0200)]
Delay health regen once the player gets revived rather than every frame while they are frozen

7 years agoRemove an unused string
terencehill [Tue, 20 Sep 2016 16:39:26 +0000 (18:39 +0200)]
Remove an unused string

7 years agoMerge branch 'martin-t/keeptwo' into 'master'
terencehill [Tue, 20 Sep 2016 16:33:43 +0000 (16:33 +0000)]
Merge branch 'martin-t/keeptwo' into 'master'

add cvar description, remove unused vaiable

At least I hope it's unused, I'd expect the compiler to warn about it but it's declared inside a function and only assigned so unless I am missing something obvious, it's not used anywhere.

See merge request !369

7 years agoadd and fix descripton 369/head
Martin Taibr [Sun, 18 Sep 2016 19:27:43 +0000 (21:27 +0200)]
add and fix descripton

7 years agoremove unused variable
Martin Taibr [Sun, 18 Sep 2016 19:27:33 +0000 (21:27 +0200)]
remove unused variable

7 years agoAdd g_ctf_flag_return_damage_delay description
terencehill [Sat, 17 Sep 2016 18:59:50 +0000 (20:59 +0200)]
Add g_ctf_flag_return_damage_delay description

7 years agoFix typo in a cvar name; add a few more missing cvars
terencehill [Sat, 17 Sep 2016 18:31:13 +0000 (20:31 +0200)]
Fix typo in a cvar name; add a few more missing cvars

7 years agoAdd a few missing cvars and a few descriptions
terencehill [Sat, 17 Sep 2016 16:34:19 +0000 (18:34 +0200)]
Add a few missing cvars and a few descriptions

7 years agoResize waypoints like everything else when viewsize is < 100; it closes #1430
terencehill [Sat, 17 Sep 2016 15:36:14 +0000 (17:36 +0200)]
Resize waypoints like everything else when viewsize is < 100; it closes #1430

7 years agoFix bad code indentation
terencehill [Fri, 16 Sep 2016 12:07:21 +0000 (14:07 +0200)]
Fix bad code indentation

7 years agofix nades colliding with the player himself (unless g_nades_nade_small is 1) 367/head
Martin Taibr [Fri, 16 Sep 2016 00:40:30 +0000 (02:40 +0200)]
fix nades colliding with the player himself (unless g_nades_nade_small is 1)

7 years agoUnhardcode throw nade key in notification messages; also remove an unused notification
terencehill [Thu, 15 Sep 2016 21:41:02 +0000 (23:41 +0200)]
Unhardcode throw nade key in notification messages; also remove an unused notification

7 years agoCompose MURDER_*_VERBOSE messages by concatenating MURDER_* messsages with ^BG%s...
terencehill [Thu, 15 Sep 2016 17:30:16 +0000 (19:30 +0200)]
Compose MURDER_*_VERBOSE messages by concatenating MURDER_* messsages with ^BG%s, allowing to get rid of 16 translatable messages

7 years agoAdd newly added choice notifications to the menu
terencehill [Thu, 15 Sep 2016 17:10:28 +0000 (19:10 +0200)]
Add newly added choice notifications to the menu

7 years agoAllow overriding frag centerprint message, fixes double kill message in freeze tag
Mario [Wed, 14 Sep 2016 22:43:07 +0000 (08:43 +1000)]
Allow overriding frag centerprint message, fixes double kill message in freeze tag

7 years agoFix compilation test unit
terencehill [Wed, 14 Sep 2016 17:55:09 +0000 (19:55 +0200)]
Fix compilation test unit

7 years agoFix division by 0 in another way
terencehill [Wed, 14 Sep 2016 14:41:02 +0000 (16:41 +0200)]
Fix division by 0 in another way

7 years agoAllow to align spectators in columns (hud_panel_scoreboard_spectators_aligned)
terencehill [Wed, 14 Sep 2016 14:08:05 +0000 (16:08 +0200)]
Allow to align spectators in columns (hud_panel_scoreboard_spectators_aligned)

7 years agoAvoid a division by 0 (g_weaponratefactor isn't initialized yet)
terencehill [Wed, 14 Sep 2016 11:19:29 +0000 (13:19 +0200)]
Avoid a division by 0 (g_weaponratefactor isn't initialized yet)

7 years agoScoreboard: highlight spectator's ping (and player's score) so it can't be faked...
terencehill [Wed, 14 Sep 2016 09:26:19 +0000 (11:26 +0200)]
Scoreboard: highlight spectator's ping (and player's score) so it can't be faked by nicks

7 years agoScoreboard: show number of spectators
terencehill [Wed, 14 Sep 2016 09:20:22 +0000 (11:20 +0200)]
Scoreboard: show number of spectators

7 years agoForbid players from aiming their playermodel up and down if they can't move, not...
terencehill [Tue, 13 Sep 2016 18:38:37 +0000 (20:38 +0200)]
Forbid players from aiming their playermodel up and down if they can't move, not just after match ends

7 years agoAccept gameplay change from fireBullet sky fix
Mario [Tue, 13 Sep 2016 12:26:09 +0000 (22:26 +1000)]
Accept gameplay change from fireBullet sky fix

7 years agoRename VehicleSpawn mutator hook to VehicleInit and invert the returned value as...
terencehill [Tue, 13 Sep 2016 10:51:16 +0000 (12:51 +0200)]
Rename VehicleSpawn mutator hook to VehicleInit and invert the returned value as it makes more sense

7 years agoAssault: Don't reset vehicles twice when a round ends (they are reset in ReadyRestart...
terencehill [Tue, 13 Sep 2016 10:40:04 +0000 (12:40 +0200)]
Assault: Don't reset vehicles twice when a round ends (they are reset in ReadyRestart_force();)

7 years agoFix vehicles getting attacked by turrets when the game is over
terencehill [Mon, 12 Sep 2016 17:04:46 +0000 (19:04 +0200)]
Fix vehicles getting attacked by turrets when the game is over

7 years agoUse trace_dphitq3surfaceflags instead of pointcontents in fireBullet
Mario [Mon, 12 Sep 2016 13:57:11 +0000 (23:57 +1000)]
Use trace_dphitq3surfaceflags instead of pointcontents in fireBullet

7 years agoReally block vehicles when the game is over (racer and spiderbot used to slowly fall...
terencehill [Mon, 12 Sep 2016 13:50:41 +0000 (15:50 +0200)]
Really block vehicles when the game is over (racer and spiderbot used to slowly fall down)

7 years agoFix players able to aim their playermodel up and down after match ends
terencehill [Mon, 12 Sep 2016 12:33:55 +0000 (14:33 +0200)]
Fix players able to aim their playermodel up and down after match ends

7 years agoFix a few hidden typos and shorten some cvar descriptions
terencehill [Sun, 11 Sep 2016 18:02:18 +0000 (20:02 +0200)]
Fix a few hidden typos and shorten some cvar descriptions

7 years agoMake vortex switch speed match other weapons
Mario [Sun, 11 Sep 2016 16:33:46 +0000 (02:33 +1000)]
Make vortex switch speed match other weapons

7 years agoUse WriteAngle instead of WriteCoord to network viewlocation angles
Mario [Sun, 11 Sep 2016 11:49:02 +0000 (21:49 +1000)]
Use WriteAngle instead of WriteCoord to network viewlocation angles

7 years agoMerge branch 'terencehill/scoreboard_update' into 'master'
Mario [Sun, 11 Sep 2016 11:22:15 +0000 (11:22 +0000)]
Merge branch 'terencehill/scoreboard_update' into 'master'

Scoreboard update

Scoreboard:
* limit size of player names and relative column; scoreboard width is now based on this value
* limit scoreboard height and therefore number of players displayed in the scoreboard, display remaining players with primary scores in the last row
* compact spectator list by displaying multiple spectator names per row
* display an empty scoreboard in the beginning in DM too

Rankings:
* limit name size and if there's enough room split rankings into more columns
* center text vertically and add padding to both sides of each column

See merge request !366