]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
11 years agog_spawn_furthest 1 by default, players really shouldn't spawn near others
Samual Lenks [Thu, 9 May 2013 20:58:25 +0000 (16:58 -0400)]
g_spawn_furthest 1 by default, players really shouldn't spawn near others

11 years agoMerge remote-tracking branch 'origin/master' into samual/respawn_improvements
Samual Lenks [Thu, 9 May 2013 20:57:46 +0000 (16:57 -0400)]
Merge remote-tracking branch 'origin/master' into samual/respawn_improvements

11 years agoDon't show accuracy in scoreboard anymore (it can be seen in 2 other
Samual Lenks [Thu, 9 May 2013 20:51:13 +0000 (16:51 -0400)]
Don't show accuracy in scoreboard anymore (it can be seen in 2 other
places, +accuracy and weapons panel)

11 years agoMerge remote-tracking branch 'origin/cbrutail/hudlaserminsta_fix'
Samual Lenks [Thu, 9 May 2013 20:49:55 +0000 (16:49 -0400)]
Merge remote-tracking branch 'origin/cbrutail/hudlaserminsta_fix'

11 years agoMerge remote-tracking branch 'origin/master' into cbrutail/hudlaserminsta_fix
Samual Lenks [Thu, 9 May 2013 20:47:52 +0000 (16:47 -0400)]
Merge remote-tracking branch 'origin/master' into cbrutail/hudlaserminsta_fix

11 years agoMerge remote-tracking branch 'origin/divVerent/meleefix'
Samual Lenks [Thu, 9 May 2013 20:37:03 +0000 (16:37 -0400)]
Merge remote-tracking branch 'origin/divVerent/meleefix'

11 years agoMerge remote-tracking branch 'origin/master' into divVerent/meleefix
Samual Lenks [Thu, 9 May 2013 20:31:54 +0000 (16:31 -0400)]
Merge remote-tracking branch 'origin/master' into divVerent/meleefix

11 years agoMerge remote-tracking branch 'origin/Mario/lms_fixes'
Samual Lenks [Wed, 8 May 2013 04:31:10 +0000 (00:31 -0400)]
Merge remote-tracking branch 'origin/Mario/lms_fixes'

11 years agoFix some issues with LMS & CA
Mario [Wed, 8 May 2013 04:20:26 +0000 (14:20 +1000)]
Fix some issues with LMS & CA

11 years agoWhoops, forgot that one
Samual Lenks [Wed, 8 May 2013 03:12:50 +0000 (23:12 -0400)]
Whoops, forgot that one

11 years agoTry to fix off-by-one error in deathtype code
Samual Lenks [Wed, 8 May 2013 03:09:03 +0000 (23:09 -0400)]
Try to fix off-by-one error in deathtype code

11 years agoMerge remote-tracking branch 'origin/terencehill/spectate_prev'
Samual Lenks [Wed, 8 May 2013 01:15:35 +0000 (21:15 -0400)]
Merge remote-tracking branch 'origin/terencehill/spectate_prev'

11 years agoFix stupidass function name
Samual Lenks [Wed, 8 May 2013 01:14:51 +0000 (21:14 -0400)]
Fix stupidass function name

11 years agoMerge remote-tracking branch 'origin/master' into terencehill/spectate_prev
Samual Lenks [Wed, 8 May 2013 01:10:59 +0000 (21:10 -0400)]
Merge remote-tracking branch 'origin/master' into terencehill/spectate_prev

11 years agoMerge branch 'divVerent/lavafix'
Samual Lenks [Wed, 8 May 2013 00:57:12 +0000 (20:57 -0400)]
Merge branch 'divVerent/lavafix'

11 years agoMerge remote-tracking branch 'origin/master' into divVerent/lavafix
Samual Lenks [Wed, 8 May 2013 00:54:26 +0000 (20:54 -0400)]
Merge remote-tracking branch 'origin/master' into divVerent/lavafix

11 years agoMerge remote-tracking branch 'origin/terencehill/clear_button'
Samual Lenks [Wed, 8 May 2013 00:37:05 +0000 (20:37 -0400)]
Merge remote-tracking branch 'origin/terencehill/clear_button'

11 years agoMerge remote-tracking branch 'origin/master' into terencehill/clear_button
Samual Lenks [Wed, 8 May 2013 00:24:09 +0000 (20:24 -0400)]
Merge remote-tracking branch 'origin/master' into terencehill/clear_button

11 years agoMerge remote-tracking branch 'origin/terencehill/menu_focus_stuff'
Samual Lenks [Wed, 8 May 2013 00:14:05 +0000 (20:14 -0400)]
Merge remote-tracking branch 'origin/terencehill/menu_focus_stuff'

11 years agoMerge remote-tracking branch 'origin/master' into terencehill/menu_focus_stuff
Samual Lenks [Wed, 8 May 2013 00:11:53 +0000 (20:11 -0400)]
Merge remote-tracking branch 'origin/master' into terencehill/menu_focus_stuff

11 years agoFoobar stuffz
Samual Lenks [Tue, 7 May 2013 20:20:45 +0000 (16:20 -0400)]
Foobar stuffz

11 years agoMerge remote-tracking branch 'origin/master' into samual/respawn_improvements
Samual Lenks [Tue, 7 May 2013 17:04:11 +0000 (13:04 -0400)]
Merge remote-tracking branch 'origin/master' into samual/respawn_improvements

Conflicts:
qcsrc/server/cl_client.qc

11 years agoFix some team things-- whoops, sorry peoplez :D
Samual Lenks [Tue, 7 May 2013 15:56:07 +0000 (11:56 -0400)]
Fix some team things-- whoops, sorry peoplez :D

11 years agoMerge remote-tracking branch 'origin/Mario/assault_mutator'
Samual Lenks [Tue, 7 May 2013 05:43:55 +0000 (01:43 -0400)]
Merge remote-tracking branch 'origin/Mario/assault_mutator'

11 years agoMerge remote-tracking branch 'origin/master' into Mario/assault_mutator
Samual Lenks [Tue, 7 May 2013 05:42:27 +0000 (01:42 -0400)]
Merge remote-tracking branch 'origin/master' into Mario/assault_mutator

Conflicts:
qcsrc/server/cl_client.qc
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src

11 years agoMerge remote-tracking branch 'origin/Mario/lms_updates'
Samual Lenks [Tue, 7 May 2013 05:38:52 +0000 (01:38 -0400)]
Merge remote-tracking branch 'origin/Mario/lms_updates'

11 years agoMerge remote-tracking branch 'origin/master' into Mario/lms_updates
Samual Lenks [Tue, 7 May 2013 05:37:55 +0000 (01:37 -0400)]
Merge remote-tracking branch 'origin/master' into Mario/lms_updates

Conflicts:
qcsrc/server/arena.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_weapons.qc
qcsrc/server/scores.qc

11 years agoMerge remote-tracking branch 'origin/terencehill/ca_arena_mutators'
Samual Lenks [Tue, 7 May 2013 05:14:10 +0000 (01:14 -0400)]
Merge remote-tracking branch 'origin/terencehill/ca_arena_mutators'

11 years agoMerge remote-tracking branch 'origin/master' into terencehill/ca_arena_mutators
Samual Lenks [Tue, 7 May 2013 05:13:01 +0000 (01:13 -0400)]
Merge remote-tracking branch 'origin/master' into terencehill/ca_arena_mutators

11 years agoRemove useless weaponarena check
Mario [Sat, 4 May 2013 23:12:17 +0000 (09:12 +1000)]
Remove useless weaponarena check

11 years agoFix spectating
Mario [Sat, 4 May 2013 22:59:10 +0000 (08:59 +1000)]
Fix spectating

11 years agoAdd a notification for picking up extra lives
Mario [Sat, 4 May 2013 22:48:09 +0000 (08:48 +1000)]
Add a notification for picking up extra lives

11 years agoRemove some more g_lms checks & add a use for mega health (disabled by default)
Mario [Sat, 4 May 2013 22:39:21 +0000 (08:39 +1000)]
Remove some more g_lms checks & add a use for mega health (disabled by default)

11 years agoMerge branch 'master' into Mario/lms_updates
Mario [Sat, 4 May 2013 22:01:48 +0000 (08:01 +1000)]
Merge branch 'master' into Mario/lms_updates

11 years agoMerge remote-tracking branch 'origin/terencehill/hud_code_restructure'
Samual Lenks [Sat, 4 May 2013 18:30:43 +0000 (14:30 -0400)]
Merge remote-tracking branch 'origin/terencehill/hud_code_restructure'

11 years agoMerge remote-tracking branch 'origin/master' into terencehill/hud_code_restructure
Samual Lenks [Sat, 4 May 2013 03:02:08 +0000 (23:02 -0400)]
Merge remote-tracking branch 'origin/master' into terencehill/hud_code_restructure

11 years agotry to detect isdead flag (please test)
Rudolf Polzer [Thu, 2 May 2013 18:26:45 +0000 (20:26 +0200)]
try to detect isdead flag (please test)

11 years agoTry to fix vote reason string
Samual Lenks [Wed, 1 May 2013 18:54:14 +0000 (14:54 -0400)]
Try to fix vote reason string

11 years agoSave changes temporarily so I can fix something in master
Samual Lenks [Wed, 1 May 2013 18:51:26 +0000 (14:51 -0400)]
Save changes temporarily so I can fix something in master

11 years agoOptimize team color loading a bit
terencehill [Wed, 1 May 2013 11:09:57 +0000 (13:09 +0200)]
Optimize team color loading a bit

11 years agoIf observing force team color to red entering hud config mode
terencehill [Wed, 1 May 2013 09:37:28 +0000 (11:37 +0200)]
If observing force team color to red entering hud config mode

11 years agoUpdate immediately HUD color when changing team
terencehill [Tue, 30 Apr 2013 22:26:29 +0000 (00:26 +0200)]
Update immediately HUD color when changing team

11 years agoUpdate debug print
Samual Lenks [Mon, 29 Apr 2013 22:19:02 +0000 (18:19 -0400)]
Update debug print

11 years agoMerge remote-tracking branch 'origin/master' into samual/respawn_improvements
Samual Lenks [Mon, 29 Apr 2013 18:52:10 +0000 (14:52 -0400)]
Merge remote-tracking branch 'origin/master' into samual/respawn_improvements

Conflicts:
qcsrc/client/Main.qc
qcsrc/common/constants.qh

11 years agoMerge remote-tracking branch 'origin/terencehill/hud_code_restructure' into terencehi...
terencehill [Mon, 29 Apr 2013 17:39:11 +0000 (19:39 +0200)]
Merge remote-tracking branch 'origin/terencehill/hud_code_restructure' into terencehill/hud_code_restructure

11 years agoMerge remote-tracking branch 'origin/Mario/domination_waypoint_fix'
Samual Lenks [Mon, 29 Apr 2013 01:22:28 +0000 (21:22 -0400)]
Merge remote-tracking branch 'origin/Mario/domination_waypoint_fix'

11 years agoMerge remote-tracking branch 'origin/master' into Mario/domination_waypoint_fix
Samual Lenks [Mon, 29 Apr 2013 01:20:03 +0000 (21:20 -0400)]
Merge remote-tracking branch 'origin/master' into Mario/domination_waypoint_fix

11 years agoAdd a static function for team names that should not be translated
Samual Lenks [Mon, 29 Apr 2013 01:18:11 +0000 (21:18 -0400)]
Add a static function for team names that should not be translated

11 years agoAdd classname for panel entities
Samual Lenks [Sun, 28 Apr 2013 23:48:41 +0000 (19:48 -0400)]
Add classname for panel entities

11 years agoMerge remote-tracking branch 'origin/master' into terencehill/hud_code_restructure
Samual Lenks [Sun, 28 Apr 2013 23:34:38 +0000 (19:34 -0400)]
Merge remote-tracking branch 'origin/master' into terencehill/hud_code_restructure

11 years agoMerge remote-tracking branch 'origin/terencehill/menu_weaponarena_weapon_selection'
Samual Lenks [Sun, 28 Apr 2013 23:31:56 +0000 (19:31 -0400)]
Merge remote-tracking branch 'origin/terencehill/menu_weaponarena_weapon_selection'

11 years agoAlso add a radio button for "all weapons"
Samual Lenks [Sun, 28 Apr 2013 23:30:55 +0000 (19:30 -0400)]
Also add a radio button for "all weapons"

11 years agoMerge remote-tracking branch 'origin/master' into terencehill/menu_weaponarena_weapon...
Samual Lenks [Sun, 28 Apr 2013 23:09:42 +0000 (19:09 -0400)]
Merge remote-tracking branch 'origin/master' into terencehill/menu_weaponarena_weapon_selection

11 years agoMerge remote-tracking branch 'origin/Mario/vehicle_crash_fix'
Samual Lenks [Sun, 28 Apr 2013 22:01:39 +0000 (18:01 -0400)]
Merge remote-tracking branch 'origin/Mario/vehicle_crash_fix'

11 years agoMerge remote-tracking branch 'origin/Mario/touchexplode_mutator'
Samual Lenks [Sun, 28 Apr 2013 21:59:00 +0000 (17:59 -0400)]
Merge remote-tracking branch 'origin/Mario/touchexplode_mutator'

11 years agoMerge remote-tracking branch 'origin/Mario/hagar_load_fix'
Samual Lenks [Sun, 28 Apr 2013 21:52:50 +0000 (17:52 -0400)]
Merge remote-tracking branch 'origin/Mario/hagar_load_fix'

11 years agoMerge remote-tracking branch 'origin/Mario/misc_tracker_fixes'
Samual Lenks [Sun, 28 Apr 2013 21:51:42 +0000 (17:51 -0400)]
Merge remote-tracking branch 'origin/Mario/misc_tracker_fixes'

11 years agoActually, enable NOTIFICATIONS_DEBUG by default for now, but also add cvar
Samual Lenks [Sun, 28 Apr 2013 21:38:31 +0000 (17:38 -0400)]
Actually, enable NOTIFICATIONS_DEBUG by default for now, but also add cvar

11 years agoFix the new rule...
terencehill [Fri, 26 Apr 2013 11:02:50 +0000 (13:02 +0200)]
Fix the new rule...

11 years agoMerge branch 'master' into Mario/misc_tracker_fixes
Mario [Fri, 26 Apr 2013 01:03:33 +0000 (11:03 +1000)]
Merge branch 'master' into Mario/misc_tracker_fixes

11 years agoFixes for some issues on the bug tracker
Mario [Fri, 26 Apr 2013 01:00:10 +0000 (11:00 +1000)]
Fixes for some issues on the bug tracker

11 years agoMerge remote-tracking branch 'origin/master'
Samual Lenks [Fri, 26 Apr 2013 00:03:06 +0000 (20:03 -0400)]
Merge remote-tracking branch 'origin/master'

11 years agoWhen net_type is MSG_CENTER and net_name is 0, still check entity net_type
Samual Lenks [Fri, 26 Apr 2013 00:02:07 +0000 (20:02 -0400)]
When net_type is MSG_CENTER and net_name is 0, still check entity net_type

11 years agoForbid impulses even during the countdown to round start, it fixes issues with weapons
terencehill [Thu, 25 Apr 2013 14:28:48 +0000 (16:28 +0200)]
Forbid impulses even during the countdown to round start, it fixes issues with weapons

11 years agoNew rule: frozen players can't pick up any item
terencehill [Thu, 25 Apr 2013 14:01:34 +0000 (16:01 +0200)]
New rule: frozen players can't pick up any item

11 years agoMerge branch 'master' into terencehill/ca_arena_mutators
terencehill [Thu, 25 Apr 2013 10:25:57 +0000 (12:25 +0200)]
Merge branch 'master' into terencehill/ca_arena_mutators

Conflicts:
qcsrc/client/announcer.qc
qcsrc/server/arena.qc

11 years agoThis line was committed accidentally
terencehill [Wed, 24 Apr 2013 22:37:34 +0000 (00:37 +0200)]
This line was committed accidentally

11 years agoMove "Most weapons" under "Weapon arenas:"
terencehill [Tue, 23 Apr 2013 18:20:20 +0000 (20:20 +0200)]
Move "Most weapons" under "Weapon arenas:"

11 years agoFix minstagib and nix radio buttons not reseting releative cvars to 0 when checking...
terencehill [Tue, 23 Apr 2013 17:44:34 +0000 (19:44 +0200)]
Fix minstagib and nix radio buttons not reseting releative cvars to 0 when checking other linked radio buttons

11 years agoFix "No start weapons" radio button: g_start_weapon_fireball was missing and g_start_...
terencehill [Tue, 23 Apr 2013 17:42:01 +0000 (19:42 +0200)]
Fix "No start weapons" radio button: g_start_weapon_fireball was missing and g_start_weapon_minelayer was duplicated

11 years agoRemove menu_weaponarena_with_laser from tooltips.db and tooltips.db.it
terencehill [Tue, 23 Apr 2013 17:37:39 +0000 (19:37 +0200)]
Remove menu_weaponarena_with_laser from tooltips.db and tooltips.db.it

11 years agoAllow to select multiple weapons for weapon arena in the menu
terencehill [Tue, 23 Apr 2013 17:35:25 +0000 (19:35 +0200)]
Allow to select multiple weapons for weapon arena in the menu

11 years agoMerge remote-tracking branch 'origin/terencehill/MOTD_bugfix'
Samual Lenks [Mon, 22 Apr 2013 20:30:10 +0000 (16:30 -0400)]
Merge remote-tracking branch 'origin/terencehill/MOTD_bugfix'

11 years agoMerge remote-tracking branch 'origin/master' into terencehill/MOTD_bugfix
Samual Lenks [Mon, 22 Apr 2013 20:25:55 +0000 (16:25 -0400)]
Merge remote-tracking branch 'origin/master' into terencehill/MOTD_bugfix

11 years agoReset killcount on readyrestart too
Samual Lenks [Mon, 22 Apr 2013 20:15:09 +0000 (16:15 -0400)]
Reset killcount on readyrestart too

11 years agoforgot to remove the debug flag
Samual Lenks [Mon, 22 Apr 2013 02:44:33 +0000 (22:44 -0400)]
forgot to remove the debug flag

11 years agoMerge remote-tracking branch 'origin/samual/notifications'
Samual Lenks [Mon, 22 Apr 2013 02:43:08 +0000 (22:43 -0400)]
Merge remote-tracking branch 'origin/samual/notifications'

11 years agoMerge remote-tracking branch 'origin/master' into samual/notifications
Samual Lenks [Mon, 22 Apr 2013 02:41:32 +0000 (22:41 -0400)]
Merge remote-tracking branch 'origin/master' into samual/notifications

11 years agoAdd updates to notifications.cfg now
Samual Lenks [Mon, 22 Apr 2013 02:37:03 +0000 (22:37 -0400)]
Add updates to notifications.cfg now

11 years agoAlphabetical order
Samual Lenks [Mon, 22 Apr 2013 02:16:48 +0000 (22:16 -0400)]
Alphabetical order

11 years agoFix a bunch of other things with new announcer code
Samual Lenks [Mon, 22 Apr 2013 02:05:28 +0000 (22:05 -0400)]
Fix a bunch of other things with new announcer code

11 years agoAdd the rest of the announcer calls to new system
Samual Lenks [Sun, 21 Apr 2013 19:25:46 +0000 (15:25 -0400)]
Add the rest of the announcer calls to new system

11 years agoget rid of some bad uses of .ogg extension
Rudolf Polzer [Sun, 21 Apr 2013 15:58:33 +0000 (17:58 +0200)]
get rid of some bad uses of .ogg extension

11 years agoMake the legacy announcer code useless/strip most of it out
Samual Lenks [Sun, 21 Apr 2013 15:43:16 +0000 (11:43 -0400)]
Make the legacy announcer code useless/strip most of it out

11 years agoMove that shizniz to the .qh file
Samual Lenks [Sun, 21 Apr 2013 15:18:42 +0000 (11:18 -0400)]
Move that shizniz to the .qh file

11 years agoMove more things over to new system
Samual Lenks [Sat, 20 Apr 2013 22:33:56 +0000 (18:33 -0400)]
Move more things over to new system

11 years agoGetting close to finishing the infrastructure for new announcer system
Samual Lenks [Sat, 20 Apr 2013 21:26:31 +0000 (17:26 -0400)]
Getting close to finishing the infrastructure for new announcer system

11 years agoFix translations being done on static filenames
Samual Lenks [Sat, 20 Apr 2013 20:36:36 +0000 (16:36 -0400)]
Fix translations being done on static filenames

11 years agoMerge remote-tracking branch 'origin/master' into samual/notifications
Samual Lenks [Sat, 20 Apr 2013 20:29:54 +0000 (16:29 -0400)]
Merge remote-tracking branch 'origin/master' into samual/notifications

11 years ago++deathlocation
Rudolf Polzer [Fri, 19 Apr 2013 14:03:29 +0000 (16:03 +0200)]
++deathlocation

11 years agoEnable notifications debug again
Samual Lenks [Wed, 17 Apr 2013 22:54:41 +0000 (18:54 -0400)]
Enable notifications debug again

11 years agoWork more on announcements
Samual Lenks [Wed, 17 Apr 2013 22:53:36 +0000 (18:53 -0400)]
Work more on announcements

11 years agoMerge remote-tracking branch 'origin/master' into samual/notifications
Samual Lenks [Tue, 16 Apr 2013 00:47:37 +0000 (20:47 -0400)]
Merge remote-tracking branch 'origin/master' into samual/notifications

11 years agoFix teamkill
Samual Lenks [Tue, 16 Apr 2013 00:47:16 +0000 (20:47 -0400)]
Fix teamkill

11 years agoLower Nex damage to 80, raise animtime to 0.5
Samual Lenks [Mon, 15 Apr 2013 22:06:04 +0000 (18:06 -0400)]
Lower Nex damage to 80, raise animtime to 0.5

11 years agoImplement a function to spectate previous player and add possibility to spectate...
terencehill [Sun, 14 Apr 2013 10:19:47 +0000 (12:19 +0200)]
Implement a function to spectate previous player and add possibility to spectate next/previous player with next/previous weapon binds (primary fire still changes to the next player)

11 years agoStart removing headshots from notifications (forgot about these :3)
Samual Lenks [Mon, 15 Apr 2013 06:16:12 +0000 (02:16 -0400)]
Start removing headshots from notifications (forgot about these :3)

11 years agoMore announcer stuff, plus fix #1476
Samual Lenks [Mon, 15 Apr 2013 03:28:51 +0000 (23:28 -0400)]
More announcer stuff, plus fix #1476

11 years agoMore integration
Samual Lenks [Mon, 15 Apr 2013 02:22:08 +0000 (22:22 -0400)]
More integration

11 years agoNow add the rest of the infrastructure merge for announcer (partly)
Samual Lenks [Mon, 15 Apr 2013 01:54:19 +0000 (21:54 -0400)]
Now add the rest of the infrastructure merge for announcer (partly)