]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
11 years agoStart renaming Shotgun to Shockwave and cleaning up code
Samual Lenks [Sun, 8 Sep 2013 23:28:02 +0000 (19:28 -0400)]
Start renaming Shotgun to Shockwave and cleaning up code

11 years agoMerge remote-tracking branch 'origin/master' into samual/weapons
Samual Lenks [Thu, 5 Sep 2013 18:19:01 +0000 (14:19 -0400)]
Merge remote-tracking branch 'origin/master' into samual/weapons

Conflicts:
qcsrc/client/hook.qc
qcsrc/common/constants.qh
qcsrc/common/weapons/w_electro.qc
qcsrc/common/weapons/w_fireball.qc
qcsrc/common/weapons/w_seeker.qc
qcsrc/common/weapons/w_shockwave.qc
qcsrc/common/weapons/weapons.qh
qcsrc/server/cl_weapons.qc
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/gamemode_nexball.qc
qcsrc/server/t_items.qc
qcsrc/server/tturrets/units/unit_walker.qc
qcsrc/server/w_crylink.qc
qcsrc/server/w_grenadelauncher.qc
qcsrc/server/w_hagar.qc
qcsrc/server/w_hlac.qc
qcsrc/server/w_hook.qc
qcsrc/server/w_laser.qc
qcsrc/server/w_minelayer.qc
qcsrc/server/w_minstanex.qc
qcsrc/server/w_nex.qc
qcsrc/server/w_rifle.qc
qcsrc/server/w_rocketlauncher.qc
qcsrc/server/w_uzi.qc
qcsrc/server/weapons/tracing.qc
qcsrc/server/weapons/weaponsystem.qc

11 years agoMerge remote-tracking branch 'origin/debugger/tdm_netscore'
Samual Lenks [Wed, 4 Sep 2013 23:39:03 +0000 (19:39 -0400)]
Merge remote-tracking branch 'origin/debugger/tdm_netscore'

# By Debugger
# Via Debugger
* origin/debugger/tdm_netscore:
  rename net into sum
  removing an autocvar I forgot; branch is ready to be merged
  removed matchend sound (wrong commit in here)
  disable 'net' by default
  wrong calculation fixed
  simplified, parallel to SP_FRAGS now
  small bugfix
  new default scoreboard for tdm
  removed unnecessary 'num1' declaration
  replaced the <tab>'s by <space>'s
  added a 'net' column to the tdm scoreboard (enabled by default)
  added a sound when the match ends

11 years agoMerge branch 'master' into debugger/tdm_netscore
Debugger [Wed, 4 Sep 2013 23:10:37 +0000 (01:10 +0200)]
Merge branch 'master' into debugger/tdm_netscore

11 years agorename net into sum
Debugger [Wed, 4 Sep 2013 23:10:26 +0000 (01:10 +0200)]
rename net into sum

11 years agoFix comboradius size for Electro primary
Samual Lenks [Wed, 4 Sep 2013 00:31:21 +0000 (20:31 -0400)]
Fix comboradius size for Electro primary

11 years agoFix velocity zoom during intermission
Samual Lenks [Wed, 4 Sep 2013 00:28:11 +0000 (20:28 -0400)]
Fix velocity zoom during intermission

11 years agoMerge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Fri, 30 Aug 2013 08:00:07 +0000 (10:00 +0200)]
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir

11 years agogmqcc has vector bit operations now. Switch to using them.
Rudolf Polzer [Fri, 30 Aug 2013 07:40:22 +0000 (09:40 +0200)]
gmqcc has vector bit operations now. Switch to using them.

This also gets rid of the ugly WEPSET macros.

New design limit of weapon count: 72 weapons (currently set to 24 to use
less bandwidth, though).

11 years agoSet sv_allow_fullbright to 1 (poll #44)
Samual Lenks [Thu, 29 Aug 2013 22:36:57 +0000 (18:36 -0400)]
Set sv_allow_fullbright to 1 (poll #44)

11 years agoMerge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Thu, 29 Aug 2013 11:51:26 +0000 (13:51 +0200)]
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir

11 years agoTemp compile fix. Real fix is in divVerent/get-rid-of-wepset
Rudolf Polzer [Thu, 29 Aug 2013 11:51:00 +0000 (13:51 +0200)]
Temp compile fix. Real fix is in divVerent/get-rid-of-wepset

11 years agoChange net_messagetimeout from 300 to 30 seconds (testing, can change back
Samual Lenks [Tue, 27 Aug 2013 21:11:21 +0000 (17:11 -0400)]
Change net_messagetimeout from 300 to 30 seconds (testing, can change back
if it breaks), reasoning: It is not possible to reconnect and resume old
client connections in Nexuiz or Xonotic, so when a client dies it merely
sits there for 300 seconds OR until it is kicked by admin or vote (which
is what happens the majority of the time now)

11 years agoFix compile
Samual Lenks [Mon, 26 Aug 2013 04:22:38 +0000 (00:22 -0400)]
Fix compile

11 years agoMerge remote-tracking branch 'origin/debugger/superspec_options'
Samual Lenks [Mon, 26 Aug 2013 03:14:12 +0000 (23:14 -0400)]
Merge remote-tracking branch 'origin/debugger/superspec_options'

11 years agoThose debug prints aren't necessary anymore
Samual Lenks [Sun, 25 Aug 2013 22:54:38 +0000 (18:54 -0400)]
Those debug prints aren't necessary anymore

11 years agoMerge remote-tracking branch 'origin/samual/lsmaps_update'
Samual Lenks [Sun, 25 Aug 2013 22:51:28 +0000 (18:51 -0400)]
Merge remote-tracking branch 'origin/samual/lsmaps_update'

11 years agoAdd comment for todo
Samual Lenks [Sun, 25 Aug 2013 22:44:24 +0000 (18:44 -0400)]
Add comment for todo

11 years agoAdd translations, add message about "new maps"
Samual Lenks [Sun, 25 Aug 2013 22:33:50 +0000 (18:33 -0400)]
Add translations, add message about "new maps"

11 years agoUpdate color selection
Samual Lenks [Sun, 25 Aug 2013 21:34:50 +0000 (17:34 -0400)]
Update color selection

11 years agoSplit maplist to its own getreply func, clean up
Samual Lenks [Sun, 25 Aug 2013 20:40:53 +0000 (16:40 -0400)]
Split maplist to its own getreply func, clean up

11 years agoWe can rely on using gametype command for lsmaps update trigger
Samual Lenks [Sun, 25 Aug 2013 19:01:38 +0000 (15:01 -0400)]
We can rely on using gametype command for lsmaps update trigger

11 years agoStart working on lsmaps reply: update lsmaps on endmatch (gametype change)
Samual Lenks [Sun, 25 Aug 2013 02:59:32 +0000 (22:59 -0400)]
Start working on lsmaps reply: update lsmaps on endmatch (gametype change)

11 years agoUpdate translation templates
Samual Lenks [Sun, 25 Aug 2013 02:00:30 +0000 (22:00 -0400)]
Update translation templates

11 years agoRemove more stupidity
Samual Lenks [Tue, 20 Aug 2013 21:03:21 +0000 (17:03 -0400)]
Remove more stupidity

11 years agoRemove some reloading system stupidity
Samual Lenks [Tue, 20 Aug 2013 18:25:26 +0000 (14:25 -0400)]
Remove some reloading system stupidity

11 years agoStart using new property system for reloading
Samual Lenks [Tue, 20 Aug 2013 18:14:32 +0000 (14:14 -0400)]
Start using new property system for reloading

11 years agoMerge remote-tracking branch 'origin/master' into samual/weapons
Samual Lenks [Tue, 20 Aug 2013 17:49:39 +0000 (13:49 -0400)]
Merge remote-tracking branch 'origin/master' into samual/weapons

Conflicts:
balanceXonotic.cfg
oldbalanceXPM.cfg
qcsrc/server/autocvars.qh
qcsrc/server/w_crylink.qc

11 years agoMerge remote-tracking branch 'origin/terencehill/HUD_config_string_fix'
Samual Lenks [Mon, 19 Aug 2013 21:15:03 +0000 (17:15 -0400)]
Merge remote-tracking branch 'origin/terencehill/HUD_config_string_fix'

11 years agoMerge remote-tracking branch 'origin/terencehill/mapvote_cursor_fix'
Samual Lenks [Mon, 19 Aug 2013 21:13:07 +0000 (17:13 -0400)]
Merge remote-tracking branch 'origin/terencehill/mapvote_cursor_fix'

11 years agoMerge remote-tracking branch 'origin/terencehill/menu_focus_bugfix'
Samual Lenks [Sun, 18 Aug 2013 23:40:40 +0000 (19:40 -0400)]
Merge remote-tracking branch 'origin/terencehill/menu_focus_bugfix'

* origin/terencehill/menu_focus_bugfix:
  Fix this bug: If you open up a dialog/menu in game, and then leave focus of the Xonotic window, when you click back onto the Xonotic window it ALWAYS unfocuses the active dialog.

11 years agoFIX DAMN WHITESPACE ERRORS IN CFGS
Rudolf Polzer [Fri, 16 Aug 2013 13:53:33 +0000 (15:53 +0200)]
FIX DAMN WHITESPACE ERRORS IN CFGS

11 years agocrylink: kill jointime
Rudolf Polzer [Fri, 16 Aug 2013 13:53:15 +0000 (15:53 +0200)]
crylink: kill jointime

11 years agoSwitch my physics to be default for testing purposes
Samual Lenks [Thu, 15 Aug 2013 19:21:12 +0000 (15:21 -0400)]
Switch my physics to be default for testing purposes

11 years agoChange stepheight from 34 to 31 in my config
Samual Lenks [Thu, 15 Aug 2013 19:17:03 +0000 (15:17 -0400)]
Change stepheight from 34 to 31 in my config

11 years agoStart working on a new system which calculates weapon values for external
Samual Lenks [Wed, 14 Aug 2013 17:52:06 +0000 (13:52 -0400)]
Start working on a new system which calculates weapon values for external
usage

11 years agoMerge remote-tracking branch 'origin/master' into samual/weapons
Samual Lenks [Wed, 14 Aug 2013 16:12:12 +0000 (12:12 -0400)]
Merge remote-tracking branch 'origin/master' into samual/weapons

Conflicts:
effectinfo.txt
qcsrc/server/w_hlac.qc
qcsrc/server/w_uzi.qc
qcsrc/server/weapons/weaponsystem.qc

11 years agoMerge remote-tracking branch 'origin/Mario/mutators'
Samual Lenks [Wed, 14 Aug 2013 01:50:19 +0000 (21:50 -0400)]
Merge remote-tracking branch 'origin/Mario/mutators'

11 years agoMerge branch 'master' into Mario/mutators
Mario [Wed, 14 Aug 2013 01:39:44 +0000 (11:39 +1000)]
Merge branch 'master' into Mario/mutators

11 years agoActually, rework that last commit a bit
Samual Lenks [Tue, 13 Aug 2013 21:58:05 +0000 (17:58 -0400)]
Actually, rework that last commit a bit

11 years agoDon't let eventchase put the view into the ceiling when you die
Samual Lenks [Tue, 13 Aug 2013 20:11:22 +0000 (16:11 -0400)]
Don't let eventchase put the view into the ceiling when you die

11 years agofollowkiller feature added properly, thanks for help tZork
Debugger [Tue, 13 Aug 2013 15:38:12 +0000 (17:38 +0200)]
followkiller feature added properly, thanks for help tZork

11 years agofollowkiller wont work for whatever reason
Debugger [Tue, 13 Aug 2013 14:20:34 +0000 (16:20 +0200)]
followkiller wont work for whatever reason

11 years agoMerge branch 'terencehill/superspec_fixes' into debugger/superspec_options
Debugger [Tue, 13 Aug 2013 13:58:19 +0000 (15:58 +0200)]
Merge branch 'terencehill/superspec_fixes' into debugger/superspec_options

11 years agoMerge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Fri, 9 Aug 2013 12:30:44 +0000 (14:30 +0200)]
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir

11 years agorandom screenshots: don't be so far above ground; also, request more view distance
Rudolf Polzer [Fri, 9 Aug 2013 12:29:51 +0000 (14:29 +0200)]
random screenshots: don't be so far above ground; also, request more view distance

11 years agoMerge remote-tracking branch 'origin/ablu/vehiclebalance'
Samual Lenks [Thu, 8 Aug 2013 23:24:54 +0000 (19:24 -0400)]
Merge remote-tracking branch 'origin/ablu/vehiclebalance'

11 years agoMerge remote-tracking branch 'origin/Mario/mutators'
Samual Lenks [Thu, 8 Aug 2013 21:58:07 +0000 (17:58 -0400)]
Merge remote-tracking branch 'origin/Mario/mutators'

11 years agoFix bots sliding around slowly while frozen
Mario [Thu, 8 Aug 2013 20:39:46 +0000 (06:39 +1000)]
Fix bots sliding around slowly while frozen

11 years agoRemove rifle arena
Mario [Thu, 8 Aug 2013 19:45:43 +0000 (05:45 +1000)]
Remove rifle arena

11 years agoMerge branch 'Mario/mutators' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir...
Mario [Thu, 8 Aug 2013 19:41:53 +0000 (05:41 +1000)]
Merge branch 'Mario/mutators' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir into Mario/mutators

11 years agoDodging while frozen requires only 1 key push
Mario [Thu, 8 Aug 2013 19:41:16 +0000 (05:41 +1000)]
Dodging while frozen requires only 1 key push

11 years agoMerge remote-tracking branch 'origin/master' into Mario/mutators
Samual Lenks [Thu, 8 Aug 2013 19:20:05 +0000 (15:20 -0400)]
Merge remote-tracking branch 'origin/master' into Mario/mutators

11 years agofix *-serverpackage.txt. Why did we add this anyway BTW? What was wrong with .serverp...
Rudolf Polzer [Mon, 5 Aug 2013 08:04:11 +0000 (10:04 +0200)]
fix *-serverpackage.txt. Why did we add this anyway BTW? What was wrong with .serverpackage?

11 years agoadd a debug command to test boxparticles() builtin
Rudolf Polzer [Sat, 3 Aug 2013 16:07:00 +0000 (18:07 +0200)]
add a debug command to test boxparticles() builtin

11 years agofix typo
Rudolf Polzer [Fri, 2 Aug 2013 10:31:58 +0000 (12:31 +0200)]
fix typo

11 years agomapinfo cdtrack: only take first token, for possible extension "cdtrack 17 moreargs..."
Rudolf Polzer [Fri, 2 Aug 2013 09:21:43 +0000 (11:21 +0200)]
mapinfo cdtrack: only take first token, for possible extension "cdtrack 17 moreargs..."

11 years agoadd a note about multi base track handling here
Rudolf Polzer [Fri, 2 Aug 2013 05:06:57 +0000 (07:06 +0200)]
add a note about multi base track handling here

11 years agoworkaround for trail issue
Rudolf Polzer [Sun, 28 Jul 2013 13:59:51 +0000 (15:59 +0200)]
workaround for trail issue

11 years agonew boxparticles interface
Rudolf Polzer [Sat, 27 Jul 2013 10:24:55 +0000 (12:24 +0200)]
new boxparticles interface

11 years agoFix this bug: If you open up a dialog/menu in game, and then leave focus of the Xonot...
terencehill [Sun, 21 Jul 2013 11:11:04 +0000 (13:11 +0200)]
Fix this bug: If you open up a dialog/menu in game, and then leave focus of the Xonotic window, when you click back onto the Xonotic window it ALWAYS unfocuses the active dialog.

11 years agocl_maxfps_alwayssleep: make saved, fixes #1674
Rudolf Polzer [Sat, 13 Jul 2013 09:01:18 +0000 (11:01 +0200)]
cl_maxfps_alwayssleep: make saved, fixes #1674

11 years agoAlso check if the attacker is a player
Mario [Fri, 12 Jul 2013 04:42:24 +0000 (14:42 +1000)]
Also check if the attacker is a player

11 years agoFix nade timer getting reset if it's shot while on the ground
Mario [Fri, 12 Jul 2013 04:07:21 +0000 (14:07 +1000)]
Fix nade timer getting reset if it's shot while on the ground

11 years agoMove footsteps & norecoil out of the mutator system
Mario [Fri, 12 Jul 2013 00:36:55 +0000 (10:36 +1000)]
Move footsteps & norecoil out of the mutator system

11 years agoMerge branch 'master' into Mario/mutators
Mario [Fri, 12 Jul 2013 00:04:10 +0000 (10:04 +1000)]
Merge branch 'master' into Mario/mutators

11 years agoMerge remote-tracking branch 'origin/master' into samual/weapons
Samual Lenks [Wed, 10 Jul 2013 06:28:33 +0000 (02:28 -0400)]
Merge remote-tracking branch 'origin/master' into samual/weapons

11 years agoenable cpp warnings
Rudolf Polzer [Mon, 8 Jul 2013 08:36:00 +0000 (10:36 +0200)]
enable cpp warnings

11 years agoforgot this script
Rudolf Polzer [Mon, 8 Jul 2013 08:00:26 +0000 (10:00 +0200)]
forgot this script

11 years agofix make clean
Rudolf Polzer [Mon, 8 Jul 2013 08:00:14 +0000 (10:00 +0200)]
fix make clean

11 years agoprecache csqc-used stuff on server too
Rudolf Polzer [Mon, 8 Jul 2013 07:47:42 +0000 (09:47 +0200)]
precache csqc-used stuff on server too

This fixes load savegame performance, and the loading progress bar.

11 years agoMove jump grunt out of the mutator system (causes some issues with cl_movement_track_...
Mario [Thu, 4 Jul 2013 20:08:38 +0000 (06:08 +1000)]
Move jump grunt out of the mutator system (causes some issues with cl_movement_track_canjump)

11 years agoClear weapon config queue when finished dumping settings
Samual Lenks [Tue, 2 Jul 2013 20:30:02 +0000 (16:30 -0400)]
Clear weapon config queue when finished dumping settings

11 years agoUse cvar() for WR_CONFIG so that unused cvars are detected properly
Samual Lenks [Tue, 2 Jul 2013 00:26:30 +0000 (20:26 -0400)]
Use cvar() for WR_CONFIG so that unused cvars are detected properly

11 years agoMake it compile now (ARGH I HATE OUR PROGS.SRC SET UP)
Samual Lenks [Mon, 1 Jul 2013 23:20:39 +0000 (19:20 -0400)]
Make it compile now (ARGH I HATE OUR PROGS.SRC SET UP)

11 years agoAdd header files for the newly split up code files
Samual Lenks [Mon, 1 Jul 2013 22:14:43 +0000 (18:14 -0400)]
Add header files for the newly split up code files

11 years agoRemove some more stupidity...
Samual Lenks [Mon, 1 Jul 2013 19:48:35 +0000 (15:48 -0400)]
Remove some more stupidity...

11 years agoMove some more things to selection.qc and out of weaponsystem.qc
Samual Lenks [Mon, 1 Jul 2013 19:45:35 +0000 (15:45 -0400)]
Move some more things to selection.qc and out of weaponsystem.qc

11 years agoMove seeker to the new cvar system
Mario [Mon, 1 Jul 2013 17:24:59 +0000 (03:24 +1000)]
Move seeker to the new cvar system

11 years agoMove hlac to the new cvar system
Mario [Mon, 1 Jul 2013 17:08:34 +0000 (03:08 +1000)]
Move hlac to the new cvar system

11 years agoMove tuba to the new cvar system
Mario [Mon, 1 Jul 2013 16:56:23 +0000 (02:56 +1000)]
Move tuba to the new cvar system

11 years agoBegin using cvar("") for WR_CONFIG and WR_INIT to avoid references
Samual Lenks [Mon, 1 Jul 2013 09:27:17 +0000 (05:27 -0400)]
Begin using cvar("") for WR_CONFIG and WR_INIT to avoid references

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