]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
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
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.
Mario [Fri, 3 Jan 2014 09:40:53 +0000 (20:40 +1100)]
Fix mobbutcher command description
Mario [Fri, 3 Jan 2014 08:55:54 +0000 (19:55 +1100)]
Use printf macro
Samual Lenks [Fri, 3 Jan 2014 01:59:29 +0000 (20:59 -0500)]
Add unique fields for this, because fuck doing it any other way
Samual Lenks [Fri, 3 Jan 2014 00:53:26 +0000 (19:53 -0500)]
Add reminder
Samual Lenks [Fri, 3 Jan 2014 00:52:29 +0000 (19:52 -0500)]
Start fixing up weaponsystem.qc to handle new model settings
Samual Lenks [Fri, 3 Jan 2014 00:36:38 +0000 (19:36 -0500)]
Now make the weapon files use it
Samual Lenks [Fri, 3 Jan 2014 00:15:44 +0000 (19:15 -0500)]
Begin making weapon model specification part of REGISTER_WEAPON
Samual Lenks [Fri, 3 Jan 2014 00:05:31 +0000 (19:05 -0500)]
Rename our usage of model2 to wpmodel
Samual Lenks [Thu, 2 Jan 2014 23:29:00 +0000 (18:29 -0500)]
Make the declaration in weapons.qh match in weapons.qc
Samual Lenks [Thu, 2 Jan 2014 23:12:34 +0000 (18:12 -0500)]
commit message goes here
Samual Lenks [Thu, 2 Jan 2014 23:03:21 +0000 (18:03 -0500)]
More descriptive stuff, better naming
Samual Lenks [Thu, 2 Jan 2014 21:49:12 +0000 (16:49 -0500)]
Reorganize the register_weapon function a little bit
Samual Lenks [Thu, 2 Jan 2014 21:42:11 +0000 (16:42 -0500)]
Add TODO to crosshairs.cfg to fix crosshair rings later
Samual Lenks [Thu, 2 Jan 2014 21:39:55 +0000 (16:39 -0500)]
Fix spacing of register_weapon lists
Samual Lenks [Thu, 2 Jan 2014 21:21:21 +0000 (16:21 -0500)]
Remove per-weapon crosshairs from crosshairs.cfg
Samual Lenks [Thu, 2 Jan 2014 21:14:24 +0000 (16:14 -0500)]
Add multiplier for compat
Samual Lenks [Thu, 2 Jan 2014 21:07:40 +0000 (16:07 -0500)]
Begin moving per-weapon crosshair selection as weapon specific info
Samual Lenks [Thu, 2 Jan 2014 15:06:48 +0000 (10:06 -0500)]
Remove legacy .zym weapon models (we don't use these anymore, right?)
Samual Lenks [Thu, 2 Jan 2014 14:38:46 +0000 (09:38 -0500)]
Use WarpZone_findradius_dist for distance checking on blast cone trace
Samual Lenks [Thu, 2 Jan 2014 13:33:37 +0000 (08:33 -0500)]
Limit queue to MAX_SHOCKWAVE_HITS
Samual Lenks [Thu, 2 Jan 2014 13:31:31 +0000 (08:31 -0500)]
Some fixes for queueing of damage with shockwave
Samual Lenks [Thu, 2 Jan 2014 13:21:17 +0000 (08:21 -0500)]
Add todo comment
Samual Lenks [Thu, 2 Jan 2014 13:19:43 +0000 (08:19 -0500)]
Add define for MAX_SHOCKWAVE_HITS
Samual Lenks [Thu, 2 Jan 2014 01:24:36 +0000 (20:24 -0500)]
Clean up entity properties of weaponinfo
Samual Lenks [Thu, 2 Jan 2014 01:11:02 +0000 (20:11 -0500)]
Comments, clean up REGISTER_WEAPON naming
Samual Lenks [Thu, 2 Jan 2014 00:51:50 +0000 (19:51 -0500)]
Use macro for WEP_NAME as well (get rid of W_Name)
Samual Lenks [Thu, 2 Jan 2014 00:46:57 +0000 (19:46 -0500)]
Remove duplicate WEP_ prefix for WEP_AMMO usage
Samual Lenks [Thu, 2 Jan 2014 00:43:41 +0000 (19:43 -0500)]
Rename AMMO_vAL to WEP_AMMO
Samual Lenks [Thu, 2 Jan 2014 00:41:11 +0000 (19:41 -0500)]
Some more cleanup
Samual Lenks [Thu, 2 Jan 2014 00:17:38 +0000 (19:17 -0500)]
items field is not used on weapon entities anymore
Samual Lenks [Wed, 1 Jan 2014 16:45:29 +0000 (11:45 -0500)]
Empty commit so we can test merge request submission again
Samual Lenks [Wed, 1 Jan 2014 14:17:02 +0000 (09:17 -0500)]
Merge remote-tracking branch 'origin/master' into Mario/monsters
Samual Lenks [Wed, 1 Jan 2014 13:22:23 +0000 (08:22 -0500)]
Better descriptions for weaponrequests
Samual Lenks [Wed, 1 Jan 2014 13:12:28 +0000 (08:12 -0500)]
little reorganization
Samual Lenks [Wed, 1 Jan 2014 13:11:17 +0000 (08:11 -0500)]
Merge remote-tracking branch 'origin/master' into samual/weapons
Conflicts:
mutator_new_toys.cfg
qcsrc/client/miscfunctions.qc
qcsrc/common/explosion_equation.qc
qcsrc/server/cl_weapons.qc
qcsrc/server/g_damage.qc
qcsrc/server/weapons/weaponsystem.qc
Samual Lenks [Wed, 1 Jan 2014 12:47:56 +0000 (07:47 -0500)]
Don't use direct cvar access for bot weapon logic
Samual Lenks [Wed, 1 Jan 2014 11:45:53 +0000 (06:45 -0500)]
Rename final to [[last]]
Rudolf Polzer [Wed, 1 Jan 2014 10:14:00 +0000 (11:14 +0100)]
Merge remote-tracking branch 'origin/divVerent/ballistic2'
* origin/divVerent/ballistic2:
Oops. Fix rifle config.
We DO need to detect double-hits, due to the weird engine tracing that happens sometimes at low angles.
Always show DamageInfo, even when hitting the same player twice.
Fix use of "self".
fix some bugs
Kill some cvars I forgot.
cvar cleanup
Kill zcurveparticles due to 0 users.
Simplify a LOT.
work on restructuring fireBallisticBullet
Rudolf Polzer [Wed, 1 Jan 2014 09:55:58 +0000 (10:55 +0100)]
Oops. Fix rifle config.
Rudolf Polzer [Wed, 1 Jan 2014 09:49:30 +0000 (10:49 +0100)]
Merge branch 'master' into divVerent/ballistic2
Rudolf Polzer [Wed, 1 Jan 2014 09:47:38 +0000 (10:47 +0100)]
Add the most obvious __VA_ARGS__ macro of all.
Rudolf Polzer [Wed, 1 Jan 2014 09:37:49 +0000 (10:37 +0100)]
Fix terencehill's variable abuse. Unbreaks centerprint.
WHY DID I LET THIS GO WHEN REVIEWING THIS STUFF.
Samual Lenks [Tue, 31 Dec 2013 22:41:46 +0000 (17:41 -0500)]
Move item constants to t_items.qh
Samual Lenks [Tue, 31 Dec 2013 22:31:49 +0000 (17:31 -0500)]
Make these declaration lists not suck as much
Samual Lenks [Tue, 31 Dec 2013 19:40:18 +0000 (14:40 -0500)]
More cleaning