]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
9 years agoFix overkill powerups again
Mario [Mon, 23 Mar 2015 01:01:12 +0000 (12:01 +1100)]
Fix overkill powerups again

9 years agoFix overkill powerups
Mario [Mon, 23 Mar 2015 00:57:04 +0000 (11:57 +1100)]
Fix overkill powerups

9 years agoBring back old powerups temporarily for tourney
Mario [Mon, 23 Mar 2015 00:31:38 +0000 (11:31 +1100)]
Bring back old powerups temporarily for tourney

9 years agoAdd a setting to change laser force in overkill
Mario [Mon, 16 Mar 2015 13:11:27 +0000 (00:11 +1100)]
Add a setting to change laser force in overkill

9 years agoMerge branch 'master' into Mario/combined_updates
Mario [Fri, 13 Mar 2015 11:22:23 +0000 (22:22 +1100)]
Merge branch 'master' into Mario/combined_updates

9 years agoMerge 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

9 years agoMerge branch 'Mario/combined_viewloc' into Mario/combined_updates
Mario [Fri, 13 Mar 2015 11:14:03 +0000 (22:14 +1100)]
Merge branch 'Mario/combined_viewloc' into Mario/combined_updates

9 years agoMerge branch 'Mario/combined_updates' into Mario/combined_viewloc
Mario [Fri, 13 Mar 2015 11:13:45 +0000 (22:13 +1100)]
Merge branch 'Mario/combined_updates' into Mario/combined_viewloc

9 years agoDisable lightning arc branching, as this can (and WILL) recurse infinitely.
Rudolf Polzer [Mon, 9 Mar 2015 13:09:09 +0000 (14:09 +0100)]
Disable lightning arc branching, as this can (and WILL) recurse infinitely.

9 years agoMake sure the number of lightning beam segments is bounded.
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.

9 years agoFix secondary fire affecting primary accuracy in overkill and instagib
Mario [Sun, 8 Mar 2015 14:11:47 +0000 (01:11 +1100)]
Fix secondary fire affecting primary accuracy in overkill and instagib

9 years agoFix monsters unable to target non-player entities
Mario [Sat, 7 Mar 2015 15:03:21 +0000 (02:03 +1100)]
Fix monsters unable to target non-player entities

9 years agoHide the flag from the carrier's view while they're in a vehicle (fixes flag getting...
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)

9 years agoMerge branch 'terencehill/weapon_panel_retry' into 'master'
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

9 years agoAdd some missing "bad" cvars
Mario [Thu, 5 Mar 2015 15:08:20 +0000 (02:08 +1100)]
Add some missing "bad" cvars

9 years agoFix minor typo
Mario [Thu, 5 Mar 2015 08:10:01 +0000 (19:10 +1100)]
Fix minor typo

9 years agoSome junk
Mario [Thu, 5 Mar 2015 08:01:18 +0000 (19:01 +1100)]
Some junk

9 years agoMerge branch 'Mario/combined_updates' into Mario/combined_viewloc
Mario [Wed, 4 Mar 2015 09:42:53 +0000 (20:42 +1100)]
Merge branch 'Mario/combined_updates' into Mario/combined_viewloc

9 years agoUse effects system for vehicle muzzle flashes
Mario [Wed, 4 Mar 2015 07:58:37 +0000 (18:58 +1100)]
Use effects system for vehicle muzzle flashes

9 years agoEnable 3rd person vehicle view by default
Mario [Wed, 4 Mar 2015 06:45:11 +0000 (17:45 +1100)]
Enable 3rd person vehicle view by default

9 years agoAllow spiderbot to sprint by holding jump
Mario [Wed, 4 Mar 2015 06:35:21 +0000 (17:35 +1100)]
Allow spiderbot to sprint by holding jump

9 years agoMake racer hover on lava and slime
Mario [Wed, 4 Mar 2015 05:34:57 +0000 (16:34 +1100)]
Make racer hover on lava and slime

9 years agoFix an oddity pointed out by TimePath
Mario [Wed, 4 Mar 2015 02:06:35 +0000 (13:06 +1100)]
Fix an oddity pointed out by TimePath

9 years agoAllow spiderbot to move while in the air (fixes getting stuck on jumppads), fix dodgi...
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)

9 years agoMake it work
Mario [Mon, 2 Mar 2015 08:13:56 +0000 (19:13 +1100)]
Make it work

9 years agoGoat
Mario [Sun, 1 Mar 2015 08:41:44 +0000 (19:41 +1100)]
Goat

9 years agoClose to finalized, side scrolling view mode by Player 2
Mario [Sun, 1 Mar 2015 03:48:53 +0000 (14:48 +1100)]
Close to finalized, side scrolling view mode by Player 2

9 years agoAdd something for 2015
Mario [Sat, 28 Feb 2015 08:36:26 +0000 (19:36 +1100)]
Add something for 2015

9 years agoSome more attempts
Mario [Sat, 28 Feb 2015 08:34:51 +0000 (19:34 +1100)]
Some more attempts

9 years agoExperimental view location trigger, new branch as it may interfere with regular modes...
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

9 years agoStop using model "" in func_breakable - it's unreliable when effects is
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.

9 years agotarget_spawn: Retokenize when needed.
Rudolf Polzer [Wed, 25 Feb 2015 14:06:28 +0000 (15:06 +0100)]
target_spawn: Retokenize when needed.

9 years agoDon't annoy bots with noise :)
Rudolf Polzer [Wed, 25 Feb 2015 10:55:31 +0000 (11:55 +0100)]
Don't annoy bots with noise :)

9 years agoAdd shotgunarena as a mutator
Mario [Wed, 25 Feb 2015 05:49:53 +0000 (16:49 +1100)]
Add shotgunarena as a mutator

9 years agoRemove revolver (seems we reached a weapon breakage limit)
Mario [Tue, 24 Feb 2015 12:02:29 +0000 (23:02 +1100)]
Remove revolver (seems we reached a weapon breakage limit)

9 years agoFix compile with CHAOS mode
Mario [Tue, 24 Feb 2015 11:45:12 +0000 (22:45 +1100)]
Fix compile with CHAOS mode

9 years agoFix voting with nospectators
Mario [Mon, 23 Feb 2015 23:40:53 +0000 (10:40 +1100)]
Fix voting with nospectators

9 years agoFix door notifications
Mario [Sun, 22 Feb 2015 05:35:10 +0000 (16:35 +1100)]
Fix door notifications

9 years agoNetwork colormod even to players (g_player_brightness)
Mario [Sun, 22 Feb 2015 02:15:40 +0000 (13:15 +1100)]
Network colormod even to players (g_player_brightness)

9 years agoAdd an option to use the new "pro" hook texture
Mario [Sun, 22 Feb 2015 02:12:27 +0000 (13:12 +1100)]
Add an option to use the new "pro" hook texture

9 years agoDamn. NOW it's good :)
Rudolf Polzer [Sat, 21 Feb 2015 15:04:42 +0000 (16:04 +0100)]
Damn. NOW it's good :)

9 years agoInitialize func_breakable sound on connect.
Rudolf Polzer [Sat, 21 Feb 2015 15:03:44 +0000 (16:03 +0100)]
Initialize func_breakable sound on connect.

9 years agoImprove check for vertical sorting
terencehill [Sat, 21 Feb 2015 14:56:15 +0000 (15:56 +0100)]
Improve check for vertical sorting

9 years agoUse the right sound channel.
Rudolf Polzer [Sat, 21 Feb 2015 14:17:30 +0000 (15:17 +0100)]
Use the right sound channel.

9 years agoOops. Unbreak - stopsoundto is no longer public.
Rudolf Polzer [Sat, 21 Feb 2015 14:09:14 +0000 (15:09 +0100)]
Oops. Unbreak - stopsoundto is no longer public.

9 years agoThere's smoke in the master bedroom.
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.

9 years agoMerge branch 'master' into terencehill/weapon_panel_retry
terencehill [Sun, 15 Feb 2015 18:55:56 +0000 (19:55 +0100)]
Merge branch 'master' into terencehill/weapon_panel_retry

9 years agoOnlyowned layout: instead of keeping original table proportions as much as possible...
terencehill [Sun, 15 Feb 2015 00:14:46 +0000 (01:14 +0100)]
Onlyowned layout: instead of keeping original table proportions as much as possible, use the previous method that prefers stretched layouts but avoid too much stretched layouts where item aspect ratio gets altered

9 years agoReimplement all-weapons table size calculation in order to make item aspect ratio...
terencehill [Sat, 14 Feb 2015 13:23:47 +0000 (14:23 +0100)]
Reimplement all-weapons table size calculation in order to make item aspect ratio as close as possible to the desired aspect ratio, which means icons as big as possible.

9 years agoMerge branch 'master' into Mario/combined_updates
Mario [Sat, 14 Feb 2015 13:13:03 +0000 (00:13 +1100)]
Merge branch 'master' into Mario/combined_updates

9 years agoMerge branch 'sev/weapon_panel_retry' into 'master'
Mario [Sat, 14 Feb 2015 13:07:07 +0000 (13:07 +0000)]
Merge branch 'sev/weapon_panel_retry' into 'master'

Weapon Panel Retry

Based on the discussion at !105, I've made the following changes to @terencehill's implementation:
- The icons are distributed symmetrically, no matter if the panel is arranged vertically or horizontally
- If the bounds touch a screen edge, the panel is snapped to that edge

This merge request replaces !105.

See merge request !106

9 years agoMerge branch 'master' into sev/weapon_panel_retry
Mario [Sat, 14 Feb 2015 13:02:54 +0000 (00:02 +1100)]
Merge branch 'master' into sev/weapon_panel_retry

9 years agoApply a bad hack to give flak rockets on pickup
Mario [Fri, 13 Feb 2015 19:39:39 +0000 (06:39 +1100)]
Apply a bad hack to give flak rockets on pickup

9 years agoExperimental new weapon: Flak Cannon
Mario [Thu, 12 Feb 2015 19:44:30 +0000 (06:44 +1100)]
Experimental new weapon: Flak Cannon

9 years agoDisable ammo charging by default
Mario [Thu, 12 Feb 2015 11:01:28 +0000 (22:01 +1100)]
Disable ammo charging by default

9 years agoForgot keep owner cvar in 0.8; buff SG; change back spawn furthest
Mirio [Thu, 12 Feb 2015 10:44:03 +0000 (11:44 +0100)]
Forgot keep owner cvar in 0.8; buff SG; change back spawn furthest

9 years agoSome experiments with arc types (currently too broken for use)
Mario [Thu, 12 Feb 2015 10:38:52 +0000 (21:38 +1100)]
Some experiments with arc types (currently too broken for use)

9 years agoMerge branch 'master' into Mario/combined_updates
Mario [Mon, 9 Feb 2015 21:10:00 +0000 (08:10 +1100)]
Merge branch 'master' into Mario/combined_updates

9 years agoCenter onlyowned weapon panel if the panel bounds reach across the whole screen
Severin Meyer [Mon, 9 Feb 2015 19:16:29 +0000 (20:16 +0100)]
Center onlyowned weapon panel if the panel bounds reach across the whole screen

9 years agoCenter onlyowned panel if the original panel snaps to a whole screen side
terencehill [Mon, 9 Feb 2015 11:28:39 +0000 (12:28 +0100)]
Center onlyowned panel if the original panel snaps to a whole screen side

9 years agoUpscale icons with the previous code (AR "fix") rather then with hud_panel_weapons_on...
terencehill [Mon, 9 Feb 2015 10:49:02 +0000 (11:49 +0100)]
Upscale icons with the previous code (AR "fix") rather then with hud_panel_weapons_onlyowned_icon_maxscale (feature removed)

9 years agoMerge remote-tracking branch 'origin/divVerent/crypto-fixes'
Rudolf Polzer [Mon, 9 Feb 2015 11:07:58 +0000 (12:07 +0100)]
Merge remote-tracking branch 'origin/divVerent/crypto-fixes'

9 years agoWeapon panel only owned mode: reduce table trying to keep the original table proporti...
terencehill [Mon, 9 Feb 2015 10:01:47 +0000 (11:01 +0100)]
Weapon panel only owned mode: reduce table trying to keep the original table proportions as much as possible, gives a more consistent layout across different number of owned weapons. Weapons are now sorted either vertically or horizontally depending on the original table proportions

9 years agoMerge branch 'master' into Mario/combined_updates
Mario [Mon, 9 Feb 2015 06:55:41 +0000 (17:55 +1100)]
Merge branch 'master' into Mario/combined_updates

9 years agoAdd Melano to extended, add translators
Mirio [Sun, 8 Feb 2015 17:23:48 +0000 (18:23 +0100)]
Add Melano to extended, add translators

9 years agoMerge branch 'terencehill/menu_fix' into 'master'
Mario [Sun, 8 Feb 2015 15:22:12 +0000 (15:22 +0000)]
Merge branch 'terencehill/menu_fix' into 'master'

Terencehill/menu fix

Fix for bug #1453 "Advanced settings dialog does not close after pressing OK"

See merge request !107

9 years agoDo specific checks for sound formats
Mario [Sun, 8 Feb 2015 11:32:09 +0000 (22:32 +1100)]
Do specific checks for sound formats

9 years agoExperimental day-night cycle mutator
Mario [Sun, 8 Feb 2015 08:29:52 +0000 (19:29 +1100)]
Experimental day-night cycle mutator

9 years agoAdd some extra checks to event_damage, to prevent possible crashes
Mario [Sun, 8 Feb 2015 07:01:22 +0000 (18:01 +1100)]
Add some extra checks to event_damage, to prevent possible crashes

9 years agoUltimate improvement of the onlyowned layout: change the automatic fix of the weapon...
terencehill [Sat, 7 Feb 2015 20:00:55 +0000 (21:00 +0100)]
Ultimate improvement of the onlyowned layout: change the automatic fix of the weapon icon aspect ratio to note scale the icon up, then scale it up (when there's enough available space) with hud_panel_weapons_onlyowned_icon_maxscale without altering aspect ratio

9 years agoImprove weapon icon distribution
terencehill [Sat, 7 Feb 2015 19:07:50 +0000 (20:07 +0100)]
Improve weapon icon distribution

9 years agoIf health or armor are above set limits, send items to piggybacker
Mario [Sat, 7 Feb 2015 17:17:16 +0000 (04:17 +1100)]
If health or armor are above set limits, send items to piggybacker

9 years agoGive some touched items to the rider while riding monsters
Mario [Sat, 7 Feb 2015 17:10:58 +0000 (04:10 +1100)]
Give some touched items to the rider while riding monsters

9 years agoMerge branch 'TimePath/issues/1455' into 'master'
Mario [Sat, 7 Feb 2015 12:57:37 +0000 (12:57 +0000)]
Merge branch 'TimePath/issues/1455' into 'master'

"volume must be in range 0-1" warnings when playing the tuba

Closes xonotic/xonotic-data.pk3dir#1455

See merge request !108

9 years agoMerge branch 'TimePath/issues/1454' into 'master'
Mario [Sat, 7 Feb 2015 08:54:45 +0000 (08:54 +0000)]
Merge branch 'TimePath/issues/1454' into 'master'

Menu VM crash when g_invasion is set to 1

See merge request !109

9 years agoDon't call gameTypeChangeNotify() without a parent
TimePath [Sat, 7 Feb 2015 08:45:19 +0000 (19:45 +1100)]
Don't call gameTypeChangeNotify() without a parent
Closes #1454

9 years agoCleanup
TimePath [Sat, 7 Feb 2015 08:34:23 +0000 (19:34 +1100)]
Cleanup

9 years agoFix the tuba with pythonic modulo
TimePath [Sat, 7 Feb 2015 07:03:54 +0000 (18:03 +1100)]
Fix the tuba with pythonic modulo
Closes #1455

9 years agoCleanup
TimePath [Sat, 7 Feb 2015 05:54:02 +0000 (16:54 +1100)]
Cleanup

9 years agoAllow swinging nades around with hook
Mario [Fri, 6 Feb 2015 12:40:08 +0000 (23:40 +1100)]
Allow swinging nades around with hook

9 years agoAdd a monstercount option for mapinfos
Mario [Fri, 6 Feb 2015 10:05:28 +0000 (21:05 +1100)]
Add a monstercount option for mapinfos

9 years agoIncrease secondary force to 400 (300 was way too little)
Mario [Fri, 6 Feb 2015 08:48:10 +0000 (19:48 +1100)]
Increase secondary force to 400 (300 was way too little)

9 years agoFix a silly mistake
Mario [Fri, 6 Feb 2015 08:42:37 +0000 (19:42 +1100)]
Fix a silly mistake

9 years agoPossible fix for insanely fast dodging speed
Mario [Fri, 6 Feb 2015 08:34:43 +0000 (19:34 +1100)]
Possible fix for insanely fast dodging speed

9 years agoFix some small things
Mario [Fri, 6 Feb 2015 00:04:08 +0000 (11:04 +1100)]
Fix some small things

9 years agoand now for something completely different
Mario [Fri, 6 Feb 2015 00:00:48 +0000 (11:00 +1100)]
and now for something completely different

9 years agoMake the weapon panel snapping work with any padding value
Severin Meyer [Thu, 5 Feb 2015 20:43:33 +0000 (21:43 +0100)]
Make the weapon panel snapping work with any padding value

9 years agoBase weapon panel snap threshold on screen size
Severin Meyer [Thu, 5 Feb 2015 19:09:07 +0000 (20:09 +0100)]
Base weapon panel snap threshold on screen size

9 years agoFix TDM slider not changing point limit
Mario [Thu, 5 Feb 2015 18:30:23 +0000 (05:30 +1100)]
Fix TDM slider not changing point limit

9 years agoFinally fixed nade slapping and being able to shoot yourself, thanks to divVerent
Mario [Thu, 5 Feb 2015 18:17:37 +0000 (05:17 +1100)]
Finally fixed nade slapping and being able to shoot yourself, thanks to divVerent

9 years agoMake the weapon panel even more symmetrical and snappier
Severin Meyer [Thu, 5 Feb 2015 17:09:49 +0000 (18:09 +0100)]
Make the weapon panel even more symmetrical and snappier

9 years agoRevert 855007679 as it caused bug #1453 "Advanced settings dialog does not close...
terencehill [Thu, 5 Feb 2015 14:52:06 +0000 (15:52 +0100)]
Revert 855007679 as it caused bug #1453 "Advanced settings dialog does not close after pressing OK"

9 years agoIf round hasn't started, don't imprison players (possible fix for players burning...
Mario [Thu, 5 Feb 2015 13:14:55 +0000 (00:14 +1100)]
If round hasn't started, don't imprison players (possible fix for players burning after respawn at round end)

9 years agoDon't remove nades that pass through weapon clips (has some side effects, but also...
Mario [Thu, 5 Feb 2015 12:36:48 +0000 (23:36 +1100)]
Don't remove nades that pass through weapon clips (has some side effects, but also breaks maps like xoylent if nade is removed)

9 years agoMake it really compile
Mario [Thu, 5 Feb 2015 11:23:05 +0000 (22:23 +1100)]
Make it really compile

9 years agoFix compile
Mario [Thu, 5 Feb 2015 11:17:13 +0000 (22:17 +1100)]
Fix compile

9 years agoDistribute the icons on the weapons panel more symmetrically and snap the panel to...
Severin Meyer [Wed, 4 Feb 2015 20:05:58 +0000 (21:05 +0100)]
Distribute the icons on the weapons panel more symmetrically and snap the panel to the screen edge

9 years ago435 conflicts, 135 files conflicts, fixed in 7 hours #nolife
Mario [Wed, 4 Feb 2015 16:38:30 +0000 (03:38 +1100)]
435 conflicts, 135 files conflicts, fixed in 7 hours #nolife

9 years agoAdd a fallback for TDM (untested potential fix to a nasty crash)
Mario [Wed, 4 Feb 2015 09:41:41 +0000 (20:41 +1100)]
Add a fallback for TDM (untested potential fix to a nasty crash)

9 years agoAdd a little hack to fix packet loss caused by findradius
Mario [Wed, 4 Feb 2015 07:40:58 +0000 (18:40 +1100)]
Add a little hack to fix packet loss caused by findradius