]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Mario [Tue, 31 Mar 2015 15:41:07 +0000 (02:41 +1100)]
Merge branch 'master' into Mario/combined_updates
Conflicts:
qcsrc/server/mutators/mutator_instagib.qc
Mario [Tue, 31 Mar 2015 12:49:25 +0000 (12:49 +0000)]
Merge branch 'Mario/crosshair_blink_fix' into 'master'
Merge branch Mario/crosshair_blink_fix (XXS merge request)
Fixes blinking crosshair while spectating.
See merge request !114
Mario [Tue, 31 Mar 2015 12:47:15 +0000 (23:47 +1100)]
Disable hit indication while spectating (serves no purpose as a spectator, disabling also fixes "blinking" bug)
Mario [Tue, 31 Mar 2015 12:37:17 +0000 (12:37 +0000)]
Merge branch 'Mario/accuracy_fix' into 'master'
Merge branch Mario/accuracy_fix (M merge request)
Restores the hacks to use Blaster weapon for secondary fire's accuracy counting in overkill and instagib.
See merge request !113
Mario [Tue, 31 Mar 2015 12:20:35 +0000 (23:20 +1100)]
Fix secondary fire taking accuracy off the overkill/instagib primary attacks
Mario [Sat, 28 Mar 2015 01:50:04 +0000 (12:50 +1100)]
Temporarily disable networking of ladders (abnormal ladder brushes are extending past their limits, this will have to be solved)
Mario [Fri, 27 Mar 2015 08:15:05 +0000 (08:15 +0000)]
Merge branch 'Mario/nade_fixes' into 'master'
Merge branch Mario/nade_fixes (M merge request)
Fixes nades disappearing when touching clips, allows dropping the nade down only when player is both looking down and holding crouch, fixes ultra fast overkill superweapon re-spawn times, adds an option to change the nade throw offset (possibly useful for servers that wish to attempt to reproduce the old overkill's nade throw offsets).
See merge request !112
Mario [Fri, 27 Mar 2015 07:58:43 +0000 (18:58 +1100)]
Merge branch 'master' into Mario/nade_fixes
Mario [Thu, 26 Mar 2015 00:03:43 +0000 (11:03 +1100)]
Fix buffs potentially removing the wrong item
Mario [Wed, 25 Mar 2015 04:59:00 +0000 (15:59 +1100)]
Disable networking of trains temporarily
Mario [Wed, 25 Mar 2015 03:38:22 +0000 (14:38 +1100)]
Fix compile
Mario [Wed, 25 Mar 2015 03:34:59 +0000 (14:34 +1100)]
Merge branch 'master' into Mario/combined_updates
Rudolf Polzer [Tue, 24 Mar 2015 18:52:05 +0000 (19:52 +0100)]
Allow maps to specify "warpzone_isboxy" "1" to disable exacttrigger logic on anything.
This allows for some performance optimizations.
Rudolf Polzer [Tue, 24 Mar 2015 18:51:00 +0000 (19:51 +0100)]
Make the face normal calculation clearer by using less variables.
Mario [Tue, 24 Mar 2015 16:02:41 +0000 (03:02 +1100)]
Add a way to trigger multi only when certain keys are pressed (intended for use on warp pipes)
Rudolf Polzer [Tue, 24 Mar 2015 14:36:12 +0000 (15:36 +0100)]
Kill dotproduct() function as it's built-in in QC; move cross() to warpzonelib so warpzonelib can use it and stay standalone.
Mario [Tue, 24 Mar 2015 14:32:57 +0000 (01:32 +1100)]
Use engine side touch on triggers
Mario [Tue, 24 Mar 2015 14:03:35 +0000 (01:03 +1100)]
Allow knockback from weapons in side-scrolling mode
Mario [Tue, 24 Mar 2015 10:01:51 +0000 (21:01 +1100)]
Don't check warpzone trigger touch for all triggers (causes severe lag on maps with giant triggers)
Mario [Tue, 24 Mar 2015 08:43:29 +0000 (19:43 +1100)]
Merge branch 'Mario/combined_prediction' into Mario/combined_updates
Mario [Tue, 24 Mar 2015 08:43:11 +0000 (19:43 +1100)]
Remove a duplicate declaration
Mario [Tue, 24 Mar 2015 02:19:33 +0000 (13:19 +1100)]
Predicted sidescrolling, yay
Mario [Tue, 24 Mar 2015 01:30:55 +0000 (12:30 +1100)]
Merge branch 'Mario/qc_physics_prehax' into Mario/combined_updates
Conflicts:
qcsrc/client/laser.qc
qcsrc/client/main.qc
qcsrc/client/progs.src
qcsrc/client/vehicles/vehicles.qc
qcsrc/common/constants.qh
qcsrc/common/csqcmodel_settings.qh
qcsrc/common/nades.qc
qcsrc/common/triggers/teleporters.qc
qcsrc/common/triggers/trigger/jumppads.qc
qcsrc/common/weapons/w_porto.qc
qcsrc/csqcmodellib/cl_player.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh
qcsrc/server/g_triggers.qc
qcsrc/server/mutators/gamemode_assault.qc
qcsrc/server/mutators/gamemode_ctf.qc
qcsrc/server/mutators/gamemode_ctf.qh
qcsrc/server/mutators/gamemode_domination.qc
qcsrc/server/mutators/gamemode_onslaught.qc
qcsrc/server/mutators/mutator_buffs.qc
qcsrc/server/mutators/mutator_dodging.qc
qcsrc/server/mutators/mutator_multijump.qc
qcsrc/server/mutators/mutator_nades.qc
qcsrc/server/progs.src
qcsrc/server/race.qh
qcsrc/server/t_halflife.qc
qcsrc/server/tturrets/system/system_main.qc
qcsrc/server/tturrets/system/system_misc.qc
qcsrc/server/vehicles/racer.qc
qcsrc/server/vehicles/vehicles.qc
qcsrc/warpzonelib/common.qc
Mario [Mon, 23 Mar 2015 03:22:04 +0000 (14:22 +1100)]
Look down while crouching (matches Arcade Quake, besides the crouching, which is a requirement here)
Mario [Mon, 23 Mar 2015 01:01:12 +0000 (12:01 +1100)]
Fix overkill powerups again
Mario [Mon, 23 Mar 2015 00:57:04 +0000 (11:57 +1100)]
Fix overkill powerups
Mario [Mon, 23 Mar 2015 00:31:38 +0000 (11:31 +1100)]
Bring back old powerups temporarily for tourney
Rudolf Polzer [Sat, 21 Mar 2015 22:13:35 +0000 (23:13 +0100)]
Fix some overbright maps when realtime world lights are enabled.
Rudolf Polzer [Tue, 17 Mar 2015 11:03:11 +0000 (12:03 +0100)]
Support workarea limiting of the window size.
Requires an engine change to support getresolution(-2) to return the workarea.
Mario [Mon, 16 Mar 2015 22:09:42 +0000 (09:09 +1100)]
Set nade throw offset to "0 0 0" (will leave the cvar in there incase some servers wish to use it)
Mario [Mon, 16 Mar 2015 21:56:10 +0000 (08:56 +1100)]
Comment out a hack which removes nades when they touch clips
Mario [Mon, 16 Mar 2015 21:52:44 +0000 (08:52 +1100)]
Reset overkill superweapon respawn time to 2 minutes (seems a 1 was missed in the 120 second cooldown cvar one of the old ports)
Mario [Mon, 16 Mar 2015 21:48:27 +0000 (08:48 +1100)]
Also require crouch to drop the nade down
Mario [Mon, 16 Mar 2015 20:58:02 +0000 (07:58 +1100)]
Add a setting to handle nade throwing offset, defaulting to -20 (seems to work well)
Mario [Mon, 16 Mar 2015 20:42:44 +0000 (07:42 +1100)]
Fix a warning when dying in overkill with no attacker set
Mario [Mon, 16 Mar 2015 16:39:06 +0000 (03:39 +1100)]
Allow true flight with flight buff
Mario [Mon, 16 Mar 2015 15:29:22 +0000 (02:29 +1100)]
Add movetype updates from QC physics branch
Mario [Mon, 16 Mar 2015 15:00:13 +0000 (02:00 +1100)]
Network impulse triggers
Mario [Mon, 16 Mar 2015 14:09:17 +0000 (01:09 +1100)]
Merge some changes from prediction branch
Mario [Mon, 16 Mar 2015 14:00:45 +0000 (01:00 +1100)]
Merge branch 'master' into Mario/qc_physics_prehax
Mario [Mon, 16 Mar 2015 13:11:27 +0000 (00:11 +1100)]
Add a setting to change laser force in overkill
Mario [Fri, 13 Mar 2015 11:22:23 +0000 (22:22 +1100)]
Merge branch 'master' into Mario/combined_updates
Mario [Fri, 13 Mar 2015 11:20:43 +0000 (22:20 +1100)]
Merge branch 'master' into Mario/combined_updates
Conflicts:
qcsrc/server/defs.qh
Mario [Fri, 13 Mar 2015 11:14:03 +0000 (22:14 +1100)]
Merge branch 'Mario/combined_viewloc' into Mario/combined_updates
Mario [Fri, 13 Mar 2015 11:13:45 +0000 (22:13 +1100)]
Merge branch 'Mario/combined_updates' into Mario/combined_viewloc
Rudolf Polzer [Mon, 9 Mar 2015 13:09:09 +0000 (14:09 +0100)]
Disable lightning arc branching, as this can (and WILL) recurse infinitely.
Rudolf Polzer [Mon, 9 Mar 2015 12:28:55 +0000 (13:28 +0100)]
Make sure the number of lightning beam segments is bounded.
Otherwise, beam list overflow and infinite loops.
Mario [Sun, 8 Mar 2015 14:11:47 +0000 (01:11 +1100)]
Fix secondary fire affecting primary accuracy in overkill and instagib
Mario [Sat, 7 Mar 2015 15:03:21 +0000 (02:03 +1100)]
Fix monsters unable to target non-player entities
Mario [Fri, 6 Mar 2015 13:40:02 +0000 (00:40 +1100)]
Hide the flag from the carrier's view while they're in a vehicle (fixes flag getting in way of crosshair in 3rd person vehicle mode)
Mario [Fri, 6 Mar 2015 07:31:36 +0000 (07:31 +0000)]
Merge branch 'terencehill/weapon_panel_retry' into 'master'
Weapons panel improvements
I've taken into account sev's feedback at !106 and after lots of tests I came up with something good, I think.
To sum it up the changes:
* weapons are now sorted either vertically (more rows) or horizontally (more columns) (not just vertically as before)
* all weapons layout: more symmetrical distribution, icons are now as big as possible
* only owned layout: prefer stretched layouts (like in sev's branch) but avoid too much stretched layouts where item aspect ratio gets altered
See merge request !110
Mario [Thu, 5 Mar 2015 15:08:20 +0000 (02:08 +1100)]
Add some missing "bad" cvars
Mario [Thu, 5 Mar 2015 08:10:01 +0000 (19:10 +1100)]
Fix minor typo
Mario [Thu, 5 Mar 2015 08:01:18 +0000 (19:01 +1100)]
Some junk
Mario [Wed, 4 Mar 2015 09:42:53 +0000 (20:42 +1100)]
Merge branch 'Mario/combined_updates' into Mario/combined_viewloc
Mario [Wed, 4 Mar 2015 07:58:37 +0000 (18:58 +1100)]
Use effects system for vehicle muzzle flashes
Mario [Wed, 4 Mar 2015 06:45:11 +0000 (17:45 +1100)]
Enable 3rd person vehicle view by default
Mario [Wed, 4 Mar 2015 06:35:21 +0000 (17:35 +1100)]
Allow spiderbot to sprint by holding jump
Mario [Wed, 4 Mar 2015 05:34:57 +0000 (16:34 +1100)]
Make racer hover on lava and slime
Mario [Wed, 4 Mar 2015 02:06:35 +0000 (13:06 +1100)]
Fix an oddity pointed out by TimePath
Mario [Tue, 3 Mar 2015 13:25:02 +0000 (00:25 +1100)]
Allow spiderbot to move while in the air (fixes getting stuck on jumppads), fix dodging, add cvars to handle damage multipliers for some objects (turrets, vehicles)
Mario [Mon, 2 Mar 2015 08:13:56 +0000 (19:13 +1100)]
Make it work
Mario [Sun, 1 Mar 2015 08:41:44 +0000 (19:41 +1100)]
Goat
Mario [Sun, 1 Mar 2015 03:48:53 +0000 (14:48 +1100)]
Close to finalized, side scrolling view mode by Player 2
Mario [Sat, 28 Feb 2015 08:36:26 +0000 (19:36 +1100)]
Add something for 2015
Mario [Sat, 28 Feb 2015 08:34:51 +0000 (19:34 +1100)]
Some more attempts
Mario [Thu, 26 Feb 2015 10:24:40 +0000 (21:24 +1100)]
Experimental view location trigger, new branch as it may interfere with regular modes in its curren state
Rudolf Polzer [Wed, 25 Feb 2015 15:04:54 +0000 (16:04 +0100)]
Stop using model "" in func_breakable - it's unreliable when effects is
set.
Rather use EF_NODRAW to prevent sending.
Rudolf Polzer [Wed, 25 Feb 2015 14:06:28 +0000 (15:06 +0100)]
target_spawn: Retokenize when needed.
Rudolf Polzer [Wed, 25 Feb 2015 10:55:31 +0000 (11:55 +0100)]
Don't annoy bots with noise :)
Mario [Wed, 25 Feb 2015 05:49:53 +0000 (16:49 +1100)]
Add shotgunarena as a mutator
Mario [Tue, 24 Feb 2015 12:02:29 +0000 (23:02 +1100)]
Remove revolver (seems we reached a weapon breakage limit)
Mario [Tue, 24 Feb 2015 11:45:12 +0000 (22:45 +1100)]
Fix compile with CHAOS mode
Mario [Mon, 23 Feb 2015 23:40:53 +0000 (10:40 +1100)]
Fix voting with nospectators
Mario [Sun, 22 Feb 2015 10:49:05 +0000 (21:49 +1100)]
Test hax
Mario [Sun, 22 Feb 2015 09:46:11 +0000 (20:46 +1100)]
Split movetypes into separate files
Mario [Sun, 22 Feb 2015 08:57:24 +0000 (19:57 +1100)]
Move QC movetypes to common folder
Mario [Sun, 22 Feb 2015 05:35:10 +0000 (16:35 +1100)]
Fix door notifications
Mario [Sun, 22 Feb 2015 02:15:40 +0000 (13:15 +1100)]
Network colormod even to players (g_player_brightness)
Mario [Sun, 22 Feb 2015 02:12:27 +0000 (13:12 +1100)]
Add an option to use the new "pro" hook texture
Rudolf Polzer [Sat, 21 Feb 2015 15:04:42 +0000 (16:04 +0100)]
Damn. NOW it's good :)
Rudolf Polzer [Sat, 21 Feb 2015 15:03:44 +0000 (16:03 +0100)]
Initialize func_breakable sound on connect.
terencehill [Sat, 21 Feb 2015 14:56:15 +0000 (15:56 +0100)]
Improve check for vertical sorting
Rudolf Polzer [Sat, 21 Feb 2015 14:17:30 +0000 (15:17 +0100)]
Use the right sound channel.
Rudolf Polzer [Sat, 21 Feb 2015 14:09:14 +0000 (15:09 +0100)]
Oops. Unbreak - stopsoundto is no longer public.
Rudolf Polzer [Sat, 21 Feb 2015 12:56:07 +0000 (13:56 +0100)]
There's smoke in the master bedroom.
In other words: func_breakable.sound1 support.
Mario [Fri, 20 Feb 2015 12:02:48 +0000 (23:02 +1100)]
Network dphitcontentsmask for accurate prediction on clips, almost fix stairs prediction
Mario [Fri, 20 Feb 2015 07:58:39 +0000 (18:58 +1100)]
Make a temporary server side trigger think function for touch handling
Mario [Fri, 20 Feb 2015 07:10:25 +0000 (18:10 +1100)]
Experimental support for QC-driven CTF flag physics
Mario [Fri, 20 Feb 2015 03:44:53 +0000 (14:44 +1100)]
Partially working trains
Mario [Fri, 20 Feb 2015 00:02:05 +0000 (11:02 +1100)]
Rough port of SV_PushMove to CSQC
Mario [Thu, 19 Feb 2015 09:53:12 +0000 (20:53 +1100)]
Walking through doors with high ping just got awesome
Mario [Thu, 19 Feb 2015 09:12:31 +0000 (20:12 +1100)]
Shoot rockets through doors
Mario [Thu, 19 Feb 2015 05:46:07 +0000 (16:46 +1100)]
Move a spawnfunc definition to its correct location (small commit for a change)
Mario [Thu, 19 Feb 2015 05:35:16 +0000 (16:35 +1100)]
Move more stuff around
Mario [Thu, 19 Feb 2015 04:19:19 +0000 (15:19 +1100)]
A few trillion lines of untested junk, committing now so it doesn't become quadrillions
Mario [Wed, 18 Feb 2015 04:53:15 +0000 (15:53 +1100)]
Some minor cleanup
Mario [Tue, 17 Feb 2015 22:00:11 +0000 (09:00 +1100)]
Make things slightly less broken
Mario [Tue, 17 Feb 2015 19:52:51 +0000 (06:52 +1100)]
Merge branch 'TimePath/experiments/csqc_prediction' into Mario/qc_physics
Conflicts:
qcsrc/server/miscfunctions.qc
qcsrc/server/t_plats.qc
Mario [Tue, 17 Feb 2015 19:49:51 +0000 (06:49 +1100)]
Merge branch 'master' into TimePath/experiments/csqc_prediction
Conflicts:
qcsrc/server/miscfunctions.qc
qcsrc/server/miscfunctions.qh