]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
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
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.
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.
Samual Lenks [Mon, 13 Jan 2014 03:22:33 +0000 (22:22 -0500)]
Fix some things, begin working on attack tracing
Samual Lenks [Sun, 12 Jan 2014 21:42:35 +0000 (16:42 -0500)]
Now calculate the number of segments we should use based on angle of
attack and distance of attack (probably could be done better?)
Samual Lenks [Sun, 12 Jan 2014 21:06:57 +0000 (16:06 -0500)]
Some cleanup
Samual Lenks [Sun, 12 Jan 2014 20:58:15 +0000 (15:58 -0500)]
And now add segmentation/bending
Samual Lenks [Sun, 12 Jan 2014 20:06:36 +0000 (15:06 -0500)]
Dragging now works as it should :D
Samual Lenks [Sun, 12 Jan 2014 03:31:15 +0000 (22:31 -0500)]
Working on stuff and things
Samual Lenks [Sat, 11 Jan 2014 05:12:10 +0000 (00:12 -0500)]
Working on better handling of damage effects
Samual Lenks [Sat, 11 Jan 2014 03:16:08 +0000 (22:16 -0500)]
Fix the last weird hack for vaporizer using blaster for its secondary
Samual Lenks [Sat, 11 Jan 2014 02:39:38 +0000 (21:39 -0500)]
Do the same updates to Vortex
Samual Lenks [Fri, 10 Jan 2014 21:45:37 +0000 (16:45 -0500)]
More consistency in the weapon files
Samual Lenks [Wed, 8 Jan 2014 17:50:34 +0000 (12:50 -0500)]
Fix an issue with Arc beam being canceled prematurely, start work on arc
Samual Lenks [Tue, 7 Jan 2014 03:16:40 +0000 (22:16 -0500)]
Add another weapontodo comment, remove unused weaponrequest
Samual Lenks [Tue, 7 Jan 2014 02:50:10 +0000 (21:50 -0500)]
Add todo comment, move another throw weapon function
Mario [Mon, 6 Jan 2014 23:53:04 +0000 (10:53 +1100)]
Merge branch 'master' into samual/weapons
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
...
Samual Lenks [Mon, 6 Jan 2014 21:59:56 +0000 (16:59 -0500)]
Update comment for crouching
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
Samual Lenks [Sun, 5 Jan 2014 22:11:37 +0000 (17:11 -0500)]
Merge remote-tracking branch 'origin/terencehill/vehicles_fixes'
# By terencehill
# Via terencehill
* origin/terencehill/vehicles_fixes:
Improve calculation of vehicle respawn delay
Reset vehicles in reset_map (thanks to the new vehicles_reset function), not just in assault_new_round
Fix serious bug when the map is reset (ready-restart) and a player is on a vehicle: player can't exit from the vehicle anymore
If the spiderbot is blown up don't show the teleport effect where the spiderbot was
Add blowup cvars for raptor and spiderbot
Make racer_blowup() similar to raptor_blowup(): don't override respawn time (already correctly calculated in vehicles.qc) and don't call racer_spawn as it isn't necessary.
Fix a few typos in function names
Spawn vehicles according to g_start_delay and make work better g_vehicles_delayspawn_jitter (jitter 10 is now a random number in the interval [-5,+5] instead of [0,+10])
Samual Lenks [Sun, 5 Jan 2014 22:07:09 +0000 (17:07 -0500)]
Merge remote-tracking branch 'origin/terencehill/ca_ft_fixes'
# By terencehill
# Via terencehill
* origin/terencehill/ca_ft_fixes:
Fix compilation. It seems that Samual renamed inWarmupStage to warmup_stage in the commit
6c4446c0a7 with the very explicative description "I'm a goddamn genius, IT WORKS!".
Add cvars g_freezetag_team_spawns and g_ca_team_spawns: when 1, players spawn from the team spawnpoints of the map, if any
CheckAllowedTeams isn't needed in these cases
Add description to g_*_round_timelimit cvars
Since CA and LMS have special values for starting ammo, health and armor, let's use them in warmup too
Allow weapon change impulses when not in round time
Fix bug where just connected players are forced to join the game the next round
Fix this Freezetag bug: If you try to revive a player after a round ends the "Revive progress" centerprint will be stuck until a new one appears
Freezetag: use warmup_start_health in warmup stage
Reset kill count when a new round starts
Make work the "3/2/1 frags left" announcer messages in Freezetag
ScoreRules_freezetag should know the number of available teams this way (like CA and KH)
Fix implementation of CA score rules
Samual Lenks [Sun, 5 Jan 2014 21:58:53 +0000 (16:58 -0500)]
Add switch delay to Arc
Samual Lenks [Sun, 5 Jan 2014 21:54:22 +0000 (16:54 -0500)]
Don't decrease ammo_none field
Samual Lenks [Sun, 5 Jan 2014 21:22:09 +0000 (16:22 -0500)]
Smaller distance for blast attack
Samual Lenks [Sun, 5 Jan 2014 21:20:32 +0000 (16:20 -0500)]
update config too
Samual Lenks [Sun, 5 Jan 2014 21:00:02 +0000 (16:00 -0500)]
Add weaponthrowable property to weapons
Samual Lenks [Sun, 5 Jan 2014 20:49:46 +0000 (15:49 -0500)]
Remove the stupid _lightning models
Samual Lenks [Sun, 5 Jan 2014 18:39:38 +0000 (13:39 -0500)]
Unhandled weapon requests from weapon functions should return FALSE
Samual Lenks [Sun, 5 Jan 2014 18:32:27 +0000 (13:32 -0500)]
Fix some issues with effects
Samual Lenks [Sun, 5 Jan 2014 18:10:56 +0000 (13:10 -0500)]
Fix Vaporizer secondary
terencehill [Sun, 5 Jan 2014 18:00:43 +0000 (19:00 +0100)]
Merge branch 'master' into terencehill/ca_ft_fixes
Conflicts:
gamemodes.cfg
qcsrc/server/g_world.qc
qcsrc/server/mutators/gamemode_arena.qc
qcsrc/server/mutators/gamemode_ca.qc
Samual Lenks [Sun, 5 Jan 2014 17:37:22 +0000 (12:37 -0500)]
Add shotgun spawnfunc
Samual Lenks [Sun, 5 Jan 2014 17:32:33 +0000 (12:32 -0500)]
Fix hud_panel_ammo_onlycurrent
Samual Lenks [Sun, 5 Jan 2014 17:16:21 +0000 (12:16 -0500)]
The image for ammo_nails is actually named ammo_bullets
Samual Lenks [Sun, 5 Jan 2014 17:02:38 +0000 (12:02 -0500)]
Add back the old bot aiming logic for devastator in comment (in case we
have to switch back to it)
Samual Lenks [Sun, 5 Jan 2014 16:33:11 +0000 (11:33 -0500)]
We don't need stupid hacks for guiding with ammocheck
Samual Lenks [Sun, 5 Jan 2014 15:54:01 +0000 (10:54 -0500)]
Add debug in case a weapon causes negative ammo
Samual Lenks [Sun, 5 Jan 2014 15:46:01 +0000 (10:46 -0500)]
Some minor cleanup of weaponsystem
Samual Lenks [Sun, 5 Jan 2014 03:36:30 +0000 (22:36 -0500)]
Merge remote-tracking branch 'origin/master' into samual/weapons
terencehill [Sat, 4 Jan 2014 18:48:00 +0000 (19:48 +0100)]
Merge branch 'master' into terencehill/vehicles_fixes
Conflicts:
qcsrc/server/vehicles/bumblebee.qc
qcsrc/server/vehicles/raptor.qc
qcsrc/server/vehicles/spiderbot.qc
Samual Lenks [Sat, 4 Jan 2014 17:41:20 +0000 (12:41 -0500)]
Add race times to hud_notify with notification system
Samual Lenks [Sat, 4 Jan 2014 01:37:04 +0000 (20:37 -0500)]
Always ensure pixel accuracy instead of manually setting it
Samual Lenks [Sat, 4 Jan 2014 01:23:24 +0000 (20:23 -0500)]
use cvar_settemp for orthoview settings
Samual Lenks [Fri, 3 Jan 2014 20:29:35 +0000 (15:29 -0500)]
Try working on shockwave a bit
Samual Lenks [Fri, 3 Jan 2014 18:40:24 +0000 (13:40 -0500)]
Fix ordering in notifications.qh file for weapons
Samual Lenks [Fri, 3 Jan 2014 18:34:55 +0000 (13:34 -0500)]
Other fixes for death messages
Samual Lenks [Fri, 3 Jan 2014 18:28:17 +0000 (13:28 -0500)]
Electro doesn't use plasma anymore, remove it from death messages
Samual Lenks [Fri, 3 Jan 2014 18:25:40 +0000 (13:25 -0500)]
Fix spacing in notifications.qh
Samual Lenks [Fri, 3 Jan 2014 17:51:11 +0000 (12:51 -0500)]
Fix for HUD weapon image usage
Samual Lenks [Fri, 3 Jan 2014 16:48:19 +0000 (11:48 -0500)]
Add weapon image specification to REGISTER_WEAPON
Samual Lenks [Fri, 3 Jan 2014 16:29:09 +0000 (11:29 -0500)]
Make these weapons use the proper refname
Samual Lenks [Fri, 3 Jan 2014 14:51:56 +0000 (09:51 -0500)]
Fix compile
Samual Lenks [Fri, 3 Jan 2014 14:49:28 +0000 (09:49 -0500)]
On second thought, undo all that shit... this system is WAYYY too hacky to
fix in this branch.