]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Samual Lenks [Wed, 26 Feb 2014 23:39:26 +0000 (18:39 -0500)]
Switch back to previous last origin method
Samual Lenks [Wed, 26 Feb 2014 23:14:49 +0000 (18:14 -0500)]
Clean up effects and a few more things
Samual Lenks [Wed, 26 Feb 2014 22:58:51 +0000 (17:58 -0500)]
Some cleanup, add comment for draw collision todo
Samual Lenks [Wed, 26 Feb 2014 22:50:30 +0000 (17:50 -0500)]
Only interpolate when not local beam
Samual Lenks [Wed, 26 Feb 2014 22:27:27 +0000 (17:27 -0500)]
Add _hitlight and _muzzlelight functionality, rename muzzleflash
Samual Lenks [Wed, 26 Feb 2014 21:00:14 +0000 (16:00 -0500)]
Merge remote-tracking branch 'origin/master' into samual/weapons
Conflicts:
mutators.cfg
qcsrc/common/items.qh
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
Samual Lenks [Fri, 21 Feb 2014 03:24:29 +0000 (22:24 -0500)]
AAAAAAAAAAAGHGHGHGHGHAHGHAHGHGHHHGHH
terencehill [Thu, 20 Feb 2014 23:22:13 +0000 (00:22 +0100)]
CheckAllowedTeams must be called before FindSmallestTeam
Samual Lenks [Thu, 20 Feb 2014 21:53:48 +0000 (16:53 -0500)]
More minor cleanups
Samual Lenks [Thu, 20 Feb 2014 20:49:59 +0000 (15:49 -0500)]
Remove some useless comments
Samual Lenks [Thu, 20 Feb 2014 20:49:13 +0000 (15:49 -0500)]
Minor cleanups
Samual Lenks [Thu, 20 Feb 2014 20:44:47 +0000 (15:44 -0500)]
Fix ammo checks, auto switch when unable to fire again
Samual Lenks [Thu, 20 Feb 2014 06:23:11 +0000 (01:23 -0500)]
Working on fixing a bug with ammo.. currently broken
Samual Lenks [Thu, 20 Feb 2014 05:47:14 +0000 (00:47 -0500)]
Add burst ammo control
Samual Lenks [Thu, 20 Feb 2014 05:39:57 +0000 (00:39 -0500)]
Add comment for velocity accomodation idea
Samual Lenks [Thu, 20 Feb 2014 05:17:02 +0000 (00:17 -0500)]
Add functionality to "lock in" attack once starting a burst
Samual Lenks [Thu, 20 Feb 2014 04:15:33 +0000 (23:15 -0500)]
Remove the separate function for arc init
Samual Lenks [Wed, 19 Feb 2014 22:02:30 +0000 (17:02 -0500)]
Don't duplicate WR_INIT requests
Samual Lenks [Wed, 19 Feb 2014 19:49:10 +0000 (14:49 -0500)]
Add healing logic, add burst_damage
Samual Lenks [Wed, 19 Feb 2014 06:36:17 +0000 (01:36 -0500)]
Experiment with beam_traileffect and add comment for beam_hitlight /
beam_muzzlelight
Samual Lenks [Wed, 19 Feb 2014 06:00:48 +0000 (01:00 -0500)]
More cleanup and comments
Samual Lenks [Wed, 19 Feb 2014 05:45:04 +0000 (00:45 -0500)]
Add some comments explaining issues/todo's with the implementation
Samual Lenks [Wed, 19 Feb 2014 05:12:41 +0000 (00:12 -0500)]
Cleanup, fix an issue with knowing origin
Samual Lenks [Wed, 19 Feb 2014 04:37:30 +0000 (23:37 -0500)]
Begin adding muzzle model support
Samual Lenks [Wed, 19 Feb 2014 03:00:42 +0000 (22:00 -0500)]
Add an elasticity setting, beam "tightness"
Samual Lenks [Wed, 19 Feb 2014 02:45:17 +0000 (21:45 -0500)]
Remove the teleporttime stuff, that was useless
Samual Lenks [Wed, 19 Feb 2014 02:40:25 +0000 (21:40 -0500)]
Some cleanup
Samual Lenks [Wed, 19 Feb 2014 02:38:15 +0000 (21:38 -0500)]
Rename beam_rgb to beam_color
Samual Lenks [Wed, 19 Feb 2014 02:37:00 +0000 (21:37 -0500)]
Preparation for other visual improvements to the beam
Samual Lenks [Wed, 19 Feb 2014 02:32:14 +0000 (21:32 -0500)]
Working on visual effects for Arc some more
Samual Lenks [Wed, 19 Feb 2014 01:46:04 +0000 (20:46 -0500)]
Set maxthickness based on beam type
Samual Lenks [Wed, 19 Feb 2014 01:23:08 +0000 (20:23 -0500)]
No need to figure out beam type settings every frame, do it upon changes
Samual Lenks [Wed, 19 Feb 2014 00:53:20 +0000 (19:53 -0500)]
Add some additional functionality to beam type effect selection
Samual Lenks [Tue, 18 Feb 2014 23:37:44 +0000 (18:37 -0500)]
Client code already knows g_trueaim_minrange, use that global
Samual Lenks [Tue, 18 Feb 2014 23:36:55 +0000 (18:36 -0500)]
Also network maxangle and returnspeed
Samual Lenks [Tue, 18 Feb 2014 23:31:16 +0000 (18:31 -0500)]
Network settings information instead of using local cvar checking
Samual Lenks [Tue, 18 Feb 2014 23:16:57 +0000 (18:16 -0500)]
Clean up quite a lot of code in w_arc.qc
Samual Lenks [Tue, 18 Feb 2014 23:10:33 +0000 (18:10 -0500)]
Also check to make sure that the client is really a spectator
Samual Lenks [Tue, 18 Feb 2014 23:08:42 +0000 (18:08 -0500)]
Begin adding special effects for each beam type
Samual Lenks [Tue, 18 Feb 2014 22:24:09 +0000 (17:24 -0500)]
Directly handle thickness of particle beam, properly check takedamage,
attempt handling spectators properly
Samual Lenks [Tue, 18 Feb 2014 21:30:28 +0000 (16:30 -0500)]
yayyyy the client side tracing now works quite decently! :D
Samual Lenks [Tue, 18 Feb 2014 05:36:13 +0000 (00:36 -0500)]
Build new drawing method into client code for Arc effects
Note that this is NOT the larger change I intend to do at a later point,
but just a "temporary" one which draws a visual effect for the gun for
now.
Samual Lenks [Mon, 17 Feb 2014 22:03:34 +0000 (17:03 -0500)]
Some cleanup
Samual Lenks [Mon, 17 Feb 2014 21:50:36 +0000 (16:50 -0500)]
Rename primary to beam for Arc gun cvars/settings
Samual Lenks [Mon, 17 Feb 2014 21:45:17 +0000 (16:45 -0500)]
Increase delay for lgbeam_fire sound
Samual Lenks [Mon, 17 Feb 2014 21:44:45 +0000 (16:44 -0500)]
Begin adding burst/secondary support
Samual Lenks [Mon, 17 Feb 2014 21:11:28 +0000 (16:11 -0500)]
Many updates, add nonplayerdamage handling, etc
Samual Lenks [Mon, 17 Feb 2014 18:11:43 +0000 (13:11 -0500)]
Move append_to_string to its proper place
Samual Lenks [Mon, 17 Feb 2014 18:07:38 +0000 (13:07 -0500)]
Make it compile/run again
Rudolf Polzer [Mon, 17 Feb 2014 09:37:10 +0000 (10:37 +0100)]
comments
Samual Lenks [Mon, 17 Feb 2014 08:34:26 +0000 (03:34 -0500)]
Committing in broken state: working on cleaning some things up, adding
support for other beam types, working on better handling of networking the
beam information.
Samual Lenks [Mon, 17 Feb 2014 05:58:29 +0000 (00:58 -0500)]
More config tweaks and debug tweaks
Samual Lenks [Mon, 17 Feb 2014 05:46:56 +0000 (00:46 -0500)]
Update config, plus better debug info
Samual Lenks [Mon, 17 Feb 2014 05:31:56 +0000 (00:31 -0500)]
Large updates to handling of segment tracing
Samual Lenks [Mon, 17 Feb 2014 04:43:38 +0000 (23:43 -0500)]
Working on Arc attack calculation
Samual Lenks [Mon, 17 Feb 2014 03:39:19 +0000 (22:39 -0500)]
Merge remote-tracking branch 'origin/master' into samual/weapons
Conflicts:
qcsrc/server/mutators/mutator_melee_only.qc
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
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: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.
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.
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.
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
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
Rudolf Polzer [Sun, 26 Jan 2014 13:28:53 +0000 (14:28 +0100)]
Fix error handling in "gametype" keyword parsing, fixes #1884.
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 [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