]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Mario [Fri, 24 Apr 2015 07:15:53 +0000 (17:15 +1000)]
Fix a few cases of var float
Mario [Fri, 24 Apr 2015 05:33:48 +0000 (15:33 +1000)]
Merge branch 'master' into Mario/combined_updates
Mario [Fri, 24 Apr 2015 05:33:32 +0000 (15:33 +1000)]
Add a couple of missing pieces for the impressive announcement
Mario [Fri, 24 Apr 2015 05:20:09 +0000 (15:20 +1000)]
Merge branch 'master' into Mario/combined_updates
Conflicts:
qcsrc/common/monsters/monster/shambler.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/monsters/sv_monsters.qh
qcsrc/common/util.qc
qcsrc/common/util.qh
qcsrc/server/autocvars.qh
qcsrc/server/g_triggers.qc
qcsrc/server/g_triggers.qh
qcsrc/server/mutators/gamemode_keyhunt.qc
qcsrc/server/mutators/gamemode_onslaught.qc
qcsrc/server/mutators/mutator_dodging.qc
qcsrc/server/mutators/mutator_nades.qc
qcsrc/server/t_plats.qc
qcsrc/server/target_music.qc
qcsrc/server/tturrets/include/turrets_early.qh
qcsrc/server/tturrets/system/system_damage.qc
qcsrc/server/tturrets/system/system_main.qc
qcsrc/server/tturrets/system/system_misc.qc
qcsrc/server/tturrets/units/unit_walker.qc
qcsrc/server/vehicles/bumblebee.qc
qcsrc/server/vehicles/bumblebee.qh
qcsrc/server/vehicles/raptor.qc
qcsrc/server/vehicles/vehicles.qc
Mario [Fri, 24 Apr 2015 04:55:56 +0000 (14:55 +1000)]
Convert a load more floats into ints and bools
Mario [Thu, 23 Apr 2015 08:34:23 +0000 (18:34 +1000)]
Even more floats to bool/int
Mario [Thu, 23 Apr 2015 07:35:13 +0000 (17:35 +1000)]
Same as above
Mario [Thu, 23 Apr 2015 07:33:06 +0000 (17:33 +1000)]
Add impressive announcement to vortex
Mario [Thu, 23 Apr 2015 00:59:00 +0000 (10:59 +1000)]
Convert some floats into ints
Mario [Thu, 23 Apr 2015 00:58:03 +0000 (10:58 +1000)]
Some preparation for client side vehicles
Mario [Tue, 21 Apr 2015 08:30:10 +0000 (18:30 +1000)]
Supposedly fix rare case of "You are now alone!" message appearing at the end of CTF matches
Mario [Tue, 21 Apr 2015 06:17:25 +0000 (16:17 +1000)]
Hardcode some more references to the player hitbox
Mario [Mon, 20 Apr 2015 10:30:25 +0000 (20:30 +1000)]
Hardcode flag hitbox size, rather than relying on player hitbox cvars
Mario [Mon, 20 Apr 2015 07:31:37 +0000 (17:31 +1000)]
Turn the global hitbox/view offset cvars into stats (sv_ cvars shouldn't be used for anything client side)
Mario [Mon, 20 Apr 2015 00:53:27 +0000 (10:53 +1000)]
Don't enforce classname on items, also add an option to func_breakable to only break on trigger (potentially useful for assault and SMB style maps)
Mario [Sun, 19 Apr 2015 06:25:18 +0000 (16:25 +1000)]
Allow overriding crush touch by setting g_player_crush lower than 0
Mario [Sun, 19 Apr 2015 06:24:20 +0000 (16:24 +1000)]
Add the framework for a "goomba" type monster (for sidescrolling levels)
Mario [Sun, 19 Apr 2015 04:46:24 +0000 (14:46 +1000)]
Fix player brightness
Mario [Sat, 18 Apr 2015 05:09:06 +0000 (15:09 +1000)]
Delete some leftovers from merge
Mario [Sat, 18 Apr 2015 05:06:41 +0000 (15:06 +1000)]
Merge branch 'master' into Mario/combined_updates
Conflicts:
qcsrc/client/tturrets.qc
qcsrc/common/weapons/w_arc.qc
qcsrc/server/tturrets/system/system_main.qc
qcsrc/server/vehicles/vehicles.qc
Mario [Sat, 18 Apr 2015 03:51:49 +0000 (03:51 +0000)]
Merge branch 'terencehill/unlimited_ammo_fixes' into 'master'
Unlimited ammo fixes
Fix a few weapons not working with 0 ammo while owning the unlimited ammo powerup
Namely Arc, Devastator and Hagar.
See merge request !119
Mario [Fri, 17 Apr 2015 04:42:53 +0000 (14:42 +1000)]
Less ponies
Mirio [Thu, 16 Apr 2015 00:10:12 +0000 (02:10 +0200)]
Update credits
Mario [Wed, 15 Apr 2015 22:49:44 +0000 (08:49 +1000)]
Remove an old unused model
terencehill [Wed, 15 Apr 2015 22:47:56 +0000 (00:47 +0200)]
Merge branch 'master' into terencehill/unlimited_ammo_fixes
Mario [Wed, 15 Apr 2015 22:23:11 +0000 (22:23 +0000)]
Merge branch 'terencehill/preferred_focus' into 'master'
Make work focus on preferred controls on dialog open (only root dialogs!)
You can now join a team game by just pressing SPACE twice, as the auto-join button is initially focused in the team selection dialog (with menu_mouse_absolute 0 the cursor is also moved over the button).
See merge request !118
Mario [Wed, 15 Apr 2015 21:47:13 +0000 (07:47 +1000)]
Also check if owner is in a vehicle when stopping the arc beam
Mario [Wed, 15 Apr 2015 02:05:06 +0000 (12:05 +1000)]
Fix compile
Mario [Wed, 15 Apr 2015 01:22:26 +0000 (11:22 +1000)]
Fix target locking not working on turrets
Mario [Tue, 14 Apr 2015 21:49:15 +0000 (07:49 +1000)]
Revert changes to electro combos (too controversial, will move to a different branch)
terencehill [Mon, 13 Apr 2015 18:09:36 +0000 (20:09 +0200)]
Make work focus on preferred controls on dialog open (only root dialogs!). You can now join a team game by just pressing SPACE twice, as the auto-join button is initially focused in the team selection dialog (with menu_mouse_absolute 0 the cursor is also moved over the button).
Mario [Thu, 9 Apr 2015 19:16:14 +0000 (05:16 +1000)]
As a temporary solution, force cl_sidespeed and cl_forwardspeed to match the maxspeed stat (these are overridden whenever sv_maxspeed changes anyway)
Mirio [Thu, 9 Apr 2015 18:18:40 +0000 (20:18 +0200)]
Changed wrong cvar in that balance config, fixed
Mirio [Thu, 9 Apr 2015 18:01:30 +0000 (20:01 +0200)]
Lower midair radius for Electro, cause you were hurting yourself a lot by shooting the combo from a higher to lower level
Mario [Thu, 9 Apr 2015 17:26:04 +0000 (03:26 +1000)]
Fix spectator speed (walking is still a bit off, but a different issue)
Rudolf Polzer [Thu, 9 Apr 2015 13:08:36 +0000 (15:08 +0200)]
Don't immediately send name changes while you're typing (spam).
This is because the engine automatically sends changes to $_cl_name to the server.
Maybe we later want to use another cvar for menu editing of the name... sucks.
Rudolf Polzer [Thu, 9 Apr 2015 13:02:20 +0000 (15:02 +0200)]
Don't show a clear textbox button in name entry fields.
Mario [Thu, 9 Apr 2015 00:32:27 +0000 (10:32 +1000)]
Use playerid instead of netaddress when setting a random name (player's IP should not be shown publicly)
Mario [Wed, 8 Apr 2015 23:45:04 +0000 (09:45 +1000)]
Beef up the chat
Mario [Tue, 7 Apr 2015 20:26:53 +0000 (06:26 +1000)]
Merge some fixes from CTF updates branch
Mario [Tue, 7 Apr 2015 13:21:52 +0000 (23:21 +1000)]
Allow items to fade out rather than disappear with distance, also add an option to disable the function completely
Mario [Tue, 7 Apr 2015 10:38:50 +0000 (20:38 +1000)]
Remove some unused files
Mario [Mon, 6 Apr 2015 15:24:56 +0000 (01:24 +1000)]
Make spawnflags & 1 act as noalign for buffs (matching old powerups/items)
Mario [Mon, 6 Apr 2015 15:21:22 +0000 (01:21 +1000)]
Change buff random spawn flag to prevent old items setting it
Mario [Mon, 6 Apr 2015 15:06:58 +0000 (01:06 +1000)]
Fix references to unfinished plasma ammo item
Mario [Mon, 6 Apr 2015 15:02:34 +0000 (01:02 +1000)]
Fix references to unfinished plasma ammo type
terencehill [Sun, 5 Apr 2015 22:54:48 +0000 (00:54 +0200)]
Merge branch 'master' into terencehill/unlimited_ammo_fixes
Mario [Sun, 5 Apr 2015 20:23:15 +0000 (20:23 +0000)]
Merge branch 'matthiaskrgr/hudsetup' into 'master'
fix commands
changed path to hudsetup map as requested by div0
See merge request !116
Mario [Sun, 5 Apr 2015 18:09:27 +0000 (18:09 +0000)]
Merge branch 'terencehill/mapvote_cursor_fix' into 'master'
Fix for #1465 "joining server while on map selection screen locks cursor"
Setting hud_configure_prev to -1 to detect the very first frame isn't useful anymore.
See merge request !115
terencehill [Sun, 5 Apr 2015 12:16:30 +0000 (14:16 +0200)]
Fix for #1465 "joining server while on map selection screen locks cursor"
Setting hud_configure_prev to -1 to detect the very first frame isn't useful anymore.
Mario [Sun, 5 Apr 2015 11:44:32 +0000 (21:44 +1000)]
Remove boolean function
Mario [Sun, 5 Apr 2015 10:55:37 +0000 (20:55 +1000)]
For completeness, port step and follow movetypes (untested)
Mario [Sat, 4 Apr 2015 21:12:50 +0000 (07:12 +1000)]
Hide some notification/effect system initialization messages
Mario [Sat, 4 Apr 2015 21:10:20 +0000 (07:10 +1000)]
Fix team change message showing for connecting clients
Matthias Krüger [Sat, 4 Apr 2015 20:07:47 +0000 (22:07 +0200)]
fix commands
Mario [Fri, 3 Apr 2015 23:25:34 +0000 (10:25 +1100)]
Unlink more triggers
Mario [Fri, 3 Apr 2015 20:18:17 +0000 (07:18 +1100)]
Disable a few links for now (triggers are a bit rough)
Mario [Fri, 3 Apr 2015 20:13:40 +0000 (07:13 +1100)]
Attempting a fix for funky ladders
Mario [Fri, 3 Apr 2015 17:48:13 +0000 (04:48 +1100)]
Potentially fix a crash from flak
Mario [Fri, 3 Apr 2015 11:19:27 +0000 (22:19 +1100)]
Use CSQC prediction when cl_movement is 1 (2 uses old engine prediction)
Mario [Fri, 3 Apr 2015 11:16:24 +0000 (22:16 +1100)]
Remove the old version
Mario [Fri, 3 Apr 2015 11:15:00 +0000 (22:15 +1100)]
Make prediction much more stable by re-porting ClientMovement_Move
Mario [Fri, 3 Apr 2015 10:11:56 +0000 (10:11 +0000)]
Merge branch 'matthiaskrgr/hudsetup' into 'master'
Matthiaskrgr/hudsetup
makes hudsetup an actual map which is handled via map compile server.
the map is not shown in lsmaps or map selections as I saw it.
needs equivalent branch in map repo to work
See merge request !111
Mario [Fri, 3 Apr 2015 08:19:51 +0000 (19:19 +1100)]
Revert experimental item updates
Mario [Fri, 3 Apr 2015 08:04:49 +0000 (19:04 +1100)]
Merge branch 'Mario/buff_updates' into Mario/combined_updates
Conflicts:
qcsrc/client/autocvars.qh
qcsrc/client/hud_config.qc
qcsrc/common/buffs.qh
qcsrc/common/notifications.qh
qcsrc/common/stats.qh
qcsrc/server/autocvars.qh
qcsrc/server/mutators/base.qh
qcsrc/server/mutators/mutator_buffs.qc
qcsrc/server/mutators/mutator_buffs.qh
Mario [Fri, 3 Apr 2015 07:48:19 +0000 (18:48 +1100)]
Merge branch 'master' into Mario/buff_updates
Mario [Thu, 2 Apr 2015 09:19:19 +0000 (20:19 +1100)]
Don't link them to server's ticrate (seems to work a tiny bit better)
Mario [Thu, 2 Apr 2015 07:54:40 +0000 (18:54 +1100)]
Experimental improvements to item networking (much more accurate, but still fails around funky walls)
Mario [Thu, 2 Apr 2015 06:13:50 +0000 (17:13 +1100)]
Add an option to hide items further than a set distance away from the player (can greatly improve performance on maps with a lot of items), disabled by default
Mario [Thu, 2 Apr 2015 05:11:42 +0000 (16:11 +1100)]
Add support for old (Quake 3/Live) oneflag maps
Mario [Thu, 2 Apr 2015 03:27:26 +0000 (14:27 +1100)]
Undo the important fix
Mario [Wed, 1 Apr 2015 08:22:15 +0000 (19:22 +1100)]
Possibly fix showfps
Mario [Tue, 31 Mar 2015 16:48:23 +0000 (03:48 +1100)]
An actually important fix
Mario [Tue, 31 Mar 2015 16:36:15 +0000 (03:36 +1100)]
Add an important fix
Mario [Tue, 31 Mar 2015 15:41:07 +0000 (02:41 +1100)]
Merge branch 'master' into Mario/combined_updates
Conflicts:
qcsrc/server/mutators/mutator_instagib.qc
Mario [Tue, 31 Mar 2015 12:49:25 +0000 (12:49 +0000)]
Merge branch 'Mario/crosshair_blink_fix' into 'master'
Merge branch Mario/crosshair_blink_fix (XXS merge request)
Fixes blinking crosshair while spectating.
See merge request !114
Mario [Tue, 31 Mar 2015 12:47:15 +0000 (23:47 +1100)]
Disable hit indication while spectating (serves no purpose as a spectator, disabling also fixes "blinking" bug)
Mario [Tue, 31 Mar 2015 12:37:17 +0000 (12:37 +0000)]
Merge branch 'Mario/accuracy_fix' into 'master'
Merge branch Mario/accuracy_fix (M merge request)
Restores the hacks to use Blaster weapon for secondary fire's accuracy counting in overkill and instagib.
See merge request !113
Mario [Tue, 31 Mar 2015 12:20:35 +0000 (23:20 +1100)]
Fix secondary fire taking accuracy off the overkill/instagib primary attacks
Mario [Sat, 28 Mar 2015 01:50:04 +0000 (12:50 +1100)]
Temporarily disable networking of ladders (abnormal ladder brushes are extending past their limits, this will have to be solved)
Mario [Fri, 27 Mar 2015 08:15:05 +0000 (08:15 +0000)]
Merge branch 'Mario/nade_fixes' into 'master'
Merge branch Mario/nade_fixes (M merge request)
Fixes nades disappearing when touching clips, allows dropping the nade down only when player is both looking down and holding crouch, fixes ultra fast overkill superweapon re-spawn times, adds an option to change the nade throw offset (possibly useful for servers that wish to attempt to reproduce the old overkill's nade throw offsets).
See merge request !112
Mario [Fri, 27 Mar 2015 07:58:43 +0000 (18:58 +1100)]
Merge branch 'master' into Mario/nade_fixes
Mario [Fri, 27 Mar 2015 05:26:14 +0000 (16:26 +1100)]
Use an inversed color for buff progress bars (still doesn't look great, but slightly more visible)
Mario [Thu, 26 Mar 2015 07:42:46 +0000 (18:42 +1100)]
Merge branch 'master' into Mario/buff_updates
Mario [Thu, 26 Mar 2015 00:03:43 +0000 (11:03 +1100)]
Fix buffs potentially removing the wrong item
Mario [Wed, 25 Mar 2015 04:59:00 +0000 (15:59 +1100)]
Disable networking of trains temporarily
Mario [Wed, 25 Mar 2015 03:38:22 +0000 (14:38 +1100)]
Fix compile
Mario [Wed, 25 Mar 2015 03:34:59 +0000 (14:34 +1100)]
Merge branch 'master' into Mario/combined_updates
Rudolf Polzer [Tue, 24 Mar 2015 18:52:05 +0000 (19:52 +0100)]
Allow maps to specify "warpzone_isboxy" "1" to disable exacttrigger logic on anything.
This allows for some performance optimizations.
Rudolf Polzer [Tue, 24 Mar 2015 18:51:00 +0000 (19:51 +0100)]
Make the face normal calculation clearer by using less variables.
Mario [Tue, 24 Mar 2015 16:02:41 +0000 (03:02 +1100)]
Add a way to trigger multi only when certain keys are pressed (intended for use on warp pipes)
Rudolf Polzer [Tue, 24 Mar 2015 14:36:12 +0000 (15:36 +0100)]
Kill dotproduct() function as it's built-in in QC; move cross() to warpzonelib so warpzonelib can use it and stay standalone.
Mario [Tue, 24 Mar 2015 14:32:57 +0000 (01:32 +1100)]
Use engine side touch on triggers
Mario [Tue, 24 Mar 2015 14:03:35 +0000 (01:03 +1100)]
Allow knockback from weapons in side-scrolling mode
Mario [Tue, 24 Mar 2015 10:01:51 +0000 (21:01 +1100)]
Don't check warpzone trigger touch for all triggers (causes severe lag on maps with giant triggers)
Mario [Tue, 24 Mar 2015 08:43:29 +0000 (19:43 +1100)]
Merge branch 'Mario/combined_prediction' into Mario/combined_updates
Mario [Tue, 24 Mar 2015 08:43:11 +0000 (19:43 +1100)]
Remove a duplicate declaration
Mario [Tue, 24 Mar 2015 02:19:33 +0000 (13:19 +1100)]
Predicted sidescrolling, yay
Mario [Tue, 24 Mar 2015 01:30:55 +0000 (12:30 +1100)]
Merge branch 'Mario/qc_physics_prehax' into Mario/combined_updates
Conflicts:
qcsrc/client/laser.qc
qcsrc/client/main.qc
qcsrc/client/progs.src
qcsrc/client/vehicles/vehicles.qc
qcsrc/common/constants.qh
qcsrc/common/csqcmodel_settings.qh
qcsrc/common/nades.qc
qcsrc/common/triggers/teleporters.qc
qcsrc/common/triggers/trigger/jumppads.qc
qcsrc/common/weapons/w_porto.qc
qcsrc/csqcmodellib/cl_player.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh
qcsrc/server/g_triggers.qc
qcsrc/server/mutators/gamemode_assault.qc
qcsrc/server/mutators/gamemode_ctf.qc
qcsrc/server/mutators/gamemode_ctf.qh
qcsrc/server/mutators/gamemode_domination.qc
qcsrc/server/mutators/gamemode_onslaught.qc
qcsrc/server/mutators/mutator_buffs.qc
qcsrc/server/mutators/mutator_dodging.qc
qcsrc/server/mutators/mutator_multijump.qc
qcsrc/server/mutators/mutator_nades.qc
qcsrc/server/progs.src
qcsrc/server/race.qh
qcsrc/server/t_halflife.qc
qcsrc/server/tturrets/system/system_main.qc
qcsrc/server/tturrets/system/system_misc.qc
qcsrc/server/vehicles/racer.qc
qcsrc/server/vehicles/vehicles.qc
qcsrc/warpzonelib/common.qc
Mario [Mon, 23 Mar 2015 03:22:04 +0000 (14:22 +1100)]
Look down while crouching (matches Arcade Quake, besides the crouching, which is a requirement here)