]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
8 years agoMerge branch 'master' into Mario/wepent_experimental
Mario [Sat, 8 Oct 2016 14:41:21 +0000 (00:41 +1000)]
Merge branch 'master' into Mario/wepent_experimental

8 years agoDisable unpressing attack on weapon switching by default
Mario [Sat, 8 Oct 2016 14:25:08 +0000 (00:25 +1000)]
Disable unpressing attack on weapon switching by default

8 years agoDisable midair combos (generally not well received test feature)
Mario [Sat, 8 Oct 2016 13:17:47 +0000 (23:17 +1000)]
Disable midair combos (generally not well received test feature)

8 years agoRemove spread from electro and hagar attacks (merge request for these changes was...
Mario [Sat, 8 Oct 2016 13:10:05 +0000 (23:10 +1000)]
Remove spread from electro and hagar attacks (merge request for these changes was approved)

8 years agoAccept sv_stepheight changes (partially gameplay-relevant, mostly used to make old...
Mario [Sat, 8 Oct 2016 12:24:36 +0000 (22:24 +1000)]
Accept sv_stepheight changes (partially gameplay-relevant, mostly used to make old Nexuiz maps functional, as the default prevents walking up most steps and ledges on older maps)

8 years agoConsider g_physics_clientselect a server friendly option
Mario [Sat, 8 Oct 2016 12:06:41 +0000 (22:06 +1000)]
Consider g_physics_clientselect a server friendly option

8 years agoCount another mutator as gameplay-irrelevant
Mario [Sat, 8 Oct 2016 11:59:33 +0000 (21:59 +1000)]
Count another mutator as gameplay-irrelevant

8 years agoConsider g_norecoil an acceptable change
Mario [Sat, 8 Oct 2016 11:53:06 +0000 (21:53 +1000)]
Consider g_norecoil an acceptable change

8 years agoUndefine BADPRESUFFIX too
Mario [Sat, 8 Oct 2016 11:51:55 +0000 (21:51 +1000)]
Undefine BADPRESUFFIX too

8 years agog_buffs is an acceptable change, like g_powerups
Mario [Sat, 8 Oct 2016 11:48:30 +0000 (21:48 +1000)]
g_buffs is an acceptable change, like g_powerups

8 years agoDon't spawn buffs on maps that lack spawnpoints by default
Mario [Sat, 8 Oct 2016 11:47:22 +0000 (21:47 +1000)]
Don't spawn buffs on maps that lack spawnpoints by default

8 years agoRestore default crylink and don't use weaponreplace on machinegun in experimental...
Mario [Sat, 8 Oct 2016 11:22:26 +0000 (21:22 +1000)]
Restore default crylink and don't use weaponreplace on machinegun in experimental balance

8 years agoTweak arc as well (bolt attack remains disabled by default), also whitelist another...
Mario [Sat, 8 Oct 2016 11:13:51 +0000 (21:13 +1000)]
Tweak arc as well (bolt attack remains disabled by default), also whitelist another gameplay-irrelevant cvar

8 years agoTweak default shockwave balance
Mario [Sat, 8 Oct 2016 11:04:13 +0000 (21:04 +1000)]
Tweak default shockwave balance

8 years agoAccept balance change hash
Mario [Sat, 8 Oct 2016 10:47:55 +0000 (20:47 +1000)]
Accept balance change hash

8 years agoIgnore a few gameplay-irrelevant cvars
Mario [Sat, 8 Oct 2016 10:26:49 +0000 (20:26 +1000)]
Ignore a few gameplay-irrelevant cvars

8 years agoMerge branch 'martin-t/random' into 'master'
Mario [Fri, 7 Oct 2016 19:33:19 +0000 (19:33 +0000)]
Merge branch 'martin-t/random' into 'master'

refactor RandomSelection, add a field for vector

See merge request !373

8 years agorefactor RandomSelection, add a field for vector 373/head
Martin Taibr [Fri, 7 Oct 2016 19:19:37 +0000 (21:19 +0200)]
refactor RandomSelection, add a field for vector

8 years agoAdd an entity parameter to entcs net props
Mario [Fri, 7 Oct 2016 09:25:18 +0000 (19:25 +1000)]
Add an entity parameter to entcs net props

8 years agoTemporary fix for warning spam on map start
Mario [Fri, 7 Oct 2016 08:17:12 +0000 (18:17 +1000)]
Temporary fix for warning spam on map start

8 years agoSilence a weapon entity warning when first connecting
Mario [Fri, 7 Oct 2016 08:14:19 +0000 (18:14 +1000)]
Silence a weapon entity warning when first connecting

8 years agoMerge branch 'master' into Mario/wepent_experimental
Mario [Thu, 6 Oct 2016 12:54:47 +0000 (22:54 +1000)]
Merge branch 'master' into Mario/wepent_experimental

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

8 years agoMerge branch 'terencehill/overkill_stuff' into 'master'
Mario [Thu, 6 Oct 2016 12:49:45 +0000 (12:49 +0000)]
Merge branch 'terencehill/overkill_stuff' into 'master'

Overkill stuff

It addresses issues reported in #1815. It closes #1815

See merge request !371

8 years agoMove tuba instrument networking to the weapon entity
Mario [Thu, 6 Oct 2016 10:10:28 +0000 (20:10 +1000)]
Move tuba instrument networking to the weapon entity

8 years agoOverkill balance: use regen pause of 2 seconds
Mario [Wed, 5 Oct 2016 22:14:16 +0000 (08:14 +1000)]
Overkill balance: use regen pause of 2 seconds

8 years agoOverkill's default g_balance_pause_health_regen value should be 2 (previously overkil... 371/head
terencehill [Wed, 5 Oct 2016 14:24:13 +0000 (16:24 +0200)]
Overkill's default g_balance_pause_health_regen value should be 2 (previously overkill used 2 as hardcoded value)

8 years agoMerge branch 'master' into terencehill/overkill_stuff
terencehill [Wed, 5 Oct 2016 14:03:37 +0000 (16:03 +0200)]
Merge branch 'master' into terencehill/overkill_stuff

8 years agoFix compilation unit test
Mario [Wed, 5 Oct 2016 13:36:15 +0000 (23:36 +1000)]
Fix compilation unit test

8 years agoMerge branch 'terencehill/timeout_countdown_fix' into 'master'
Mario [Wed, 5 Oct 2016 13:13:41 +0000 (13:13 +0000)]
Merge branch 'terencehill/timeout_countdown_fix' into 'master'

Timeout countdown fix

Make timeout countdown message immediately fully visible otherwise it stays almost invisible as it starts fading in VERY slowly (due to slowmo being set to 0.0001 during a timeout)

See merge request !370

8 years agoSupport independent held porto angles
Mario [Wed, 5 Oct 2016 12:32:41 +0000 (22:32 +1000)]
Support independent held porto angles

8 years agoMake port-o-launch show its lines for both weapon entities
Mario [Wed, 5 Oct 2016 12:16:06 +0000 (22:16 +1000)]
Make port-o-launch show its lines for both weapon entities

8 years agoFind arc if held, to support hit sounds
Mario [Wed, 5 Oct 2016 11:52:41 +0000 (21:52 +1000)]
Find arc if held, to support hit sounds

8 years agoClean up some slot 0 cases on client (fixes reticles)
Mario [Wed, 5 Oct 2016 11:48:09 +0000 (21:48 +1000)]
Clean up some slot 0 cases on client (fixes reticles)

8 years agoFix another hardcoded slot 0 case
Mario [Wed, 5 Oct 2016 10:59:45 +0000 (20:59 +1000)]
Fix another hardcoded slot 0 case

8 years agoRemove the old weapon stats
Mario [Wed, 5 Oct 2016 10:53:00 +0000 (20:53 +1000)]
Remove the old weapon stats

8 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

8 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

8 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

8 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

8 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

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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

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

8 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

8 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

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

8 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

8 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

8 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

8 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

8 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

8 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

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

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

8 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

8 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

8 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

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

8 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

8 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

8 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

8 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

8 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

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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

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

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

8 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

8 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

8 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

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

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

8 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

8 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

8 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

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

8 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

8 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

8 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

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

8 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

8 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

8 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

8 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

8 years agoFurther clean overkill code up
terencehill [Tue, 27 Sep 2016 16:45:34 +0000 (18:45 +0200)]
Further clean overkill code up

8 years agoMerge branch 'master' into terencehill/overkill_stuff
terencehill [Mon, 26 Sep 2016 15:04:42 +0000 (17:04 +0200)]
Merge branch 'master' into terencehill/overkill_stuff

8 years agolabel 2 obscure arguments
terencehill [Mon, 26 Sep 2016 15:02:06 +0000 (17:02 +0200)]
label 2 obscure arguments