]>
de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
Mario [Fri, 10 May 2013 06:50:55 +0000 (16:50 +1000)]
Merge branch 'master' into Mario/monsters
Samual Lenks [Fri, 10 May 2013 05:20:57 +0000 (01:20 -0400)]
Merge remote-tracking branch 'origin/Mario/classname_checks'
Samual Lenks [Fri, 10 May 2013 05:11:57 +0000 (01:11 -0400)]
Burn the old arena file
Samual Lenks [Fri, 10 May 2013 05:11:27 +0000 (01:11 -0400)]
Merge remote-tracking branch 'origin/master' into Mario/classname_checks
Conflicts:
qcsrc/server/cl_client.qc
qcsrc/server/g_damage.qc
qcsrc/server/t_items.qc
qcsrc/server/w_common.qc
qcsrc/server/waypointsprites.qc
Samual Lenks [Fri, 10 May 2013 01:52:58 +0000 (21:52 -0400)]
Make menu compatibility match server code too
Samual Lenks [Fri, 10 May 2013 01:40:54 +0000 (21:40 -0400)]
Clean up mutator loading list a bit
Samual Lenks [Fri, 10 May 2013 00:10:03 +0000 (20:10 -0400)]
Merge remote-tracking branch 'origin/Mario/mutator_minstagib'
Samual Lenks [Thu, 9 May 2013 21:21:07 +0000 (17:21 -0400)]
Fix language list size
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)
Samual Lenks [Thu, 9 May 2013 20:49:55 +0000 (16:49 -0400)]
Merge remote-tracking branch 'origin/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
Samual Lenks [Thu, 9 May 2013 20:37:03 +0000 (16:37 -0400)]
Merge remote-tracking branch 'origin/divVerent/meleefix'
Samual Lenks [Thu, 9 May 2013 20:31:54 +0000 (16:31 -0400)]
Merge remote-tracking branch 'origin/master' into divVerent/meleefix
Samual Lenks [Wed, 8 May 2013 04:31:10 +0000 (00:31 -0400)]
Merge remote-tracking branch 'origin/Mario/lms_fixes'
Mario [Wed, 8 May 2013 04:20:26 +0000 (14:20 +1000)]
Fix some issues with LMS & CA
Samual Lenks [Wed, 8 May 2013 03:12:50 +0000 (23:12 -0400)]
Whoops, forgot that one
Samual Lenks [Wed, 8 May 2013 03:09:03 +0000 (23:09 -0400)]
Try to fix off-by-one error in deathtype code
Mario [Wed, 8 May 2013 02:05:31 +0000 (12:05 +1000)]
Fix compile error
Mario [Wed, 8 May 2013 02:04:39 +0000 (12:04 +1000)]
Merge branch 'master' into Mario/mutator_minstagib
Samual Lenks [Wed, 8 May 2013 01:15:35 +0000 (21:15 -0400)]
Merge remote-tracking branch 'origin/terencehill/spectate_prev'
Samual Lenks [Wed, 8 May 2013 01:14:51 +0000 (21:14 -0400)]
Fix stupidass function name
Samual Lenks [Wed, 8 May 2013 01:10:59 +0000 (21:10 -0400)]
Merge remote-tracking branch 'origin/master' into terencehill/spectate_prev
Samual Lenks [Wed, 8 May 2013 00:57:12 +0000 (20:57 -0400)]
Merge branch 'divVerent/lavafix'
Samual Lenks [Wed, 8 May 2013 00:54:26 +0000 (20:54 -0400)]
Merge remote-tracking branch 'origin/master' into divVerent/lavafix
Samual Lenks [Wed, 8 May 2013 00:37:05 +0000 (20:37 -0400)]
Merge remote-tracking branch 'origin/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
Samual Lenks [Wed, 8 May 2013 00:14:05 +0000 (20:14 -0400)]
Merge remote-tracking branch 'origin/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
Samual Lenks [Tue, 7 May 2013 15:56:07 +0000 (11:56 -0400)]
Fix some team things-- whoops, sorry peoplez :D
Mario [Tue, 7 May 2013 09:17:26 +0000 (19:17 +1000)]
Fix frozen revive screen brightness
Mario [Tue, 7 May 2013 09:03:48 +0000 (19:03 +1000)]
Add a murder notification for monsters
Mario [Tue, 7 May 2013 08:44:25 +0000 (18:44 +1000)]
Merge branch 'master' into Mario/monsters
Mario [Tue, 7 May 2013 06:14:52 +0000 (16:14 +1000)]
Remove a redundant mutator hook
Mario [Tue, 7 May 2013 05:52:10 +0000 (15:52 +1000)]
Fix new clienttype checks
Mario [Tue, 7 May 2013 05:49:31 +0000 (15:49 +1000)]
Merge branch 'master' into Mario/classname_checks
Samual Lenks [Tue, 7 May 2013 05:43:55 +0000 (01:43 -0400)]
Merge remote-tracking branch 'origin/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
Samual Lenks [Tue, 7 May 2013 05:38:52 +0000 (01:38 -0400)]
Merge remote-tracking branch 'origin/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
Samual Lenks [Tue, 7 May 2013 05:14:10 +0000 (01:14 -0400)]
Merge remote-tracking branch 'origin/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
Mario [Mon, 6 May 2013 21:44:53 +0000 (07:44 +1000)]
Merge branch 'master' into Mario/monsters
Mario [Mon, 6 May 2013 21:26:35 +0000 (07:26 +1000)]
Improve combat phase centerprint notification
Mario [Sun, 5 May 2013 23:03:22 +0000 (09:03 +1000)]
Remove unused zombie apocalypse notification
Mario [Sun, 5 May 2013 18:18:17 +0000 (04:18 +1000)]
Force infinite timelimit in td
Mario [Sat, 4 May 2013 23:12:17 +0000 (09:12 +1000)]
Remove useless weaponarena check
Mario [Sat, 4 May 2013 22:59:10 +0000 (08:59 +1000)]
Fix spectating
Mario [Sat, 4 May 2013 22:48:09 +0000 (08:48 +1000)]
Add a notification for picking up extra lives
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)
Mario [Sat, 4 May 2013 22:01:48 +0000 (08:01 +1000)]
Merge branch 'master' into Mario/lms_updates
Mario [Sat, 4 May 2013 20:48:43 +0000 (06:48 +1000)]
Add waypoint option to main Freeze function
Samual Lenks [Sat, 4 May 2013 18:30:43 +0000 (14:30 -0400)]
Merge remote-tracking branch 'origin/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
Mario [Sat, 4 May 2013 01:25:16 +0000 (11:25 +1000)]
Add an info centerprint for spawning players
Rudolf Polzer [Thu, 2 May 2013 18:26:45 +0000 (20:26 +0200)]
try to detect isdead flag (please test)
Samual Lenks [Wed, 1 May 2013 18:54:14 +0000 (14:54 -0400)]
Try to fix vote reason string
terencehill [Wed, 1 May 2013 11:09:57 +0000 (13:09 +0200)]
Optimize team color loading a bit
terencehill [Wed, 1 May 2013 09:37:28 +0000 (11:37 +0200)]
If observing force team color to red entering hud config mode
terencehill [Tue, 30 Apr 2013 22:26:29 +0000 (00:26 +0200)]
Update immediately HUD color when changing team
Mario [Tue, 30 Apr 2013 19:52:20 +0000 (05:52 +1000)]
Merge branch 'master' into Mario/monsters
Mario [Mon, 29 Apr 2013 21:13:48 +0000 (07:13 +1000)]
Add spawnshield time for monsters
Mario [Mon, 29 Apr 2013 20:46:24 +0000 (06:46 +1000)]
Reset mage attack delay after attacking
Mario [Mon, 29 Apr 2013 20:24:29 +0000 (06:24 +1000)]
Rename ogre to brute
Mario [Mon, 29 Apr 2013 19:30:43 +0000 (05:30 +1000)]
Update name in spawn list
Mario [Mon, 29 Apr 2013 19:27:27 +0000 (05:27 +1000)]
Rename rotfish to stingray
Mario [Mon, 29 Apr 2013 18:50:02 +0000 (04:50 +1000)]
Remove marine
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
Mario [Mon, 29 Apr 2013 17:33:00 +0000 (03:33 +1000)]
Rename grunt to marine
Samual Lenks [Mon, 29 Apr 2013 01:22:28 +0000 (21:22 -0400)]
Merge remote-tracking branch 'origin/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
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
Mario [Mon, 29 Apr 2013 00:20:55 +0000 (10:20 +1000)]
Fix monster color resetting when it respawns
Mario [Mon, 29 Apr 2013 00:03:52 +0000 (10:03 +1000)]
Reset knight delayed attack after throwing fireball
Mario [Sun, 28 Apr 2013 23:50:09 +0000 (09:50 +1000)]
rename rottweiler to cerberus
Samual Lenks [Sun, 28 Apr 2013 23:48:41 +0000 (19:48 -0400)]
Add classname for panel entities
Mario [Sun, 28 Apr 2013 23:37:08 +0000 (09:37 +1000)]
Rename shalrath to mage
Samual Lenks [Sun, 28 Apr 2013 23:34:38 +0000 (19:34 -0400)]
Merge remote-tracking branch 'origin/master' into terencehill/hud_code_restructure
Samual Lenks [Sun, 28 Apr 2013 23:31:56 +0000 (19:31 -0400)]
Merge remote-tracking branch 'origin/terencehill/menu_weaponarena_weapon_selection'
Samual Lenks [Sun, 28 Apr 2013 23:30:55 +0000 (19:30 -0400)]
Also add a radio button for "all weapons"
Mario [Sun, 28 Apr 2013 23:23:51 +0000 (09:23 +1000)]
Rename hell-knight to knight
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
Mario [Sun, 28 Apr 2013 22:57:23 +0000 (08:57 +1000)]
Merge branch 'master' into Mario/monsters
Samual Lenks [Sun, 28 Apr 2013 22:01:39 +0000 (18:01 -0400)]
Merge remote-tracking branch 'origin/Mario/vehicle_crash_fix'
Samual Lenks [Sun, 28 Apr 2013 21:59:00 +0000 (17:59 -0400)]
Merge remote-tracking branch 'origin/Mario/touchexplode_mutator'
Samual Lenks [Sun, 28 Apr 2013 21:52:50 +0000 (17:52 -0400)]
Merge remote-tracking branch 'origin/Mario/hagar_load_fix'
Samual Lenks [Sun, 28 Apr 2013 21:51:42 +0000 (17:51 -0400)]
Merge remote-tracking branch 'origin/Mario/misc_tracker_fixes'
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
Mario [Sat, 27 Apr 2013 22:22:01 +0000 (08:22 +1000)]
Rename demon to animus
Mario [Sat, 27 Apr 2013 21:52:31 +0000 (07:52 +1000)]
Rename wizard to wyvern
Mario [Sat, 27 Apr 2013 20:50:37 +0000 (06:50 +1000)]
Remove .checkattack
Mario [Sat, 27 Apr 2013 20:34:27 +0000 (06:34 +1000)]
Update menu monster names
Mario [Sat, 27 Apr 2013 20:12:59 +0000 (06:12 +1000)]
Rewrite monster attacks as a single function & rename knight to bruiser
Mario [Sat, 27 Apr 2013 18:23:39 +0000 (04:23 +1000)]
Update spawn list to include slime
Mario [Sat, 27 Apr 2013 18:18:41 +0000 (04:18 +1000)]
Rename tarbaby to slime & begin cleanup of monster_attack_melee function
Mario [Sat, 27 Apr 2013 17:44:04 +0000 (03:44 +1000)]
Lower ogre grenade refire rate
Mario [Sat, 27 Apr 2013 17:38:07 +0000 (03:38 +1000)]
Lower ogre chance of using machinegun
Mario [Sat, 27 Apr 2013 17:35:06 +0000 (03:35 +1000)]
Fix monsters firing projectiles only infront of themselves, and not above
Mario [Sat, 27 Apr 2013 11:28:48 +0000 (21:28 +1000)]
Add a cvar to only attack enemies infront of the monster
Mario [Fri, 26 Apr 2013 15:58:25 +0000 (01:58 +1000)]
Add a new model for tarbaby
Mario [Fri, 26 Apr 2013 11:08:41 +0000 (21:08 +1000)]
Improve mage friend health/ammo check a bit
projects / xonotic / xonotic-data.pk3dir.git / log