]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
11 years agoMove tracing methods into their own file
Samual Lenks [Mon, 1 Jul 2013 09:02:54 +0000 (05:02 -0400)]
Move tracing methods into their own file

11 years agoRename main.qc to weaponsystem.qc
Samual Lenks [Mon, 1 Jul 2013 08:43:53 +0000 (04:43 -0400)]
Rename main.qc to weaponsystem.qc

11 years agoMerge cl_weapons code into main
Samual Lenks [Mon, 1 Jul 2013 08:42:11 +0000 (04:42 -0400)]
Merge cl_weapons code into main

11 years agoMove weapon spawning into its own file
Samual Lenks [Mon, 1 Jul 2013 08:37:36 +0000 (04:37 -0400)]
Move weapon spawning into its own file

11 years agoSplit throwing and selection into their own files
Samual Lenks [Mon, 1 Jul 2013 06:53:14 +0000 (02:53 -0400)]
Split throwing and selection into their own files

11 years agoRemove W_TriggerReload... pointless function
Samual Lenks [Mon, 1 Jul 2013 06:14:37 +0000 (02:14 -0400)]
Remove W_TriggerReload... pointless function

11 years agoRemove the weapon_setup function, it's stupid
Samual Lenks [Mon, 1 Jul 2013 02:31:16 +0000 (22:31 -0400)]
Remove the weapon_setup function, it's stupid

11 years agoAdd debug info to config dumper
Samual Lenks [Mon, 1 Jul 2013 01:37:03 +0000 (21:37 -0400)]
Add debug info to config dumper

11 years agoEven more cleanup (sort of)
Samual Lenks [Mon, 1 Jul 2013 01:21:20 +0000 (21:21 -0400)]
Even more cleanup (sort of)

11 years agoClean up some more macros (sort of :D)
Samual Lenks [Mon, 1 Jul 2013 01:02:00 +0000 (21:02 -0400)]
Clean up some more macros (sort of :D)

11 years agoMore work on config
Samual Lenks [Mon, 1 Jul 2013 00:28:57 +0000 (20:28 -0400)]
More work on config

11 years agoWith my new macro powers, get rid of duplicate wep cvar declarations
Samual Lenks [Sun, 30 Jun 2013 23:06:55 +0000 (19:06 -0400)]
With my new macro powers, get rid of duplicate wep cvar declarations

11 years agoTHE POWER OF MACROS COMPELS YOU, THE POWER OF MACROS COMPELS YOU, ...
Samual Lenks [Sun, 30 Jun 2013 23:03:35 +0000 (19:03 -0400)]
THE POWER OF MACROS COMPELS YOU, THE POWER OF MACROS COMPELS YOU, ...

11 years agoAdd sorting support to the weapon config dumping function
Samual Lenks [Sun, 30 Jun 2013 21:41:23 +0000 (17:41 -0400)]
Add sorting support to the weapon config dumping function

11 years agoMove porto to the new cvar system
Mario [Sun, 30 Jun 2013 18:47:53 +0000 (04:47 +1000)]
Move porto to the new cvar system

11 years agoMove rifle to the new cvar system
Mario [Sun, 30 Jun 2013 11:27:33 +0000 (21:27 +1000)]
Move rifle to the new cvar system

11 years agoMove hook to the new cvar system
Mario [Sun, 30 Jun 2013 11:04:58 +0000 (21:04 +1000)]
Move hook to the new cvar system

11 years agoMove minelayer to the new cvar system
Mario [Sun, 30 Jun 2013 10:16:32 +0000 (20:16 +1000)]
Move minelayer to the new cvar system

11 years agoMove fireball to the new cvar system
Mario [Sun, 30 Jun 2013 10:03:14 +0000 (20:03 +1000)]
Move fireball to the new cvar system

11 years agoRename "shortname" to "netname", the field is called netname anyway
Samual Lenks [Sun, 30 Jun 2013 05:40:50 +0000 (01:40 -0400)]
Rename "shortname" to "netname", the field is called netname anyway

11 years agoAdd config support to Arc, Crylink, Hagar, Mortar, and Nex
Samual Lenks [Sun, 30 Jun 2013 05:18:48 +0000 (01:18 -0400)]
Add config support to Arc, Crylink, Hagar, Mortar, and Nex

11 years agoRename some things :D
Samual Lenks [Sun, 30 Jun 2013 04:19:15 +0000 (00:19 -0400)]
Rename some things :D

11 years agoRename WR_PRECACHE to WR_INIT, which is more appropriate
Samual Lenks [Sun, 30 Jun 2013 04:00:43 +0000 (00:00 -0400)]
Rename WR_PRECACHE to WR_INIT, which is more appropriate

11 years agoLets now make the weapon config dump system actually work
Samual Lenks [Sun, 30 Jun 2013 03:29:45 +0000 (23:29 -0400)]
Lets now make the weapon config dump system actually work

11 years agoActually we can do another macro there too :D
Samual Lenks [Sun, 30 Jun 2013 00:04:38 +0000 (20:04 -0400)]
Actually we can do another macro there too :D

11 years agoPut some more work into the config system
Samual Lenks [Sat, 29 Jun 2013 23:59:27 +0000 (19:59 -0400)]
Put some more work into the config system

11 years agoMerge branch 'samual/weapons' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3di...
Samual Lenks [Sat, 29 Jun 2013 21:40:10 +0000 (17:40 -0400)]
Merge branch 'samual/weapons' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir into samual/weapons

11 years agoStart working on weapon config generator
Samual Lenks [Sat, 29 Jun 2013 21:39:28 +0000 (17:39 -0400)]
Start working on weapon config generator

11 years agoMove hagar to the new cvar system
Mario [Sat, 29 Jun 2013 05:13:19 +0000 (15:13 +1000)]
Move hagar to the new cvar system

11 years agoMove uzi to the new cvar system
Mario [Sat, 29 Jun 2013 04:43:59 +0000 (14:43 +1000)]
Move uzi to the new cvar system

11 years agoRename weapon_action to WEP_ACTION
Samual Lenks [Sat, 29 Jun 2013 03:54:20 +0000 (23:54 -0400)]
Rename weapon_action to WEP_ACTION

11 years agoMove hitplot stuff into a separate file
Samual Lenks [Sat, 29 Jun 2013 03:32:26 +0000 (23:32 -0400)]
Move hitplot stuff into a separate file

11 years agoMacro macro macro macro macro macro
Samual Lenks [Sat, 29 Jun 2013 02:32:55 +0000 (22:32 -0400)]
Macro macro macro macro macro macro

11 years agoBeing macro-izing more things :D
Samual Lenks [Fri, 28 Jun 2013 22:22:28 +0000 (18:22 -0400)]
Being macro-izing more things :D

11 years agoMerge remote-tracking branch 'origin/master' into samual/weapons
Samual Lenks [Fri, 28 Jun 2013 22:05:26 +0000 (18:05 -0400)]
Merge remote-tracking branch 'origin/master' into samual/weapons

Conflicts:
qcsrc/server/t_items.qc

11 years agohide qccversion files
Rudolf Polzer [Sun, 23 Jun 2013 16:44:39 +0000 (18:44 +0200)]
hide qccversion files

11 years agooops, don't call --version that often
Rudolf Polzer [Sun, 23 Jun 2013 16:42:34 +0000 (18:42 +0200)]
oops, don't call --version that often

11 years agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Sun, 23 Jun 2013 16:41:33 +0000 (18:41 +0200)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

11 years agorebuild on new gmqcc version
Rudolf Polzer [Sun, 23 Jun 2013 16:41:19 +0000 (18:41 +0200)]
rebuild on new gmqcc version

11 years agotry fixing compile
Rudolf Polzer [Sun, 23 Jun 2013 16:22:56 +0000 (18:22 +0200)]
try fixing compile

11 years agoMerge branch 'divVerent/simplified-sound-sliders'
Rudolf Polzer [Sun, 23 Jun 2013 15:45:05 +0000 (17:45 +0200)]
Merge branch 'divVerent/simplified-sound-sliders'

11 years agofinally forbid mutator blocked guns
Rudolf Polzer [Sun, 23 Jun 2013 15:42:05 +0000 (17:42 +0200)]
finally forbid mutator blocked guns

11 years agoset value steps to 0.1 and 1; menu_snd_sliderstep now is 2 (0..10 scale)
Rudolf Polzer [Fri, 21 Jun 2013 17:56:32 +0000 (19:56 +0200)]
set value steps to 0.1 and 1; menu_snd_sliderstep now is 2 (0..10 scale)

11 years agoadd a second percent scale, 3 (slider size percent, having nothing to do with real...
Rudolf Polzer [Wed, 19 Jun 2013 11:53:24 +0000 (13:53 +0200)]
add a second percent scale, 3 (slider size percent, having nothing to do with real percent)

11 years agoMerge branch 'master' into matthiaskrgr/gitignore
Matthias Krüger [Sun, 16 Jun 2013 16:27:22 +0000 (18:27 +0200)]
Merge branch 'master' into matthiaskrgr/gitignore

11 years agoTry CTF respawn delay of 5 seconds
Samual Lenks [Sun, 16 Jun 2013 02:23:35 +0000 (22:23 -0400)]
Try CTF respawn delay of 5 seconds

11 years agoAdd WEAPONTODO comments for some stuff I need to take care of later
Samual Lenks [Sun, 16 Jun 2013 01:57:25 +0000 (21:57 -0400)]
Add WEAPONTODO comments for some stuff I need to take care of later

11 years agoMove crylink to the new cvar system
Mario [Sat, 15 Jun 2013 09:51:31 +0000 (19:51 +1000)]
Move crylink to the new cvar system

11 years agoMove nex to the new cvar system
Mario [Sat, 15 Jun 2013 08:54:41 +0000 (18:54 +1000)]
Move nex to the new cvar system

11 years agoDon't forget to add this to precache when moving weapons to new cvars
Samual Lenks [Sat, 15 Jun 2013 08:03:44 +0000 (04:03 -0400)]
Don't forget to add this to precache when moving weapons to new cvars

11 years agoPartly fix compile (BUT WAIT, THERE'S MORE! :D)
Samual Lenks [Sat, 15 Jun 2013 08:02:19 +0000 (04:02 -0400)]
Partly fix compile (BUT WAIT, THERE'S MORE! :D)

11 years agoWhy does this crash gmqcc?
Samual Lenks [Sat, 15 Jun 2013 07:12:22 +0000 (03:12 -0400)]
Why does this crash gmqcc?

11 years agoMerge remote-tracking branch 'origin/master' into samual/weapons
Samual Lenks [Sat, 15 Jun 2013 06:35:28 +0000 (02:35 -0400)]
Merge remote-tracking branch 'origin/master' into samual/weapons

11 years agoMerge remote-tracking branch 'origin/ablu/bumblebeefix'
Samual Lenks [Sat, 15 Jun 2013 06:18:08 +0000 (02:18 -0400)]
Merge remote-tracking branch 'origin/ablu/bumblebeefix'

11 years agoMerge remote-tracking branch 'origin/ablu/vehiclestrengthfix'
Samual Lenks [Sat, 15 Jun 2013 06:14:14 +0000 (02:14 -0400)]
Merge remote-tracking branch 'origin/ablu/vehiclestrengthfix'

11 years agoMerge remote-tracking branch 'origin/master' into divVerent/simplified-sound-sliders
Samual Lenks [Sat, 15 Jun 2013 06:13:40 +0000 (02:13 -0400)]
Merge remote-tracking branch 'origin/master' into divVerent/simplified-sound-sliders

11 years agoFixed infinite strength in vehicle
Erik Schilling [Fri, 14 Jun 2013 18:51:14 +0000 (20:51 +0200)]
Fixed infinite strength in vehicle

Fixes: #1322.
11 years agoRemoved commented out code
Erik Schilling [Fri, 14 Jun 2013 18:12:05 +0000 (20:12 +0200)]
Removed commented out code

If somebody needs it is is in git history anyway.

11 years agoDo not leave a heal beam if pilot exits the bumblebee
Erik Schilling [Fri, 14 Jun 2013 18:11:44 +0000 (20:11 +0200)]
Do not leave a heal beam if pilot exits the bumblebee

11 years agoCompromise: Try decreasing Nex raise switchdelay
Samual Lenks [Fri, 14 Jun 2013 01:13:18 +0000 (21:13 -0400)]
Compromise: Try decreasing Nex raise switchdelay

11 years agoMerge remote-tracking branch 'origin/master' into samual/weapons
Samual Lenks [Fri, 14 Jun 2013 00:43:43 +0000 (20:43 -0400)]
Merge remote-tracking branch 'origin/master' into samual/weapons

11 years agoHaha, forgot to add this previously
Samual Lenks [Fri, 14 Jun 2013 00:43:02 +0000 (20:43 -0400)]
Haha, forgot to add this previously

11 years agoMerge branch 'master' into matthiaskrgr/gitignore
Matthias Krüger [Thu, 13 Jun 2013 20:45:14 +0000 (22:45 +0200)]
Merge branch 'master' into matthiaskrgr/gitignore

11 years agoadd unit test for decibels slider
Rudolf Polzer [Wed, 12 Jun 2013 11:54:14 +0000 (13:54 +0200)]
add unit test for decibels slider

11 years agoMerge branch 'master' into divVerent/simplified-sound-sliders
Rudolf Polzer [Wed, 12 Jun 2013 11:53:50 +0000 (13:53 +0200)]
Merge branch 'master' into divVerent/simplified-sound-sliders

11 years agoadd a simple (yet unused) unit test framework.
Rudolf Polzer [Wed, 12 Jun 2013 11:52:57 +0000 (13:52 +0200)]
add a simple (yet unused) unit test framework.

Functions starting with _TEST_ are unit tests, shall call TEST_OK() at the end, and TEST_Check(condition) to test conditions.

11 years agodecibel sliders: far left means zero (linear scaled part); menu_snd_sliderscale chang...
Rudolf Polzer [Wed, 12 Jun 2013 09:53:52 +0000 (11:53 +0200)]
decibel sliders: far left means zero (linear scaled part); menu_snd_sliderscale changes display of volume values

11 years agoWorking on cleaning up weapon spawn functions
Samual Lenks [Tue, 11 Jun 2013 20:14:04 +0000 (16:14 -0400)]
Working on cleaning up weapon spawn functions

11 years agoSpawnfunc stuffz
Samual Lenks [Tue, 11 Jun 2013 18:27:23 +0000 (14:27 -0400)]
Spawnfunc stuffz

11 years agoMerge remote-tracking branch 'origin/master' into samual/weapons
Samual Lenks [Tue, 11 Jun 2013 07:51:42 +0000 (03:51 -0400)]
Merge remote-tracking branch 'origin/master' into samual/weapons

Conflicts:
qcsrc/server/attic/monsters/monster_zombie.qc

11 years agoReplace if statements with switches in the weapon request functions
Mario [Tue, 11 Jun 2013 07:46:34 +0000 (17:46 +1000)]
Replace if statements with switches in the weapon request functions

11 years agoDelete the "attic" folder-- we have git history for a reason, no need for
Samual Lenks [Tue, 11 Jun 2013 07:12:55 +0000 (03:12 -0400)]
Delete the "attic" folder-- we have git history for a reason, no need for
this folder to remain in master

11 years agoNow make the Devastator compile and run (mostly)
Samual Lenks [Tue, 11 Jun 2013 06:27:15 +0000 (02:27 -0400)]
Now make the Devastator compile and run (mostly)

11 years agoContinue working on moving Rocketlauncher to Devastator name
Samual Lenks [Tue, 11 Jun 2013 05:00:28 +0000 (01:00 -0400)]
Continue working on moving Rocketlauncher to Devastator name

11 years agoSwitch the code ENTIRELY to use "Arc" instead of "Lightning" for the name
Samual Lenks [Tue, 11 Jun 2013 03:03:28 +0000 (23:03 -0400)]
Switch the code ENTIRELY to use "Arc" instead of "Lightning" for the name

11 years agoNow lets move the switchdelay property over to use new property system
Samual Lenks [Tue, 11 Jun 2013 02:33:59 +0000 (22:33 -0400)]
Now lets move the switchdelay property over to use new property system

11 years agoStart working on a new (independent) way to handle cvars for weapons
Samual Lenks [Tue, 11 Jun 2013 02:02:35 +0000 (22:02 -0400)]
Start working on a new (independent) way to handle cvars for weapons

11 years agoRemove individual weapon.qh files, make it compile
Samual Lenks [Tue, 11 Jun 2013 00:18:21 +0000 (20:18 -0400)]
Remove individual weapon.qh files, make it compile

11 years agoOn second thought, add those prefixes back, it helps a bit
Samual Lenks [Tue, 11 Jun 2013 00:04:06 +0000 (20:04 -0400)]
On second thought, add those prefixes back, it helps a bit

11 years agoMore cleanup...
Samual Lenks [Mon, 10 Jun 2013 23:57:20 +0000 (19:57 -0400)]
More cleanup...

11 years agoMore cleanup, make it compile now
Samual Lenks [Mon, 10 Jun 2013 23:22:05 +0000 (19:22 -0400)]
More cleanup, make it compile now

11 years agoBeing renaming weapons
Samual Lenks [Mon, 10 Jun 2013 21:53:20 +0000 (17:53 -0400)]
Being renaming weapons

11 years agoRemove the w_ prefix from weapon files in their directory
Samual Lenks [Mon, 10 Jun 2013 21:44:59 +0000 (17:44 -0400)]
Remove the w_ prefix from weapon files in their directory

11 years agoEven more proper naming/cleanup
Samual Lenks [Mon, 10 Jun 2013 18:40:46 +0000 (14:40 -0400)]
Even more proper naming/cleanup

11 years agoMove projectile handling to new folder as well
Samual Lenks [Mon, 10 Jun 2013 18:35:28 +0000 (14:35 -0400)]
Move projectile handling to new folder as well

11 years agoWorking on moving the weapon files to proper directories (plus cleanup)
Samual Lenks [Mon, 10 Jun 2013 05:33:06 +0000 (01:33 -0400)]
Working on moving the weapon files to proper directories (plus cleanup)

11 years agoFix the registration of LG
Samual Lenks [Mon, 10 Jun 2013 03:56:52 +0000 (23:56 -0400)]
Fix the registration of LG

11 years agoMake it compile
Samual Lenks [Mon, 10 Jun 2013 03:01:50 +0000 (23:01 -0400)]
Make it compile

11 years agodeprecate the other balance configs so I can do development more quickly
Samual Lenks [Mon, 10 Jun 2013 02:00:33 +0000 (22:00 -0400)]
deprecate the other balance configs so I can do development more quickly

11 years agoMerge remote-tracking branch 'origin/samual/spawn_weapons' into samual/weapons
Samual Lenks [Mon, 10 Jun 2013 01:56:24 +0000 (21:56 -0400)]
Merge remote-tracking branch 'origin/samual/spawn_weapons' into samual/weapons

Conflicts:
balanceXPM.cfg
balanceXonotic.cfg
qcsrc/client/Defs.qc
qcsrc/client/Main.qc
qcsrc/client/hook.qc
qcsrc/common/constants.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/progs.src

11 years agoMerge remote-tracking branch 'origin/samual/lightning_gun' into samual/weapons
Samual Lenks [Mon, 10 Jun 2013 01:46:57 +0000 (21:46 -0400)]
Merge remote-tracking branch 'origin/samual/lightning_gun' into samual/weapons

11 years agoMerge remote-tracking branch 'origin/master' into samual/lightning_gun
Samual Lenks [Mon, 10 Jun 2013 01:24:23 +0000 (21:24 -0400)]
Merge remote-tracking branch 'origin/master' into samual/lightning_gun

Conflicts:
balanceLeeStricklin.cfg
balanceXonotic.cfg
qcsrc/client/hook.qc
qcsrc/client/hud.qc
qcsrc/common/constants.qh
qcsrc/server/autocvars.qh

11 years agoMerge remote-tracking branch 'origin/samual/gameplay'
Samual Lenks [Mon, 10 Jun 2013 01:11:09 +0000 (21:11 -0400)]
Merge remote-tracking branch 'origin/samual/gameplay'

11 years agoMake XPM match default weapons too
Samual Lenks [Mon, 10 Jun 2013 01:09:40 +0000 (21:09 -0400)]
Make XPM match default weapons too

11 years agoRemove whitespace
Samual Lenks [Mon, 10 Jun 2013 01:06:24 +0000 (21:06 -0400)]
Remove whitespace

11 years agoFix crash
Samual Lenks [Mon, 10 Jun 2013 00:37:58 +0000 (20:37 -0400)]
Fix crash

11 years agoMerge remote-tracking branch 'origin/master' into samual/spawn_weapons
Samual Lenks [Mon, 10 Jun 2013 00:32:18 +0000 (20:32 -0400)]
Merge remote-tracking branch 'origin/master' into samual/spawn_weapons

Conflicts:
balance25.cfg
balanceFruitieX.cfg
balanceXPM.cfg
balanceXonotic.cfg
effectinfo.txt
qcsrc/common/constants.qh
qcsrc/common/util.qc
qcsrc/common/util.qh
qcsrc/server/cheats.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_weaponsystem.qc
qcsrc/server/g_damage.qc
qcsrc/server/tturrets/units/unit_walker.qc
qcsrc/server/vehicles/raptor.qc
qcsrc/server/vehicles/spiderbot.qc
qcsrc/server/vehicles/vehicles.qc
qcsrc/server/w_crylink.qc
qcsrc/server/w_electro.qc
qcsrc/server/w_hagar.qc
qcsrc/server/w_laser.qc
qcsrc/server/w_seeker.qc
qcsrc/server/w_shotgun.qc

11 years agoMerge branch 'master' into matthiaskrgr/gitignore
Matthias Krüger [Sun, 9 Jun 2013 07:22:21 +0000 (09:22 +0200)]
Merge branch 'master' into matthiaskrgr/gitignore

11 years agoRevert part of the laser force increase back to normal
Samual Lenks [Thu, 6 Jun 2013 03:59:27 +0000 (23:59 -0400)]
Revert part of the laser force increase back to normal

11 years agoSome updates from a bit of playtesting
Samual Lenks [Thu, 6 Jun 2013 00:36:04 +0000 (20:36 -0400)]
Some updates from a bit of playtesting