]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
11 years agoAdd a command to convert -nosRGB to -sRGB skyboxes equivalently.
Rudolf Polzer [Tue, 24 Sep 2013 08:22:28 +0000 (10:22 +0200)]
Add a command to convert -nosRGB to -sRGB skyboxes equivalently.

11 years agoRPN: more accuracy; add sRGB conversion macros.
Rudolf Polzer [Tue, 24 Sep 2013 07:59:36 +0000 (09:59 +0200)]
RPN: more accuracy; add sRGB conversion macros.

Usage:

rpn 0.1 $rpn_sRGB_to_linear

11 years ago11 more rpn functions. Enjoy!
Rudolf Polzer [Tue, 24 Sep 2013 07:50:13 +0000 (09:50 +0200)]
11 more rpn functions. Enjoy!

11 years agoMerge remote-tracking branch 'origin/divVerent/noautomaplist'
Rudolf Polzer [Mon, 23 Sep 2013 15:23:25 +0000 (17:23 +0200)]
Merge remote-tracking branch 'origin/divVerent/noautomaplist'

Conflicts:
qcsrc/common/mapinfo.qh

11 years agoGet rid of welcome_message_time cvar. Only annoying to track down.
Rudolf Polzer [Mon, 23 Sep 2013 10:11:44 +0000 (12:11 +0200)]
Get rid of welcome_message_time cvar. Only annoying to track down.

This made the MOTD useless. Users can always use the i key to hide the
MOTD, so this shouldn't be a big issue.

11 years agofix compile
Rudolf Polzer [Wed, 18 Sep 2013 09:43:11 +0000 (11:43 +0200)]
fix compile

11 years agodefaultmodel selection: if the player's selected model is in the list, always use...
Rudolf Polzer [Wed, 18 Sep 2013 08:14:52 +0000 (10:14 +0200)]
defaultmodel selection: if the player's selected model is in the list, always use that (no randomization then)

11 years agoUpdate item location when moved.
Rudolf Polzer [Mon, 16 Sep 2013 15:37:23 +0000 (17:37 +0200)]
Update item location when moved.

11 years agoFix water damage (ignore armor when drowning).
Rudolf Polzer [Mon, 16 Sep 2013 15:15:01 +0000 (17:15 +0200)]
Fix water damage (ignore armor when drowning).

11 years agoFix gravity check in menu
Rudolf Polzer [Mon, 16 Sep 2013 04:44:10 +0000 (06:44 +0200)]
Fix gravity check in menu

11 years agoRocketlauncher: dec damage 12%, inc refire, dec guiderate, inc switchdelay
Samual Lenks [Sun, 15 Sep 2013 16:36:33 +0000 (12:36 -0400)]
Rocketlauncher: dec damage 12%, inc refire, dec guiderate, inc switchdelay

11 years agoMerge remote-tracking branch 'origin/samual/menu_requires_connection'
Samual Lenks [Sun, 15 Sep 2013 02:38:46 +0000 (22:38 -0400)]
Merge remote-tracking branch 'origin/samual/menu_requires_connection'

* origin/samual/menu_requires_connection:
  Add requiresConnection flag to HUD panel dialogs and sandbox dialog
  Implement a "requiresConnect" attribute for menu dialogs

11 years agoAdd requiresConnection flag to HUD panel dialogs and sandbox dialog
Samual Lenks [Sun, 15 Sep 2013 02:33:08 +0000 (22:33 -0400)]
Add requiresConnection flag to HUD panel dialogs and sandbox dialog

11 years agoImplement a "requiresConnect" attribute for menu dialogs
Samual Lenks [Sun, 15 Sep 2013 01:18:45 +0000 (21:18 -0400)]
Implement a "requiresConnect" attribute for menu dialogs

11 years agoMerge remote-tracking branch 'origin/debugger/dualscreenresolution'
Samual Lenks [Sat, 14 Sep 2013 20:12:55 +0000 (16:12 -0400)]
Merge remote-tracking branch 'origin/debugger/dualscreenresolution'

# By Debugger (1) and Samual Lenks (1)
* origin/debugger/dualscreenresolution:
  Minor fix
  adding the possbility to use dualscreenresolution

11 years agoMinor fix
Samual Lenks [Sat, 14 Sep 2013 20:06:29 +0000 (16:06 -0400)]
Minor fix

11 years agoMerge remote-tracking branch 'origin/Mario/yet_another_vehicle_crashfix'
Samual Lenks [Sat, 14 Sep 2013 19:50:39 +0000 (15:50 -0400)]
Merge remote-tracking branch 'origin/Mario/yet_another_vehicle_crashfix'

# By Mario
# Via Mario
* origin/Mario/yet_another_vehicle_crashfix:
  Eject the player from their vehicle before killing them (fixes a crash when shuffling teams)

11 years agoMerge remote-tracking branch 'origin/samual/team_macros'
Samual Lenks [Sat, 14 Sep 2013 04:03:40 +0000 (00:03 -0400)]
Merge remote-tracking branch 'origin/samual/team_macros'

* origin/samual/team_macros:
  Make some nice macros for team comparisons

11 years agoMake some nice macros for team comparisons
Samual Lenks [Sat, 14 Sep 2013 00:25:52 +0000 (20:25 -0400)]
Make some nice macros for team comparisons

11 years agotransifex import
Rudolf Polzer [Fri, 13 Sep 2013 19:29:47 +0000 (21:29 +0200)]
transifex import

11 years agoIncrease requirements for screenshots: doesn't reach caulk by an axial
Rudolf Polzer [Fri, 13 Sep 2013 10:23:38 +0000 (12:23 +0200)]
Increase requirements for screenshots: doesn't reach caulk by an axial
direction, and must see an item/spawnpoint.

11 years agoNicer merging.
Rudolf Polzer [Fri, 13 Sep 2013 09:22:42 +0000 (11:22 +0200)]
Nicer merging.

11 years agoImport from transifex.
Rudolf Polzer [Fri, 13 Sep 2013 09:00:44 +0000 (11:00 +0200)]
Import from transifex.

11 years agoIntegrate with Transifex.
Rudolf Polzer [Fri, 13 Sep 2013 08:54:14 +0000 (10:54 +0200)]
Integrate with Transifex.

sh tx.sh - 3-way merge with changes on Transifex.

11 years agoadding the possbility to use dualscreenresolution
Debugger [Thu, 12 Sep 2013 20:32:53 +0000 (22:32 +0200)]
adding the possbility to use dualscreenresolution

11 years agoalso check for errors
Rudolf Polzer [Thu, 12 Sep 2013 18:41:23 +0000 (20:41 +0200)]
also check for errors

11 years agoMerge remote-tracking branch 'origin/samual/notification_updates'
Samual Lenks [Thu, 12 Sep 2013 18:25:03 +0000 (14:25 -0400)]
Merge remote-tracking branch 'origin/samual/notification_updates'

* origin/samual/notification_updates: (37 commits)
  Update common.pot
  Fix some other things
  Remove NOTIFICATIONS_DEBUG flag from compile
  Remove FRAG_VERBOSE here
  Update debug prints for initialization
  Comment out the MSG_CHOICE debug on init
  Fix restartnotifs command
  Update config, fix some other things
  Update announcer countdown system with different types, update debugprint
  Remove some of that useless code kids are always talking about
  Clean up checkargs a little bit
  Update edit date
  Remove old cvars from Dump_Notifications
  Fix problems with sprintf argument limits
  Probably better to comment team check out for now
  Move flag capture verbosity to MSG_CHOICE, plus fix some various things
  Move flag pickup verbose to MSG_CHOICE
  Small cleanup
  Update the notification format specifications
  Reorganize notification values
  ...

11 years agoUpdate common.pot
Samual Lenks [Thu, 12 Sep 2013 16:36:19 +0000 (12:36 -0400)]
Update common.pot

11 years agoMerge remote-tracking branch 'origin/master' into samual/notification_updates
Samual Lenks [Thu, 12 Sep 2013 16:29:37 +0000 (12:29 -0400)]
Merge remote-tracking branch 'origin/master' into samual/notification_updates

Conflicts:
qcsrc/client/announcer.qc
qcsrc/common/notifications.qh
qcsrc/server/g_damage.qc
qcsrc/server/mutators/gamemode_ctf.qc

11 years agoMerged; de: fix conflicts and untranslated, fuzzy left
Rudolf Polzer [Thu, 12 Sep 2013 07:36:23 +0000 (09:36 +0200)]
Merged; de: fix conflicts and untranslated, fuzzy left

11 years agoMerge remote-tracking branch 'origin/divVerent/merged-translations'
Rudolf Polzer [Thu, 12 Sep 2013 07:35:20 +0000 (09:35 +0200)]
Merge remote-tracking branch 'origin/divVerent/merged-translations'

11 years agoUpdate translations from Pootle
Samual Lenks [Wed, 11 Sep 2013 02:05:38 +0000 (22:05 -0400)]
Update translations from Pootle

11 years agoUpdate templates
Samual Lenks [Wed, 11 Sep 2013 01:26:13 +0000 (21:26 -0400)]
Update templates

11 years agoEject the player from their vehicle before killing them (fixes a crash when shuffling...
Mario [Tue, 10 Sep 2013 06:04:26 +0000 (16:04 +1000)]
Eject the player from their vehicle before killing them (fixes a crash when shuffling teams)

11 years agosys_ticrate now locked to default
Rudolf Polzer [Sun, 8 Sep 2013 16:46:31 +0000 (18:46 +0200)]
sys_ticrate now locked to default

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 agoMerge remote-tracking branch 'origin/master' into samual/notification_updates
Samual Lenks [Mon, 26 Aug 2013 03:09:19 +0000 (23:09 -0400)]
Merge remote-tracking branch 'origin/master' into samual/notification_updates

11 years agoFix some other things
Samual Lenks [Mon, 26 Aug 2013 03:08:33 +0000 (23:08 -0400)]
Fix some other things

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 NOTIFICATIONS_DEBUG flag from compile
Samual Lenks [Sun, 25 Aug 2013 00:13:29 +0000 (20:13 -0400)]
Remove NOTIFICATIONS_DEBUG flag from compile

11 years agoRemove FRAG_VERBOSE here
Samual Lenks [Sat, 24 Aug 2013 23:56:03 +0000 (19:56 -0400)]
Remove FRAG_VERBOSE here

11 years agoUpdate debug prints for initialization
Samual Lenks [Sat, 24 Aug 2013 23:52:26 +0000 (19:52 -0400)]
Update debug prints for initialization

11 years agoComment out the MSG_CHOICE debug on init
Samual Lenks [Sat, 24 Aug 2013 23:40:24 +0000 (19:40 -0400)]
Comment out the MSG_CHOICE debug on init

11 years agoFix restartnotifs command
Samual Lenks [Sat, 24 Aug 2013 23:38:07 +0000 (19:38 -0400)]
Fix restartnotifs command

11 years agoUpdate config, fix some other things
Samual Lenks [Sat, 24 Aug 2013 23:34:59 +0000 (19:34 -0400)]
Update config, fix some other things

11 years agoUpdate announcer countdown system with different types, update debugprint
Samual Lenks [Sat, 24 Aug 2013 22:48:45 +0000 (18:48 -0400)]
Update announcer countdown system with different types, update debugprint

11 years agoRemove some of that useless code kids are always talking about
Samual Lenks [Sat, 24 Aug 2013 21:42:14 +0000 (17:42 -0400)]
Remove some of that useless code kids are always talking about

11 years agoClean up checkargs a little bit
Samual Lenks [Sat, 24 Aug 2013 20:12:54 +0000 (16:12 -0400)]
Clean up checkargs a little bit

11 years agoUpdate edit date
Samual Lenks [Fri, 23 Aug 2013 23:49:55 +0000 (19:49 -0400)]
Update edit date

11 years agoRemove old cvars from Dump_Notifications
Samual Lenks [Fri, 23 Aug 2013 23:43:54 +0000 (19:43 -0400)]
Remove old cvars from Dump_Notifications

11 years agoFix problems with sprintf argument limits
Samual Lenks [Fri, 23 Aug 2013 23:42:15 +0000 (19:42 -0400)]
Fix problems with sprintf argument limits

11 years agoProbably better to comment team check out for now
Samual Lenks [Fri, 23 Aug 2013 23:26:07 +0000 (19:26 -0400)]
Probably better to comment team check out for now

11 years agoMove flag capture verbosity to MSG_CHOICE, plus fix some various things
Samual Lenks [Fri, 23 Aug 2013 23:24:56 +0000 (19:24 -0400)]
Move flag capture verbosity to MSG_CHOICE, plus fix some various things

11 years agoMove flag pickup verbose to MSG_CHOICE
Samual Lenks [Fri, 23 Aug 2013 22:12:32 +0000 (18:12 -0400)]
Move flag pickup verbose to MSG_CHOICE

11 years agoSmall cleanup
Samual Lenks [Fri, 23 Aug 2013 19:59:20 +0000 (15:59 -0400)]
Small cleanup

11 years agoUpdate the notification format specifications
Samual Lenks [Fri, 23 Aug 2013 19:44:11 +0000 (15:44 -0400)]
Update the notification format specifications

11 years agoReorganize notification values
Samual Lenks [Fri, 23 Aug 2013 19:33:40 +0000 (15:33 -0400)]
Reorganize notification values

11 years agoRemove old frag_verbose cvars
Samual Lenks [Fri, 23 Aug 2013 18:06:50 +0000 (14:06 -0400)]
Remove old frag_verbose cvars

11 years agoAdd broadcastname debug function
Samual Lenks [Thu, 22 Aug 2013 01:18:03 +0000 (21:18 -0400)]
Add broadcastname debug function

11 years agoUpdate config
Samual Lenks [Thu, 22 Aug 2013 01:06:41 +0000 (21:06 -0400)]
Update config

11 years agoFix support for default allowed choice selection, fix notifications limits
Samual Lenks [Thu, 22 Aug 2013 00:58:56 +0000 (20:58 -0400)]
Fix support for default allowed choice selection, fix notifications limits

11 years agoI'm a goddamn genius, IT WORKS!
Samual Lenks [Thu, 22 Aug 2013 00:35:10 +0000 (20:35 -0400)]
I'm a goddamn genius, IT WORKS!

11 years agoProper handling of string/float counts for MSG_CHOICE
Samual Lenks [Wed, 21 Aug 2013 23:25:59 +0000 (19:25 -0400)]
Proper handling of string/float counts for MSG_CHOICE

11 years agoNow add some cvar handling and move frag messages to MSG_CHOICE system
Samual Lenks [Wed, 21 Aug 2013 23:23:26 +0000 (19:23 -0400)]
Now add some cvar handling and move frag messages to MSG_CHOICE system

11 years agoAlright, now initialization should work for MSG_CHOICE
Samual Lenks [Wed, 21 Aug 2013 22:09:52 +0000 (18:09 -0400)]
Alright, now initialization should work for MSG_CHOICE

11 years agoMost of the framework should now properly support MSG_CHOICE
Samual Lenks [Wed, 21 Aug 2013 18:55:25 +0000 (14:55 -0400)]
Most of the framework should now properly support MSG_CHOICE

11 years agoWork on server networking code for choices
Samual Lenks [Wed, 21 Aug 2013 00:13:25 +0000 (20:13 -0400)]
Work on server networking code for choices

11 years agoAdd to Dump_Notifications
Samual Lenks [Tue, 20 Aug 2013 23:01:06 +0000 (19:01 -0400)]
Add to Dump_Notifications

11 years agoMostly integrate MSG_CHOICE into initialization function
Samual Lenks [Tue, 20 Aug 2013 22:57:05 +0000 (18:57 -0400)]
Mostly integrate MSG_CHOICE into initialization function

11 years agoNow add support for MULTITEAM_ANNCE
Samual Lenks [Tue, 20 Aug 2013 22:23:45 +0000 (18:23 -0400)]
Now add support for MULTITEAM_ANNCE

11 years agoAdd multiteam support to MSG_MULTI and MSG_CHOICE
Samual Lenks [Tue, 20 Aug 2013 22:16:24 +0000 (18:16 -0400)]
Add multiteam support to MSG_MULTI and MSG_CHOICE

11 years agoStart adding MSG_CHOICE, which better handles user choices
Samual Lenks [Tue, 20 Aug 2013 22:05:47 +0000 (18:05 -0400)]
Start adding MSG_CHOICE, which better handles user choices

11 years agoAdd newline automatically
Samual Lenks [Tue, 20 Aug 2013 21:46:10 +0000 (17:46 -0400)]
Add newline automatically

11 years agoStart removing newlines from notification declarations
Samual Lenks [Tue, 20 Aug 2013 21:39:50 +0000 (17:39 -0400)]
Start removing newlines from notification declarations

11 years agofix warnings
Rudolf Polzer [Tue, 20 Aug 2013 11:23:44 +0000 (13:23 +0200)]
fix warnings

11 years agomapinfo: new flag "noautomaplist" for e.g. space-slap
Rudolf Polzer [Tue, 20 Aug 2013 09:21:35 +0000 (11:21 +0200)]
mapinfo: new flag "noautomaplist" for e.g. space-slap

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