]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
9 years agoMerge branch 'master' into Mario/combined_updates
Mario [Sat, 25 Apr 2015 04:52:16 +0000 (14:52 +1000)]
Merge branch 'master' into Mario/combined_updates

Conflicts:
qcsrc/client/hud.qc
qcsrc/common/weapons/weapons.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/vehicles/racer.qc

9 years agoFix a few more floats
Mario [Sat, 25 Apr 2015 04:23:53 +0000 (14:23 +1000)]
Fix a few more floats

9 years agoFix copy of ammo_none in defs.qh
Mario [Sat, 25 Apr 2015 04:21:18 +0000 (14:21 +1000)]
Fix copy of ammo_none in defs.qh

9 years agoFew more floats to ints/bools
Mario [Sat, 25 Apr 2015 04:18:57 +0000 (14:18 +1000)]
Few more floats to ints/bools

9 years agoFix a few more floats in arrays
Mario [Sat, 25 Apr 2015 04:16:22 +0000 (14:16 +1000)]
Fix a few more floats in arrays

9 years agoBoolinterize hud.qc
Mario [Sat, 25 Apr 2015 04:03:18 +0000 (14:03 +1000)]
Boolinterize hud.qc

9 years agoFix some more floats in arrays
Mario [Sat, 25 Apr 2015 02:52:46 +0000 (12:52 +1000)]
Fix some more floats in arrays

9 years agoMerge branch 'TimePath/lint' into 'master'
Mario [Sat, 25 Apr 2015 02:15:22 +0000 (02:15 +0000)]
Merge branch 'TimePath/lint' into 'master'

TimePath/lint

A few changes to get my static analysis tool working

See merge request !121

9 years agoDeclare `.SendEntity` as `bool(entity, int)`
TimePath [Sun, 19 Apr 2015 10:53:16 +0000 (20:53 +1000)]
Declare `.SendEntity` as `bool(entity, int)`

9 years agoDeclare `stoi` and `itos` when QCC_SUPPORT_INT
TimePath [Sun, 19 Apr 2015 10:52:47 +0000 (20:52 +1000)]
Declare `stoi` and `itos` when QCC_SUPPORT_INT

9 years agoRemove redundant assignment
TimePath [Sat, 18 Apr 2015 06:38:45 +0000 (06:38 +0000)]
Remove redundant assignment

9 years agoCouple more array fixes
Mario [Fri, 24 Apr 2015 12:15:10 +0000 (22:15 +1000)]
Couple more array fixes

9 years agoFew more floats to ints for arrays
Mario [Fri, 24 Apr 2015 12:11:50 +0000 (22:11 +1000)]
Few more floats to ints for arrays

9 years agoSome more floats to ints/bools
Mario [Fri, 24 Apr 2015 12:08:50 +0000 (22:08 +1000)]
Some more floats to ints/bools

9 years agoFix a few more floats, add the long awaited stob macro
Mario [Fri, 24 Apr 2015 12:02:12 +0000 (22:02 +1000)]
Fix a few more floats, add the long awaited stob macro

9 years agoBring back an old hack to fix spectator speed
Mario [Fri, 24 Apr 2015 10:18:06 +0000 (20:18 +1000)]
Bring back an old hack to fix spectator speed

9 years agoFix a few cases of var float
Mario [Fri, 24 Apr 2015 07:15:53 +0000 (17:15 +1000)]
Fix a few cases of var float

9 years agoMerge branch 'master' into Mario/combined_updates
Mario [Fri, 24 Apr 2015 05:33:48 +0000 (15:33 +1000)]
Merge branch 'master' into Mario/combined_updates

9 years agoAdd a couple of missing pieces for the impressive announcement
Mario [Fri, 24 Apr 2015 05:33:32 +0000 (15:33 +1000)]
Add a couple of missing pieces for the impressive announcement

9 years agoMerge branch 'master' into Mario/combined_updates
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

9 years agoConvert a load more floats into ints and bools
Mario [Fri, 24 Apr 2015 04:55:56 +0000 (14:55 +1000)]
Convert a load more floats into ints and bools

9 years agoEven more floats to bool/int
Mario [Thu, 23 Apr 2015 08:34:23 +0000 (18:34 +1000)]
Even more floats to bool/int

9 years agoSame as above
Mario [Thu, 23 Apr 2015 07:35:13 +0000 (17:35 +1000)]
Same as above

9 years agoAdd impressive announcement to vortex
Mario [Thu, 23 Apr 2015 07:33:06 +0000 (17:33 +1000)]
Add impressive announcement to vortex

9 years agoConvert some floats into ints
Mario [Thu, 23 Apr 2015 00:59:00 +0000 (10:59 +1000)]
Convert some floats into ints

9 years agoSome preparation for client side vehicles
Mario [Thu, 23 Apr 2015 00:58:03 +0000 (10:58 +1000)]
Some preparation for client side vehicles

9 years agoSupposedly fix rare case of "You are now alone!" message appearing at the end of...
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

9 years agoHardcode some more references to the player hitbox
Mario [Tue, 21 Apr 2015 06:17:25 +0000 (16:17 +1000)]
Hardcode some more references to the player hitbox

9 years agoHardcode flag hitbox size, rather than relying on player hitbox cvars
Mario [Mon, 20 Apr 2015 10:30:25 +0000 (20:30 +1000)]
Hardcode flag hitbox size, rather than relying on player hitbox cvars

9 years agoTurn the global hitbox/view offset cvars into stats (sv_ cvars shouldn't be used...
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)

9 years agoDon't enforce classname on items, also add an option to func_breakable to only break...
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)

9 years agoAllow overriding crush touch by setting g_player_crush lower than 0
Mario [Sun, 19 Apr 2015 06:25:18 +0000 (16:25 +1000)]
Allow overriding crush touch by setting g_player_crush lower than 0

9 years agoAdd the framework for a "goomba" type monster (for sidescrolling levels)
Mario [Sun, 19 Apr 2015 06:24:20 +0000 (16:24 +1000)]
Add the framework for a "goomba" type monster (for sidescrolling levels)

9 years agoFix player brightness
Mario [Sun, 19 Apr 2015 04:46:24 +0000 (14:46 +1000)]
Fix player brightness

9 years agoDelete some leftovers from merge
Mario [Sat, 18 Apr 2015 05:09:06 +0000 (15:09 +1000)]
Delete some leftovers from merge

9 years agoMerge branch 'master' into Mario/combined_updates
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

9 years agoMerge branch 'terencehill/unlimited_ammo_fixes' into 'master'
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

9 years agoLess ponies
Mario [Fri, 17 Apr 2015 04:42:53 +0000 (14:42 +1000)]
Less ponies

9 years agoUpdate credits
Mirio [Thu, 16 Apr 2015 00:10:12 +0000 (02:10 +0200)]
Update credits

9 years agoRemove an old unused model
Mario [Wed, 15 Apr 2015 22:49:44 +0000 (08:49 +1000)]
Remove an old unused model

9 years agoMerge branch 'master' into terencehill/unlimited_ammo_fixes
terencehill [Wed, 15 Apr 2015 22:47:56 +0000 (00:47 +0200)]
Merge branch 'master' into terencehill/unlimited_ammo_fixes

9 years agoMerge branch 'terencehill/preferred_focus' into 'master'
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

9 years agoAlso check if owner is in a vehicle when stopping the arc beam
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

9 years agoFix compile
Mario [Wed, 15 Apr 2015 02:05:06 +0000 (12:05 +1000)]
Fix compile

9 years agoFix target locking not working on turrets
Mario [Wed, 15 Apr 2015 01:22:26 +0000 (11:22 +1000)]
Fix target locking not working on turrets

9 years agoRevert changes to electro combos (too controversial, will move to a different branch)
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)

9 years agoMake work focus on preferred controls on dialog open (only root dialogs!). You can...
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).

9 years agoAs a temporary solution, force cl_sidespeed and cl_forwardspeed to match the maxspeed...
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)

9 years agoChanged wrong cvar in that balance config, fixed
Mirio [Thu, 9 Apr 2015 18:18:40 +0000 (20:18 +0200)]
Changed wrong cvar in that balance config, fixed

9 years agoLower midair radius for Electro, cause you were hurting yourself a lot by shooting...
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

9 years agoFix spectator speed (walking is still a bit off, but a different issue)
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)

9 years agoDon't immediately send name changes while you're typing (spam).
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.

9 years agoDon't show a clear textbox button in name entry fields.
Rudolf Polzer [Thu, 9 Apr 2015 13:02:20 +0000 (15:02 +0200)]
Don't show a clear textbox button in name entry fields.

9 years agoUse playerid instead of netaddress when setting a random name (player's IP should...
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)

9 years agoBeef up the chat
Mario [Wed, 8 Apr 2015 23:45:04 +0000 (09:45 +1000)]
Beef up the chat

9 years agoMerge some fixes from CTF updates branch
Mario [Tue, 7 Apr 2015 20:26:53 +0000 (06:26 +1000)]
Merge some fixes from CTF updates branch

9 years agoAllow items to fade out rather than disappear with distance, also add an option to...
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

9 years agoRemove some unused files
Mario [Tue, 7 Apr 2015 10:38:50 +0000 (20:38 +1000)]
Remove some unused files

9 years agoMake spawnflags & 1 act as noalign for buffs (matching old powerups/items)
Mario [Mon, 6 Apr 2015 15:24:56 +0000 (01:24 +1000)]
Make spawnflags & 1 act as noalign for buffs (matching old powerups/items)

9 years agoChange buff random spawn flag to prevent old items setting it
Mario [Mon, 6 Apr 2015 15:21:22 +0000 (01:21 +1000)]
Change buff random spawn flag to prevent old items setting it

9 years agoFix references to unfinished plasma ammo item
Mario [Mon, 6 Apr 2015 15:06:58 +0000 (01:06 +1000)]
Fix references to unfinished plasma ammo item

9 years agoFix references to unfinished plasma ammo type
Mario [Mon, 6 Apr 2015 15:02:34 +0000 (01:02 +1000)]
Fix references to unfinished plasma ammo type

9 years agoMerge branch 'master' into terencehill/unlimited_ammo_fixes
terencehill [Sun, 5 Apr 2015 22:54:48 +0000 (00:54 +0200)]
Merge branch 'master' into terencehill/unlimited_ammo_fixes

9 years agoMerge branch 'matthiaskrgr/hudsetup' into 'master'
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

9 years agoMerge branch 'terencehill/mapvote_cursor_fix' into 'master'
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

9 years agoFix for #1465 "joining server while on map selection screen locks cursor"
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.

9 years agoRemove boolean function
Mario [Sun, 5 Apr 2015 11:44:32 +0000 (21:44 +1000)]
Remove boolean function

9 years agoFor completeness, port step and follow movetypes (untested)
Mario [Sun, 5 Apr 2015 10:55:37 +0000 (20:55 +1000)]
For completeness, port step and follow movetypes (untested)

9 years agoHide some notification/effect system initialization messages
Mario [Sat, 4 Apr 2015 21:12:50 +0000 (07:12 +1000)]
Hide some notification/effect system initialization messages

9 years agoFix team change message showing for connecting clients
Mario [Sat, 4 Apr 2015 21:10:20 +0000 (07:10 +1000)]
Fix team change message showing for connecting clients

9 years agofix commands
Matthias Krüger [Sat, 4 Apr 2015 20:07:47 +0000 (22:07 +0200)]
fix commands

9 years agoUnlink more triggers
Mario [Fri, 3 Apr 2015 23:25:34 +0000 (10:25 +1100)]
Unlink more triggers

9 years agoDisable a few links for now (triggers are a bit rough)
Mario [Fri, 3 Apr 2015 20:18:17 +0000 (07:18 +1100)]
Disable a few links for now (triggers are a bit rough)

9 years agoAttempting a fix for funky ladders
Mario [Fri, 3 Apr 2015 20:13:40 +0000 (07:13 +1100)]
Attempting a fix for funky ladders

9 years agoPotentially fix a crash from flak
Mario [Fri, 3 Apr 2015 17:48:13 +0000 (04:48 +1100)]
Potentially fix a crash from flak

9 years agoUse CSQC prediction when cl_movement is 1 (2 uses old engine prediction)
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)

9 years agoRemove the old version
Mario [Fri, 3 Apr 2015 11:16:24 +0000 (22:16 +1100)]
Remove the old version

9 years agoMake prediction much more stable by re-porting ClientMovement_Move
Mario [Fri, 3 Apr 2015 11:15:00 +0000 (22:15 +1100)]
Make prediction much more stable by re-porting ClientMovement_Move

9 years agoMerge branch 'matthiaskrgr/hudsetup' into 'master'
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

9 years agoRevert experimental item updates
Mario [Fri, 3 Apr 2015 08:19:51 +0000 (19:19 +1100)]
Revert experimental item updates

9 years agoMerge branch 'Mario/buff_updates' into Mario/combined_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

9 years agoMerge branch 'master' into Mario/buff_updates
Mario [Fri, 3 Apr 2015 07:48:19 +0000 (18:48 +1100)]
Merge branch 'master' into Mario/buff_updates

9 years agoDon't link them to server's ticrate (seems to work a tiny bit better)
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)

9 years agoExperimental improvements to item networking (much more accurate, but still fails...
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)

9 years agoAdd an option to hide items further than a set distance away from the player (can...
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

9 years agoAdd support for old (Quake 3/Live) oneflag maps
Mario [Thu, 2 Apr 2015 05:11:42 +0000 (16:11 +1100)]
Add support for old (Quake 3/Live) oneflag maps

9 years agoUndo the important fix
Mario [Thu, 2 Apr 2015 03:27:26 +0000 (14:27 +1100)]
Undo the important fix

9 years agoPossibly fix showfps
Mario [Wed, 1 Apr 2015 08:22:15 +0000 (19:22 +1100)]
Possibly fix showfps

9 years agoAn actually important fix
Mario [Tue, 31 Mar 2015 16:48:23 +0000 (03:48 +1100)]
An actually important fix

9 years agoAdd an important fix
Mario [Tue, 31 Mar 2015 16:36:15 +0000 (03:36 +1100)]
Add an important fix

9 years agoMerge branch 'master' into Mario/combined_updates
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

9 years agoMerge branch 'Mario/crosshair_blink_fix' into 'master'
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

9 years agoDisable hit indication while spectating (serves no purpose as a spectator, disabling...
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)

9 years agoMerge branch 'Mario/accuracy_fix' into 'master'
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

9 years agoFix secondary fire taking accuracy off the overkill/instagib primary attacks
Mario [Tue, 31 Mar 2015 12:20:35 +0000 (23:20 +1100)]
Fix secondary fire taking accuracy off the overkill/instagib primary attacks

9 years agoTemporarily disable networking of ladders (abnormal ladder brushes are extending...
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)

9 years agoMerge branch 'Mario/nade_fixes' into 'master'
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

9 years agoMerge branch 'master' into Mario/nade_fixes
Mario [Fri, 27 Mar 2015 07:58:43 +0000 (18:58 +1100)]
Merge branch 'master' into Mario/nade_fixes

9 years agoUse an inversed color for buff progress bars (still doesn't look great, but slightly...
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)

9 years agoMerge branch 'master' into Mario/buff_updates
Mario [Thu, 26 Mar 2015 07:42:46 +0000 (18:42 +1100)]
Merge branch 'master' into Mario/buff_updates