]>
de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
Samual Lenks [Sun, 9 Mar 2014 01:12:14 +0000 (20:12 -0500)]
Merge remote-tracking branch 'origin/master' into samual/combined_updates
Rudolf Polzer [Sat, 1 Mar 2014 11:39:26 +0000 (12:39 +0100)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Sat, 1 Mar 2014 11:32:37 +0000 (12:32 +0100)]
For convenience, provide bezier curve functions globally.
Samual Lenks [Wed, 26 Feb 2014 21:29:11 +0000 (16:29 -0500)]
Merge remote-tracking branch 'origin/master' into samual/combined_updates
Samual Lenks [Wed, 26 Feb 2014 20:46:01 +0000 (15:46 -0500)]
Merge remote-tracking branch 'origin/Mario/train_fix'
# By Mario
# Via Mario
* origin/Mario/train_fix:
Set view_ofs after initializing the brush, so mins is the correct value
Samual Lenks [Wed, 26 Feb 2014 20:42:56 +0000 (15:42 -0500)]
Merge remote-tracking branch 'origin/terencehill/hud_code_cleanup'
Samual Lenks [Wed, 26 Feb 2014 20:38:55 +0000 (15:38 -0500)]
Merge remote-tracking branch 'origin/Mario/teams_override'
# By Mario
# Via Mario
* origin/Mario/teams_override:
Remove keepaway team cvars from config
Samual Lenks [Wed, 26 Feb 2014 20:34:31 +0000 (15:34 -0500)]
Merge remote-tracking branch 'origin/Mario/nade_drop'
# By Mario
# Via Mario
* origin/Mario/nade_drop:
Remove an old comment
Limit max angle so player can look backwards & throw nade
Drop nade if the player is looking down when they toss, rather than crouching
Samual Lenks [Wed, 26 Feb 2014 20:33:35 +0000 (15:33 -0500)]
Merge remote-tracking branch 'origin/Mario/spawnsystem_mutator'
# By Mario
# Via Mario
* origin/Mario/spawnsystem_mutator:
Fix compile error
Merge spawnsystem into the existing mutator
Move overkill's spawn system into a separate mutator
Samual Lenks [Wed, 26 Feb 2014 20:30:28 +0000 (15:30 -0500)]
Merge remote-tracking branch 'origin/sev/waypointarrow'
# By Severin Meyer
# Via Severin Meyer
* origin/sev/waypointarrow:
Change waypoint arrow to a clean triangle shape. Prevent shadow from overshooting the origin and getting cut off at screen edge
Samual Lenks [Wed, 26 Feb 2014 20:28:44 +0000 (15:28 -0500)]
Merge remote-tracking branch 'origin/terencehill/hud_fixes'
# By terencehill
# Via terencehill
* origin/terencehill/hud_fixes:
HUD config: release mouse buttons and reset modifier keys on menu open
HUD config: when a menu dialog is opened don't block mousepos read as it leads to cursor jumps in the interaction with the menu
Weapons panel in onlyowned mode: enlarge weapon_size to match desired aspect ratio (hud_panel_weapons_aspect) in order to capitalize on panel space
Samual Lenks [Wed, 26 Feb 2014 20:27:08 +0000 (15:27 -0500)]
Merge remote-tracking branch 'origin/terencehill/moveplayer_fix'
# By terencehill
# Via terencehill
* origin/terencehill/moveplayer_fix:
CheckAllowedTeams must be called before FindSmallestTeam
terencehill [Thu, 20 Feb 2014 23:22:13 +0000 (00:22 +0100)]
CheckAllowedTeams must be called before FindSmallestTeam
Rudolf Polzer [Mon, 17 Feb 2014 09:37:10 +0000 (10:37 +0100)]
comments
Samual Lenks [Mon, 17 Feb 2014 03:33:27 +0000 (22:33 -0500)]
Fix "low gravity" check
Samual Lenks [Mon, 17 Feb 2014 03:28:42 +0000 (22:28 -0500)]
Increase gravity slightly
Samual Lenks [Mon, 17 Feb 2014 03:19:37 +0000 (22:19 -0500)]
Add checkupdate function, fix some things about the last commit
Samual Lenks [Mon, 17 Feb 2014 02:42:17 +0000 (21:42 -0500)]
Remove comment at the end of the file
Samual Lenks [Mon, 17 Feb 2014 02:38:47 +0000 (21:38 -0500)]
Updates to playerbasic, including status tracking and proper database init
Samual Lenks [Sun, 16 Feb 2014 04:56:23 +0000 (23:56 -0500)]
Merge remote-tracking branch 'origin/master' into samual/combined_updates
Samual Lenks [Sun, 16 Feb 2014 04:54:37 +0000 (23:54 -0500)]
Forgot to commit this file :)
Rudolf Polzer [Fri, 14 Feb 2014 12:27:03 +0000 (13:27 +0100)]
Finally merged them all.
Rudolf Polzer [Fri, 14 Feb 2014 12:17:16 +0000 (13:17 +0100)]
Kill polish dupe.
Rudolf Polzer [Fri, 14 Feb 2014 12:16:47 +0000 (13:16 +0100)]
More transifex.
Rudolf Polzer [Fri, 14 Feb 2014 12:04:47 +0000 (13:04 +0100)]
Beginning of useless WP detection.
Rudolf Polzer [Fri, 14 Feb 2014 12:03:37 +0000 (13:03 +0100)]
Rename polish. Step 1.
Rudolf Polzer [Fri, 14 Feb 2014 12:03:14 +0000 (13:03 +0100)]
Transifex merge.
Samual Lenks [Tue, 11 Feb 2014 01:18:41 +0000 (20:18 -0500)]
Update to debug print for playerdetail handler
Rudolf Polzer [Tue, 4 Feb 2014 16:19:19 +0000 (17:19 +0100)]
Implement vote 215. Fixes #1895.
Rudolf Polzer [Tue, 4 Feb 2014 16:17:34 +0000 (17:17 +0100)]
Refactor respawn delay logic in preparation for implementing vote #215.
Samual Lenks [Sun, 2 Feb 2014 00:53:17 +0000 (19:53 -0500)]
Update audio tab sendcvar usage
Samual Lenks [Sun, 2 Feb 2014 00:48:47 +0000 (19:48 -0500)]
Also remove some other unnecessary things
Samual Lenks [Sun, 2 Feb 2014 00:43:03 +0000 (19:43 -0500)]
Add sendcvars to messages tab
Samual Lenks [Sat, 1 Feb 2014 23:50:38 +0000 (18:50 -0500)]
Redisplay the menu when selecting input type
Samual Lenks [Sat, 1 Feb 2014 23:13:06 +0000 (18:13 -0500)]
Add menu_mouse_absolute and hud_cursormode to the menu
Samual Lenks [Sat, 1 Feb 2014 23:07:05 +0000 (18:07 -0500)]
Remove "apply immediately" button from input tab, replace with sendCvars
Samual Lenks [Sat, 1 Feb 2014 23:01:21 +0000 (18:01 -0500)]
Begin adding "sendCvars" option support to menu
Rudolf Polzer [Thu, 30 Jan 2014 18:07:18 +0000 (19:07 +0100)]
When editing nonsaved cvars in the cvar list editor, they become saved now. Revert button undoes this.
Rudolf Polzer [Thu, 30 Jan 2014 17:41:29 +0000 (18:41 +0100)]
Quick visual fix for long cvar descriptions.
Rudolf Polzer [Thu, 30 Jan 2014 17:38:38 +0000 (18:38 +0100)]
Add a facility to FORCE cvars to be saved, EVEN if non-saved in our config and in the engine.
Samual Lenks [Thu, 30 Jan 2014 04:51:47 +0000 (23:51 -0500)]
"Sort of" make a model tab... I kinda basically hate it.
terencehill [Thu, 30 Jan 2014 00:59:33 +0000 (01:59 +0100)]
Merge branch 'master' into terencehill/hud_code_cleanup
terencehill [Thu, 30 Jan 2014 00:59:07 +0000 (01:59 +0100)]
Merge branch 'master' into terencehill/hud_fixes
Samual Lenks [Wed, 29 Jan 2014 21:50:49 +0000 (16:50 -0500)]
"Finish" HUD game settings tab
Mario [Tue, 28 Jan 2014 06:16:50 +0000 (17:16 +1100)]
Merge branch 'master' into Mario/spawnsystem_mutator
Mario [Tue, 28 Jan 2014 05:45:43 +0000 (16:45 +1100)]
Merge branch 'master' into Mario/nade_drop
Samual Lenks [Tue, 28 Jan 2014 03:21:57 +0000 (22:21 -0500)]
Put in some more work on HUD tab, add comments for other places
Samual Lenks [Mon, 27 Jan 2014 23:31:15 +0000 (18:31 -0500)]
Whoops, that achievement is supposed to be 1 instead of 2
Samual Lenks [Mon, 27 Jan 2014 23:28:23 +0000 (18:28 -0500)]
Add proper notification settings tab interface
Samual Lenks [Mon, 27 Jan 2014 17:45:57 +0000 (12:45 -0500)]
30 minute auto update time, also use radio group 3
Samual Lenks [Mon, 27 Jan 2014 05:31:20 +0000 (00:31 -0500)]
Comment out that debug print
Samual Lenks [Mon, 27 Jan 2014 05:27:21 +0000 (00:27 -0500)]
Add a function to handle the decision of whether the stats list should
update
Samual Lenks [Mon, 27 Jan 2014 04:49:17 +0000 (23:49 -0500)]
Add cl_matchcount counter which counts the number of endmatches have been
seen
Samual Lenks [Sun, 26 Jan 2014 19:35:28 +0000 (14:35 -0500)]
Merge remote-tracking branch 'origin/master' into samual/combined_updates
Rudolf Polzer [Sun, 26 Jan 2014 13:28:53 +0000 (14:28 +0100)]
Fix error handling in "gametype" keyword parsing, fixes #1884.
Samual Lenks [Sun, 26 Jan 2014 08:43:19 +0000 (03:43 -0500)]
Finish adding options for configuration of positioning
Samual Lenks [Sun, 26 Jan 2014 08:01:43 +0000 (03:01 -0500)]
Organize the code a little better for more rapid prototyping
Samual Lenks [Sun, 26 Jan 2014 06:57:40 +0000 (01:57 -0500)]
Reworking the profile tab a bit... might not go with this style
Samual Lenks [Sun, 26 Jan 2014 05:45:44 +0000 (00:45 -0500)]
add small todolist for game model tab
terencehill [Sun, 20 Oct 2013 10:55:26 +0000 (12:55 +0200)]
Fix placeholder image not visible when a screenshot (in general an image with .forcedAspect < 0) can't be read. This patch also fixes a division by 0 upon menu init as screenshot name isn't initialized yet.
(cherry picked from commit
6605e0e9a21f2848846fa0f4b4b26eb75d9d2ce2 )
Samual Lenks [Sun, 26 Jan 2014 04:32:43 +0000 (23:32 -0500)]
Better organization for user tab, add back the tooltips to misc tab
Samual Lenks [Sun, 26 Jan 2014 02:54:55 +0000 (21:54 -0500)]
Use a more consistent way to handle buttons on the bottom of dialogs
Samual Lenks [Sun, 26 Jan 2014 02:11:33 +0000 (21:11 -0500)]
Also update the misc tab a bit
Samual Lenks [Sun, 26 Jan 2014 00:05:55 +0000 (19:05 -0500)]
Minor cleanup for input tab
Samual Lenks [Sat, 25 Jan 2014 22:41:10 +0000 (17:41 -0500)]
Rename the toggle cvar to have a suffix so that playing on old servers
with the feature enabled is not broken
Samual Lenks [Sat, 25 Jan 2014 22:33:59 +0000 (17:33 -0500)]
Merge remote-tracking branch 'origin/master' into samual/combined_updates
Samual Lenks [Sat, 25 Jan 2014 22:22:58 +0000 (17:22 -0500)]
Merge remote-tracking branch 'origin/samual/splashing'
* origin/samual/splashing:
Move the supercontents/nativecontents functions to util.qc
Add proper cvar for the gameplayfix setting
Final cleanup for now
Remove some debug prints
Need advice: Add TODO comment for the gameplayfix cvar
cleanup comments, some debug, add .contentstransition func support
Aaaaand it works.
Working on adding CheckContentsTransition to CSQC movetypes
Begin messing around with contents transition
Samual Lenks [Sat, 25 Jan 2014 22:21:36 +0000 (17:21 -0500)]
Move the supercontents/nativecontents functions to util.qc
Samual Lenks [Sat, 25 Jan 2014 22:17:34 +0000 (17:17 -0500)]
Add proper cvar for the gameplayfix setting
Samual Lenks [Sat, 25 Jan 2014 22:12:10 +0000 (17:12 -0500)]
Merge remote-tracking branch 'origin/master' into samual/splashing
Samual Lenks [Sat, 25 Jan 2014 22:05:36 +0000 (17:05 -0500)]
Merge remote-tracking branch 'origin/Mario/teamswitch_fix'
# By Mario
# Via Mario
* origin/Mario/teamswitch_fix:
Check if the team is available before killing the player
Mario [Sat, 25 Jan 2014 21:15:27 +0000 (08:15 +1100)]
Check if the team is available before killing the player
Samual Lenks [Fri, 24 Jan 2014 21:33:35 +0000 (16:33 -0500)]
Merge remote-tracking branch 'origin/master' into samual/combined_updates
Conflicts:
defaultXonotic.cfg
Samual Lenks [Tue, 21 Jan 2014 19:00:09 +0000 (14:00 -0500)]
Fix ordering of readyrestart with warmup and add gameover check
Samual Lenks [Mon, 20 Jan 2014 23:00:31 +0000 (18:00 -0500)]
Increase fov from 90 to 100
Samual Lenks [Mon, 20 Jan 2014 19:32:11 +0000 (14:32 -0500)]
Merge remote-tracking branch 'origin/Mario/melee_only_fix'
# By Mario
# Via Mario
* origin/Mario/melee_only_fix:
Disable weapon dropping in melee only mutator
Samual Lenks [Mon, 20 Jan 2014 19:30:05 +0000 (14:30 -0500)]
Merge remote-tracking branch 'origin/Mario/vote_change_fix'
# By Mario
# Via Mario
* origin/Mario/vote_change_fix:
Fix vyes not working with sv_vote_change enabled
Mario [Mon, 20 Jan 2014 04:14:47 +0000 (15:14 +1100)]
Disable weapon dropping in melee only mutator
Samual Lenks [Sun, 19 Jan 2014 18:50:36 +0000 (13:50 -0500)]
Move the warning to whenever someone starts spectating, also add another
check which confirms that the cvar is enabled
Samual Lenks [Sun, 19 Jan 2014 18:21:03 +0000 (13:21 -0500)]
Merge remote-tracking branch 'origin/Mario/nospectators_message'
# By Mario (1) and Samual Lenks (1)
* origin/Mario/nospectators_message:
Update the message a little bit
Show a message in the chat box if g_chat_nospectators is enabled
Samual Lenks [Sun, 19 Jan 2014 18:18:46 +0000 (13:18 -0500)]
Update the message a little bit
Mario [Sun, 19 Jan 2014 17:47:49 +0000 (04:47 +1100)]
Show a message in the chat box if g_chat_nospectators is enabled
Mario [Sun, 19 Jan 2014 17:15:21 +0000 (04:15 +1100)]
Fix vyes not working with sv_vote_change enabled
Rudolf Polzer [Sat, 18 Jan 2014 13:57:19 +0000 (14:57 +0100)]
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
Rudolf Polzer [Sat, 18 Jan 2014 13:57:02 +0000 (14:57 +0100)]
More Transifex.
terencehill [Wed, 15 Jan 2014 22:24:11 +0000 (23:24 +0100)]
Immediately restore normal radar and chat background after maximization
Samual Lenks [Tue, 14 Jan 2014 20:38:58 +0000 (15:38 -0500)]
Better name for autoscreenshot toggle
Samual Lenks [Mon, 13 Jan 2014 17:48:10 +0000 (12:48 -0500)]
Fix compile
Samual Lenks [Mon, 13 Jan 2014 16:42:58 +0000 (11:42 -0500)]
Merge remote-tracking branch 'origin/master' into samual/combined_updates
Conflicts:
qcsrc/common/util.qh
qcsrc/menu/xonotic/dialog_multiplayer_create.c
terencehill [Wed, 8 Jan 2014 17:57:57 +0000 (18:57 +0100)]
HUD config: release mouse buttons and reset modifier keys on menu open
terencehill [Tue, 7 Jan 2014 23:40:52 +0000 (00:40 +0100)]
HUD config: when a menu dialog is opened don't block mousepos read as it leads to cursor jumps in the interaction with the menu
terencehill [Tue, 7 Jan 2014 23:33:01 +0000 (00:33 +0100)]
Weapons panel in onlyowned mode: enlarge weapon_size to match desired aspect ratio (hud_panel_weapons_aspect) in order to capitalize on panel space
Samual Lenks [Mon, 6 Jan 2014 22:06:50 +0000 (17:06 -0500)]
Merge remote-tracking branch 'origin/Mario/monsters'
# By Mario (531) and Samual Lenks (1)
# Via Mario (52) and Samual Lenks (1)
* origin/Mario/monsters: (532 commits)
Clean up monster commands a bit more
Update command aliases to match code
Clean up mobspawn command a little bit
Clean up invasion global functions a bit
Fix mobbutcher command description
Use printf macro
Empty commit so we can test merge request submission again
Don't check if monster has re-spawned when lowering counts
Replace tabs with spaces in REGISTER_MONSTER lists
Fix some invalid cvars
Add some mutator hooks for regen & mob spawning
Clean up CTF monster checks a little
Attempt to clean up commands a bit
Add a mutator hook for accuracy checking & fix notification typo
Show icon for monster deaths
Don't network monsterid
Use spaces in command aliases
Remove some now unused textures
Remove an alias for a no longer valid command
Remove freeze code, monsters no longer use freeze attacks
...
Mario [Mon, 6 Jan 2014 21:39:48 +0000 (08:39 +1100)]
Clean up monster commands a bit more
Mario [Mon, 6 Jan 2014 21:30:41 +0000 (08:30 +1100)]
Update command aliases to match code
Mario [Mon, 6 Jan 2014 21:16:50 +0000 (08:16 +1100)]
Clean up mobspawn command a little bit
Mario [Mon, 6 Jan 2014 20:40:42 +0000 (07:40 +1100)]
Clean up invasion global functions a bit
Rudolf Polzer [Mon, 6 Jan 2014 09:58:53 +0000 (10:58 +0100)]
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
Mario [Mon, 6 Jan 2014 03:05:51 +0000 (14:05 +1100)]
Merge branch 'master' into Mario/monsters
terencehill [Mon, 6 Jan 2014 00:53:05 +0000 (01:53 +0100)]
Merge branch 'master' into terencehill/hud_code_cleanup