]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
9 years agoNades: check if player has hook for priming with weapon throw bind
TimePath [Tue, 6 Oct 2015 01:06:29 +0000 (12:06 +1100)]
Nades: check if player has hook for priming with weapon throw bind

9 years agoNades: always throw with weapon drop in case offhand is occupied
TimePath [Tue, 6 Oct 2015 00:56:00 +0000 (11:56 +1100)]
Nades: always throw with weapon drop in case offhand is occupied

9 years agoHook: don't give weapon when offhand is active
TimePath [Tue, 6 Oct 2015 00:07:24 +0000 (11:07 +1100)]
Hook: don't give weapon when offhand is active

9 years agoHook: merge offhand and weapon behaviour
TimePath [Tue, 6 Oct 2015 00:00:09 +0000 (11:00 +1100)]
Hook: merge offhand and weapon behaviour

Fixes offhand with nades
Fixes ammo

9 years agoHook: fix server cfg
TimePath [Mon, 5 Oct 2015 11:27:46 +0000 (22:27 +1100)]
Hook: fix server cfg

9 years agoHook: fix hookbomb ownership
TimePath [Mon, 5 Oct 2015 09:07:44 +0000 (20:07 +1100)]
Hook: fix hookbomb ownership

9 years agoWeapons: Don't take mutator blocked weapons into account when sizing the weapons...
TimePath [Mon, 5 Oct 2015 08:10:52 +0000 (19:10 +1100)]
Weapons: Don't take mutator blocked weapons into account when sizing the weapons panel, unless they are held

9 years agoNexball: mutator lock ballstealer
TimePath [Mon, 5 Oct 2015 07:26:29 +0000 (18:26 +1100)]
Nexball: mutator lock ballstealer

9 years agoMerge branch 'master' into TimePath/unified_weapons
TimePath [Sat, 3 Oct 2015 08:29:19 +0000 (18:29 +1000)]
Merge branch 'master' into TimePath/unified_weapons

# Conflicts:
# qcsrc/common/turrets/turret/ewheel.qc
# qcsrc/common/turrets/turret/hk_weapon.qc
# qcsrc/common/turrets/turret/walker.qc
# qcsrc/common/turrets/unit/flac.qc
# qcsrc/common/turrets/unit/fusionreactor.qc
# qcsrc/common/turrets/unit/hellion.qc
# qcsrc/common/turrets/unit/machinegun.qc
# qcsrc/common/turrets/unit/mlrs.qc
# qcsrc/common/turrets/unit/phaser.qc
# qcsrc/common/turrets/unit/plasma.qc
# qcsrc/common/turrets/unit/plasma_dual.qc
# qcsrc/common/turrets/unit/tesla.qc
# qcsrc/common/vehicles/vehicle/bumblebee.qc
# qcsrc/common/weapons/weapon/hook.qc
# qcsrc/common/weapons/weapon/vortex.qc
# qcsrc/server/mutators/mutator_overkill.qc

9 years agoMerge branch 'TimePath/spawnfunc' into 'master'
TimePath [Sat, 3 Oct 2015 08:10:34 +0000 (08:10 +0000)]
Merge branch 'TimePath/spawnfunc' into 'master'

spawnfunc whitelist

So we know which entity fields are actually being used that we can't remove or rename.

When a field not listed is used, a warning is displayed. No official maps produce warnings. After enough community maps have been tested, can be changed to error instead.

For convenience, a cvar will be added as an additional whitelist.

See merge request !227

9 years agoMerge branch 'TimePath/effectinfo' into 'master'
TimePath [Sat, 3 Oct 2015 08:10:08 +0000 (08:10 +0000)]
Merge branch 'TimePath/effectinfo' into 'master'

QC generated effectinfo.txt

Has the major benefit of being able to template effects for teams

Is foundation for an in-game effects editor

See merge request !228

9 years agoEven invincible monsters should be weak against hurt triggers and lava
Mario [Sat, 3 Oct 2015 07:47:04 +0000 (17:47 +1000)]
Even invincible monsters should be weak against hurt triggers and lava

9 years agoMerge branch 'terencehill/itemstime_checkmark2' into 'master'
Mario [Sat, 3 Oct 2015 07:20:03 +0000 (07:20 +0000)]
Merge branch 'terencehill/itemstime_checkmark2' into 'master'

Itemstime: draw a checkmark for available items

Itemstime: draw a checkmark instead of centering the item icon when an item is a vailable again (only when the client has the checkmark image)

See merge request !213

9 years agoMerge branch 'master' into TimePath/spawnfunc 227/head
TimePath [Sat, 3 Oct 2015 07:17:49 +0000 (17:17 +1000)]
Merge branch 'master' into TimePath/spawnfunc

# Conflicts:
# qcsrc/common/turrets/unit/ewheel.qc
# qcsrc/common/turrets/unit/flac.qc
# qcsrc/common/turrets/unit/fusionreactor.qc
# qcsrc/common/turrets/unit/hellion.qc
# qcsrc/common/turrets/unit/hk.qc
# qcsrc/common/turrets/unit/machinegun.qc
# qcsrc/common/turrets/unit/mlrs.qc
# qcsrc/common/turrets/unit/phaser.qc
# qcsrc/common/turrets/unit/plasma.qc
# qcsrc/common/turrets/unit/plasma_dual.qc
# qcsrc/common/turrets/unit/tesla.qc
# qcsrc/common/turrets/unit/walker.qc
# qcsrc/server/t_items.qc

9 years agoMerge branch 'terencehill/slider_anim_improvements' into 'master'
Mario [Sat, 3 Oct 2015 06:55:28 +0000 (06:55 +0000)]
Merge branch 'terencehill/slider_anim_improvements' into 'master'

Slider anim improvements

1. Fix sliders handle getting stuck in the initial position when dragging outside the handle

2. Make sliders animation work much better on quick repeated changes (e.g. with mouse wheel). Default animation is now easingQuadOut and lasts 0.5 s (instead of easingQuadInOut, 1 s), more similar to the list scrolling animation

3. Don't play any animation when loading the initial value of a slider since the animation can't be seen anyway (the menu takes 2-3 seconds to load); also the high number (200) of animations played at once on menu start caused a bug where slider's handles couldn't be moved for a while (up to 12 seconds with 30 fps)

Additional note about point 3: before the change of point 2 500+ animation were played at once on menu start, as 300+ animation updates counted as new animations!

See merge request !221

9 years agoMerge branch 'terencehill/bot_fixes' into 'master'
Mario [Sat, 3 Oct 2015 06:52:42 +0000 (06:52 +0000)]
Merge branch 'terencehill/bot_fixes' into 'master'

Bot fixes

* Make misc_breakablemodel entities secondary target for bots so they never prefer shooting at barrels over players
* While shooting at breakable objects, don't focus on them, be ready to choose another enemy
* Properly set bot_attack field in a few more situations (reset bot_attack field when going observer, and set/reset it properly when freezing/unfreezing somebody)

See merge request !197

9 years agoMerge branch 'terencehill/radiobutton_fix' into 'master'
Mario [Sat, 3 Oct 2015 06:42:24 +0000 (06:42 +0000)]
Merge branch 'terencehill/radiobutton_fix' into 'master'

Radiobuttons fix

Fix radiobuttons: they are displayed as checked and can't be changed

See merge request !229

9 years agoMerge branch 'master' into TimePath/effectinfo
TimePath [Sat, 3 Oct 2015 06:11:23 +0000 (16:11 +1000)]
Merge branch 'master' into TimePath/effectinfo

9 years agoMenu: check for division by 0
TimePath [Fri, 2 Oct 2015 23:40:17 +0000 (09:40 +1000)]
Menu: check for division by 0

9 years agoMonsters: remove MON_ACTION
TimePath [Fri, 2 Oct 2015 23:03:20 +0000 (09:03 +1000)]
Monsters: remove MON_ACTION

9 years agoWeapons: fix accuracy panel and hide the internal weapons
TimePath [Fri, 2 Oct 2015 22:29:14 +0000 (08:29 +1000)]
Weapons: fix accuracy panel and hide the internal weapons

9 years agoWeapons: fix impulses
TimePath [Fri, 2 Oct 2015 01:48:25 +0000 (11:48 +1000)]
Weapons: fix impulses

9 years agoWeapons: remove many direct references to `self`
TimePath [Thu, 1 Oct 2015 23:57:06 +0000 (09:57 +1000)]
Weapons: remove many direct references to `self`

9 years agoMake time work after ready restart, also fix time being off by 1
Mario [Thu, 1 Oct 2015 13:08:34 +0000 (23:08 +1000)]
Make time work after ready restart, also fix time being off by 1

9 years agoWeapons: remove useless weapon return values and implementations
TimePath [Thu, 1 Oct 2015 10:37:41 +0000 (20:37 +1000)]
Weapons: remove useless weapon return values and implementations

9 years agoWeapons: remove WEP_ACTION
TimePath [Thu, 1 Oct 2015 10:08:53 +0000 (20:08 +1000)]
Weapons: remove WEP_ACTION

9 years agoWeapons: hide from menu
TimePath [Thu, 1 Oct 2015 09:20:01 +0000 (19:20 +1000)]
Weapons: hide from menu

9 years agoWeapons: split registration and base weapon definitions
TimePath [Thu, 1 Oct 2015 09:05:02 +0000 (19:05 +1000)]
Weapons: split registration and base weapon definitions

9 years agoVehicles: remove simple registration
TimePath [Thu, 1 Oct 2015 08:43:40 +0000 (18:43 +1000)]
Vehicles: remove simple registration

9 years agoVehicles: fix tag_view
TimePath [Thu, 1 Oct 2015 08:37:06 +0000 (18:37 +1000)]
Vehicles: fix tag_view

9 years agoVehicles: fix raptor projectile ownership
TimePath [Thu, 1 Oct 2015 08:13:49 +0000 (18:13 +1000)]
Vehicles: fix raptor projectile ownership

9 years agoVehicles: remove VEH_ACTION
TimePath [Thu, 1 Oct 2015 07:40:19 +0000 (17:40 +1000)]
Vehicles: remove VEH_ACTION

9 years agoAdd replacements for %T and %t (time)
Mario [Thu, 1 Oct 2015 02:48:14 +0000 (12:48 +1000)]
Add replacements for %T and %t (time)

9 years agoVehicles: factor out some bumblebee attacks
TimePath [Wed, 30 Sep 2015 23:40:19 +0000 (09:40 +1000)]
Vehicles: factor out some bumblebee attacks

9 years agoVehicles: factor out spiderbot attacks
TimePath [Wed, 30 Sep 2015 23:31:58 +0000 (09:31 +1000)]
Vehicles: factor out spiderbot attacks

9 years agoVehicles: factor out attacks
TimePath [Wed, 30 Sep 2015 23:27:55 +0000 (09:27 +1000)]
Vehicles: factor out attacks

9 years agoTurrets: factor out attacks
TimePath [Wed, 30 Sep 2015 23:10:37 +0000 (09:10 +1000)]
Turrets: factor out attacks

9 years agoTurrets: delete 401 lines
TimePath [Wed, 30 Sep 2015 22:43:07 +0000 (08:43 +1000)]
Turrets: delete 401 lines

9 years agoAdd a simple cvar to control the range of monster front view targeting
Mario [Wed, 30 Sep 2015 13:53:34 +0000 (23:53 +1000)]
Add a simple cvar to control the range of monster front view targeting

9 years agoVehicles: extract raptor weapons
TimePath [Wed, 30 Sep 2015 12:22:01 +0000 (22:22 +1000)]
Vehicles: extract raptor weapons

9 years agoTurrets: make usable as weapons
TimePath [Wed, 30 Sep 2015 09:54:24 +0000 (19:54 +1000)]
Turrets: make usable as weapons

9 years agoMonsters: make wyvern attack usable
TimePath [Wed, 30 Sep 2015 07:54:41 +0000 (17:54 +1000)]
Monsters: make wyvern attack usable

9 years agoMonsters: make spider attack usable
TimePath [Wed, 30 Sep 2015 07:05:34 +0000 (17:05 +1000)]
Monsters: make spider attack usable

9 years agoVehicles: fix racer cannon damage ownership
TimePath [Wed, 30 Sep 2015 01:41:51 +0000 (11:41 +1000)]
Vehicles: fix racer cannon damage ownership

9 years agoVehicles: make racer depend on weapon system for ammo and refire checks
TimePath [Wed, 30 Sep 2015 01:30:13 +0000 (11:30 +1000)]
Vehicles: make racer depend on weapon system for ammo and refire checks

9 years agoVehicles: make racer use weapons
TimePath [Wed, 30 Sep 2015 00:32:18 +0000 (10:32 +1000)]
Vehicles: make racer use weapons

9 years agoTurrets: make plasma turrets use weapons
TimePath [Wed, 30 Sep 2015 00:13:56 +0000 (10:13 +1000)]
Turrets: make plasma turrets use weapons

9 years agoTurrets: fix damage
TimePath [Tue, 29 Sep 2015 23:26:54 +0000 (09:26 +1000)]
Turrets: fix damage

9 years agoVehicles: extract racer secondary fire
TimePath [Tue, 29 Sep 2015 11:59:16 +0000 (21:59 +1000)]
Vehicles: extract racer secondary fire

9 years agoMonsters: make mage more player friendly
TimePath [Tue, 29 Sep 2015 10:56:13 +0000 (20:56 +1000)]
Monsters: make mage more player friendly

9 years agoAccept bounds for random location
Mario [Tue, 29 Sep 2015 08:28:09 +0000 (18:28 +1000)]
Accept bounds for random location

9 years agoOffhand: fix machinegun (still needs .clip_load > 0)
TimePath [Tue, 29 Sep 2015 08:20:40 +0000 (18:20 +1000)]
Offhand: fix machinegun (still needs .clip_load > 0)

9 years agoMutators: sort #includes
TimePath [Tue, 29 Sep 2015 02:21:33 +0000 (12:21 +1000)]
Mutators: sort #includes

9 years agoOffhand: fix ammo consumption
TimePath [Tue, 29 Sep 2015 02:03:08 +0000 (12:03 +1000)]
Offhand: fix ammo consumption

9 years agoOffhand hook: migrate to mutator system
TimePath [Tue, 29 Sep 2015 01:28:19 +0000 (11:28 +1000)]
Offhand hook: migrate to mutator system

9 years agoWeapons: Introduce concept of offhand weapons
TimePath [Tue, 29 Sep 2015 00:22:26 +0000 (10:22 +1000)]
Weapons: Introduce concept of offhand weapons

9 years agoTurrets: upgrade dual plasma
TimePath [Mon, 28 Sep 2015 08:48:47 +0000 (18:48 +1000)]
Turrets: upgrade dual plasma

9 years agoTurrets: upgrade walker
TimePath [Mon, 28 Sep 2015 08:45:31 +0000 (18:45 +1000)]
Turrets: upgrade walker

9 years agoTurrets: upgrade tesla coil
TimePath [Mon, 28 Sep 2015 08:33:24 +0000 (18:33 +1000)]
Turrets: upgrade tesla coil

9 years agoTurrets: upgrade plasma
TimePath [Mon, 28 Sep 2015 08:29:02 +0000 (18:29 +1000)]
Turrets: upgrade plasma

9 years agoTurrets: upgrade phaser
TimePath [Mon, 28 Sep 2015 08:26:06 +0000 (18:26 +1000)]
Turrets: upgrade phaser

9 years agoTurrets: upgrade MLRS
TimePath [Mon, 28 Sep 2015 08:22:02 +0000 (18:22 +1000)]
Turrets: upgrade MLRS

9 years agoTurrets: upgrade machine gun
TimePath [Mon, 28 Sep 2015 08:14:36 +0000 (18:14 +1000)]
Turrets: upgrade machine gun

9 years agoTurrets: upgrade hunter killer
TimePath [Mon, 28 Sep 2015 08:07:47 +0000 (18:07 +1000)]
Turrets: upgrade hunter killer

9 years agoTurrets: upgrade hellion
TimePath [Mon, 28 Sep 2015 08:03:17 +0000 (18:03 +1000)]
Turrets: upgrade hellion

9 years agoTurrets: upgrade fusion reactor
TimePath [Mon, 28 Sep 2015 08:00:18 +0000 (18:00 +1000)]
Turrets: upgrade fusion reactor

9 years agoTurrets: upgrade flac
TimePath [Mon, 28 Sep 2015 07:55:22 +0000 (17:55 +1000)]
Turrets: upgrade flac

9 years agoPort spiderbot
Mario [Mon, 28 Sep 2015 07:10:32 +0000 (17:10 +1000)]
Port spiderbot

9 years agoPort raptor
Mario [Mon, 28 Sep 2015 07:07:12 +0000 (17:07 +1000)]
Port raptor

9 years agoPort racer
Mario [Mon, 28 Sep 2015 07:03:29 +0000 (17:03 +1000)]
Port racer

9 years agoTurrets: upgrade eWheel
TimePath [Mon, 28 Sep 2015 06:47:10 +0000 (16:47 +1000)]
Turrets: upgrade eWheel

9 years agoVehicles: upgrade bumblebee
TimePath [Mon, 28 Sep 2015 06:33:44 +0000 (16:33 +1000)]
Vehicles: upgrade bumblebee

9 years agoPort shockwave
Mario [Mon, 28 Sep 2015 06:13:25 +0000 (16:13 +1000)]
Port shockwave

9 years agoVehicles: prepare for upgrade
TimePath [Mon, 28 Sep 2015 06:12:32 +0000 (16:12 +1000)]
Vehicles: prepare for upgrade

9 years agoPort seeker
Mario [Mon, 28 Sep 2015 06:09:38 +0000 (16:09 +1000)]
Port seeker

9 years agoPort rpc
Mario [Mon, 28 Sep 2015 06:05:09 +0000 (16:05 +1000)]
Port rpc

9 years agoPort rifle
Mario [Mon, 28 Sep 2015 06:01:29 +0000 (16:01 +1000)]
Port rifle

9 years agoTurrets: prepare for upgrade
TimePath [Mon, 28 Sep 2015 05:55:53 +0000 (15:55 +1000)]
Turrets: prepare for upgrade

9 years agoPort mortar
Mario [Mon, 28 Sep 2015 05:57:30 +0000 (15:57 +1000)]
Port mortar

9 years agoPort mine layer
Mario [Mon, 28 Sep 2015 05:49:06 +0000 (15:49 +1000)]
Port mine layer

9 years agoPort machinegun
Mario [Mon, 28 Sep 2015 05:43:41 +0000 (15:43 +1000)]
Port machinegun

9 years agoPort hook
Mario [Mon, 28 Sep 2015 05:38:24 +0000 (15:38 +1000)]
Port hook

9 years agoPort hmg
Mario [Mon, 28 Sep 2015 05:33:46 +0000 (15:33 +1000)]
Port hmg

9 years agoTurrets: cleanup
TimePath [Mon, 28 Sep 2015 05:29:21 +0000 (15:29 +1000)]
Turrets: cleanup

9 years agoPort hlac
Mario [Mon, 28 Sep 2015 05:29:21 +0000 (15:29 +1000)]
Port hlac

9 years agoPort shotgun
Mario [Mon, 28 Sep 2015 05:19:20 +0000 (15:19 +1000)]
Port shotgun

9 years agoMerge remote-tracking branch 'gitlab/TimePath/unified_weapons' into TimePath/unified_...
TimePath [Mon, 28 Sep 2015 05:01:24 +0000 (15:01 +1000)]
Merge remote-tracking branch 'gitlab/TimePath/unified_weapons' into TimePath/unified_weapons

9 years agoMonsters: cleanup
TimePath [Mon, 28 Sep 2015 04:58:33 +0000 (14:58 +1000)]
Monsters: cleanup

9 years agoPort hagar
Mario [Mon, 28 Sep 2015 04:57:35 +0000 (14:57 +1000)]
Port hagar

9 years agoPort fireball
Mario [Mon, 28 Sep 2015 04:53:35 +0000 (14:53 +1000)]
Port fireball

9 years agoPort blaster
Mario [Mon, 28 Sep 2015 04:46:38 +0000 (14:46 +1000)]
Port blaster

9 years agoPort tuba
Mario [Mon, 28 Sep 2015 04:35:03 +0000 (14:35 +1000)]
Port tuba

9 years agoMonsters: upgrade zombie
TimePath [Mon, 28 Sep 2015 04:19:10 +0000 (14:19 +1000)]
Monsters: upgrade zombie

9 years agoMonsters: upgrade wyvern
TimePath [Mon, 28 Sep 2015 04:09:29 +0000 (14:09 +1000)]
Monsters: upgrade wyvern

9 years agoPort devastator
Mario [Mon, 28 Sep 2015 04:08:16 +0000 (14:08 +1000)]
Port devastator

9 years agoMonsters: upgrade spider
TimePath [Mon, 28 Sep 2015 04:06:45 +0000 (14:06 +1000)]
Monsters: upgrade spider

9 years agoMonsters: upgrade shambler
TimePath [Mon, 28 Sep 2015 04:00:45 +0000 (14:00 +1000)]
Monsters: upgrade shambler

9 years agoMonsters: upgrade mage
TimePath [Mon, 28 Sep 2015 03:56:22 +0000 (13:56 +1000)]
Monsters: upgrade mage

9 years agoPort vortex
Mario [Mon, 28 Sep 2015 03:51:28 +0000 (13:51 +1000)]
Port vortex

9 years agoMonsters: prepare for classification
TimePath [Mon, 28 Sep 2015 03:45:24 +0000 (13:45 +1000)]
Monsters: prepare for classification