]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
7 years agoremove indents from preprocessor macros
Martin Taibr [Sat, 23 Sep 2017 23:20:29 +0000 (01:20 +0200)]
remove indents from preprocessor macros

7 years agofix last uncrustify warning
Martin Taibr [Sat, 23 Sep 2017 16:10:58 +0000 (18:10 +0200)]
fix last uncrustify warning

7 years agoMerge branch 'master' into martin-t/uncrustify
Martin Taibr [Sat, 23 Sep 2017 16:03:48 +0000 (18:03 +0200)]
Merge branch 'master' into martin-t/uncrustify

7 years agomanually fix some ifdef heavy code
Martin Taibr [Sat, 23 Sep 2017 15:41:59 +0000 (17:41 +0200)]
manually fix some ifdef heavy code

7 years agoMerge branch 'Lyberta/DynamicHandicap2' into 'master'
Mario [Sat, 23 Sep 2017 05:34:15 +0000 (05:34 +0000)]
Merge branch 'Lyberta/DynamicHandicap2' into 'master'

New dynamic handicap algorithm.

See merge request xonotic/xonotic-data.pk3dir!494

7 years agosed IFTARGETED
Martin Taibr [Sat, 23 Sep 2017 04:30:12 +0000 (06:30 +0200)]
sed IFTARGETED

7 years agomanually fix viewloc
Martin Taibr [Sat, 23 Sep 2017 04:14:23 +0000 (06:14 +0200)]
manually fix viewloc

7 years agoMerge branch 'Lyberta/URS3' into 'master'
Mario [Sat, 23 Sep 2017 03:57:01 +0000 (03:57 +0000)]
Merge branch 'Lyberta/URS3' into 'master'

Unified resource system - step 3

See merge request xonotic/xonotic-data.pk3dir!484

7 years agos/EXP/POW
Martin Taibr [Sat, 23 Sep 2017 02:52:01 +0000 (04:52 +0200)]
s/EXP/POW

7 years agoremove newline between switch and { as other control statements
Martin Taibr [Sat, 23 Sep 2017 02:41:22 +0000 (04:41 +0200)]
remove newline between switch and { as other control statements

7 years agoNew dynamic handicap algorithm. 494/head
Lyberta [Sat, 23 Sep 2017 02:22:41 +0000 (05:22 +0300)]
New dynamic handicap algorithm.

7 years agoignore branches not updated in 2 years
Martin Taibr [Sat, 23 Sep 2017 00:35:21 +0000 (02:35 +0200)]
ignore branches not updated in 2 years

7 years agoprint last change
Martin Taibr [Sat, 23 Sep 2017 00:17:21 +0000 (02:17 +0200)]
print last change

7 years agoadjust some more options to result in fewer changes
Martin Taibr [Fri, 22 Sep 2017 23:48:57 +0000 (01:48 +0200)]
adjust some more options to result in fewer changes

7 years agohide labels from uncrustify
Martin Taibr [Fri, 22 Sep 2017 17:13:04 +0000 (19:13 +0200)]
hide labels from uncrustify

7 years agomacros, macros everywhere
Martin Taibr [Fri, 22 Sep 2017 16:01:43 +0000 (18:01 +0200)]
macros, macros everywhere

7 years agothe more this awful tool ignores the better
Martin Taibr [Fri, 22 Sep 2017 04:06:29 +0000 (06:06 +0200)]
the more this awful tool ignores the better

7 years agosemis after LAMBDA for uncrustify
Martin Taibr [Fri, 22 Sep 2017 03:40:26 +0000 (05:40 +0200)]
semis after LAMBDA for uncrustify

7 years agoput some braces back
Martin Taibr [Fri, 22 Sep 2017 03:27:28 +0000 (05:27 +0200)]
put some braces back

7 years agolet's see if this passes tests
Martin Taibr [Thu, 21 Sep 2017 19:22:58 +0000 (21:22 +0200)]
let's see if this passes tests

7 years agoscript to fix macros
Martin Taibr [Thu, 21 Sep 2017 19:22:42 +0000 (21:22 +0200)]
script to fix macros

7 years agodon't wrap lines
Martin Taibr [Thu, 21 Sep 2017 01:56:15 +0000 (03:56 +0200)]
don't wrap lines

7 years agoconvert ** to EXP() macro
Martin Taibr [Wed, 20 Sep 2017 22:25:43 +0000 (00:25 +0200)]
convert ** to EXP() macro

7 years agoFix some wrongly indented curly braces
terencehill [Wed, 20 Sep 2017 18:43:40 +0000 (20:43 +0200)]
Fix some wrongly indented curly braces

7 years agoMerge branch 'martin-t/votefix' into 'master'
terencehill [Wed, 20 Sep 2017 18:11:22 +0000 (18:11 +0000)]
Merge branch 'martin-t/votefix' into 'master'

Fix vote timing out when none is called

See merge request xonotic/xonotic-data.pk3dir!492

7 years agofix vote timing out when none is called 492/head
Martin Taibr [Wed, 20 Sep 2017 17:57:43 +0000 (19:57 +0200)]
fix vote timing out when none is called

7 years agofix indents inside macros
Martin Taibr [Wed, 20 Sep 2017 03:48:57 +0000 (05:48 +0200)]
fix indents inside macros

7 years agofix do while
Martin Taibr [Wed, 20 Sep 2017 03:43:32 +0000 (05:43 +0200)]
fix do while

7 years agoprevent uncrustify crash
Martin Taibr [Wed, 20 Sep 2017 03:34:38 +0000 (05:34 +0200)]
prevent uncrustify crash

7 years agoscript to uncrustify files not modified on branches
Martin Taibr [Tue, 19 Sep 2017 21:18:51 +0000 (23:18 +0200)]
script to uncrustify files not modified on branches

7 years agoMerge branch 'martin-t/dmgtextconfig' into 'master'
Mario [Tue, 19 Sep 2017 15:07:36 +0000 (15:07 +0000)]
Merge branch 'martin-t/dmgtextconfig' into 'master'

Put sv_damagetext to defaultServer so that resetting server reenables damagetext too

See merge request xonotic/xonotic-data.pk3dir!488

7 years agoChange output of a successful kick vote to not include reason twice and to always...
terencehill [Mon, 18 Sep 2017 18:27:03 +0000 (20:27 +0200)]
Change output of a successful kick vote to not include reason twice and to always include player entity number

7 years agoOops, fix build and shorten a few instructions
terencehill [Mon, 18 Sep 2017 17:30:16 +0000 (19:30 +0200)]
Oops, fix build and shorten a few instructions

7 years agoMerge branch 'martin-t/has_origin' into 'master'
Mario [Mon, 18 Sep 2017 15:49:20 +0000 (15:49 +0000)]
Merge branch 'martin-t/has_origin' into 'master'

Document potential bug in entcs

See merge request xonotic/xonotic-data.pk3dir!479

7 years agoFix reason string in the kick command displayed only partially
terencehill [Mon, 18 Sep 2017 12:03:46 +0000 (14:03 +0200)]
Fix reason string in the kick command displayed only partially

7 years agoFix vote length check (argv_start_index(startpos) returns index in the original vote...
terencehill [Mon, 18 Sep 2017 11:52:25 +0000 (13:52 +0200)]
Fix vote length check (argv_start_index(startpos) returns index in the original vote command string that included 2 more tokens (vote and call))

7 years agoprivelages --> privileges
terencehill [Mon, 18 Sep 2017 11:25:32 +0000 (13:25 +0200)]
privelages --> privileges

7 years agoput sv_damagetext to defaultServer so that resetting server reenables damagetext too 488/head
Martin Taibr [Sat, 16 Sep 2017 16:11:11 +0000 (18:11 +0200)]
put sv_damagetext to defaultServer so that resetting server reenables damagetext too

7 years agoRemove intialization of .dmg for players as it isn't used anywhere
terencehill [Sat, 16 Sep 2017 13:48:36 +0000 (15:48 +0200)]
Remove intialization of .dmg for players as it isn't used anywhere

7 years agospawnfuncs: fix SV_OnEntityPreSpawnFunction
TimePath [Sat, 16 Sep 2017 04:34:54 +0000 (14:34 +1000)]
spawnfuncs: fix SV_OnEntityPreSpawnFunction

7 years agoMerge branch 'master' into Lyberta/URS3
Lyberta [Sat, 16 Sep 2017 03:37:10 +0000 (06:37 +0300)]
Merge branch 'master' into Lyberta/URS3

7 years agoAdd missing generated files
TimePath [Sat, 16 Sep 2017 03:26:28 +0000 (13:26 +1000)]
Add missing generated files

7 years agoMerge branch 'Lyberta/DynamicHandicap' into 'master'
TimePath [Sat, 16 Sep 2017 03:20:32 +0000 (03:20 +0000)]
Merge branch 'Lyberta/DynamicHandicap' into 'master'

Dynamic handicap.

See merge request xonotic/xonotic-data.pk3dir!485

7 years agoHandicap: Use ClientState. 485/head
Lyberta [Sat, 16 Sep 2017 02:37:33 +0000 (05:37 +0300)]
Handicap: Use ClientState.

7 years agoDynamic handicap: removed debug code.
Lyberta [Sat, 16 Sep 2017 02:33:26 +0000 (05:33 +0300)]
Dynamic handicap: removed debug code.

7 years agoUpdate ready and vote counts when a player becomes an observer
Mario [Wed, 13 Sep 2017 02:42:57 +0000 (12:42 +1000)]
Update ready and vote counts when a player becomes an observer

7 years agoMerge branch 'master' into Lyberta/DynamicHandicap
Lyberta [Sun, 10 Sep 2017 23:39:30 +0000 (02:39 +0300)]
Merge branch 'master' into Lyberta/DynamicHandicap

7 years agoMerge branch 'master' into Lyberta/URS3
Lyberta [Sun, 10 Sep 2017 23:19:54 +0000 (02:19 +0300)]
Merge branch 'master' into Lyberta/URS3

7 years agoFix compilation units test; update hash
terencehill [Sat, 9 Sep 2017 13:06:02 +0000 (15:06 +0200)]
Fix compilation units test; update hash

7 years agoFix max_shot_distance
TimePath [Sat, 9 Sep 2017 03:10:26 +0000 (13:10 +1000)]
Fix max_shot_distance

7 years agoURS: Fixed weapon spawning.
Lyberta [Thu, 7 Sep 2017 15:45:59 +0000 (18:45 +0300)]
URS: Fixed weapon spawning.

7 years agoFix bots waiting for a teamed item to spawn again once they got it (e.g. megas and...
terencehill [Wed, 6 Sep 2017 15:24:40 +0000 (17:24 +0200)]
Fix bots waiting for a teamed item to spawn again once they got it (e.g. megas and powerups of mental-gap-beta4)

7 years agoMore BITs (and less variables)
terencehill [Wed, 6 Sep 2017 15:17:22 +0000 (17:17 +0200)]
More BITs (and less variables)

7 years agoURS: Better header inclusion.
Lyberta [Wed, 6 Sep 2017 15:16:10 +0000 (18:16 +0300)]
URS: Better header inclusion.

7 years agoFix mixed tabs and spaces in some newly added code
terencehill [Wed, 6 Sep 2017 14:05:52 +0000 (16:05 +0200)]
Fix mixed tabs and spaces in some newly added code

7 years agoMerge branch 'master' into Lyberta/URS3
Lyberta [Wed, 6 Sep 2017 11:44:44 +0000 (14:44 +0300)]
Merge branch 'master' into Lyberta/URS3

7 years agoMerge branch 'master' into Lyberta/DynamicHandicap
Lyberta [Wed, 6 Sep 2017 11:44:09 +0000 (14:44 +0300)]
Merge branch 'master' into Lyberta/DynamicHandicap

7 years agoFix initialization of maxclients
TimePath [Wed, 6 Sep 2017 10:41:59 +0000 (20:41 +1000)]
Fix initialization of maxclients

Closes #1948

7 years agoHandicap: fixed compilation units.
Lyberta [Wed, 6 Sep 2017 06:34:52 +0000 (09:34 +0300)]
Handicap: fixed compilation units.

7 years agoAdded handicap API.
Lyberta [Wed, 6 Sep 2017 05:55:03 +0000 (08:55 +0300)]
Added handicap API.

7 years agoRerun genmod.sh.
Lyberta [Mon, 4 Sep 2017 14:49:47 +0000 (17:49 +0300)]
Rerun genmod.sh.

7 years agoTypo.
Lyberta [Mon, 4 Sep 2017 14:40:24 +0000 (17:40 +0300)]
Typo.

7 years agoAdded Dynamic handicap.
Lyberta [Mon, 4 Sep 2017 14:33:31 +0000 (17:33 +0300)]
Added Dynamic handicap.

7 years agoMerge branch 'Lyberta/TeamplayFixes_' into 'master'
Mario [Mon, 4 Sep 2017 00:17:53 +0000 (00:17 +0000)]
Merge branch 'Lyberta/TeamplayFixes_' into 'master'

Teamplay fixes and improvements

See merge request !423

7 years agoMerge branch 'master' into Lyberta/TeamplayFixes_
Lyberta [Sat, 2 Sep 2017 18:53:41 +0000 (21:53 +0300)]
Merge branch 'master' into Lyberta/TeamplayFixes_

7 years agoMerge branch 'master' into Lyberta/URS3
Lyberta [Sat, 2 Sep 2017 14:19:30 +0000 (17:19 +0300)]
Merge branch 'master' into Lyberta/URS3

7 years agoURS: Fixed compilation units.
Lyberta [Sat, 2 Sep 2017 12:30:40 +0000 (15:30 +0300)]
URS: Fixed compilation units.

7 years agocompilationunits.sh: accept arguments
TimePath [Sat, 2 Sep 2017 09:55:58 +0000 (19:55 +1000)]
compilationunits.sh: accept arguments

7 years agoCMake: really rebuild if the compiler changes
TimePath [Sat, 2 Sep 2017 08:06:24 +0000 (18:06 +1000)]
CMake: really rebuild if the compiler changes

7 years agoUSR: Ported ammo.
Lyberta [Sat, 2 Sep 2017 09:24:49 +0000 (12:24 +0300)]
USR: Ported ammo.

7 years agoMerge branch 'martin-t/snt' into 'master'
TimePath [Sat, 2 Sep 2017 02:09:18 +0000 (02:09 +0000)]
Merge branch 'martin-t/snt' into 'master'

Disable SNT in ft and as

See merge request !480

7 years agouse expression to enable SNT 480/head
Martin Taibr [Sat, 2 Sep 2017 01:47:00 +0000 (03:47 +0200)]
use expression to enable SNT

7 years agoMake some mutators accept cvar expressions for being enabled
TimePath [Sat, 2 Sep 2017 01:30:30 +0000 (11:30 +1000)]
Make some mutators accept cvar expressions for being enabled

7 years agoMerge branch 'TimePath/spawnfuncs' into 'master'
TimePath [Sat, 2 Sep 2017 00:05:37 +0000 (00:05 +0000)]
Merge branch 'TimePath/spawnfuncs' into 'master'

Control spawnfuncs from QuakeC

See merge request !483

7 years agoMerge branch 'Lyberta/URS2' into 'master'
TimePath [Fri, 1 Sep 2017 23:47:48 +0000 (23:47 +0000)]
Merge branch 'Lyberta/URS2' into 'master'

Unified resource system - step 2

See merge request !474

7 years agoURS: Change license to GPLv2+. 474/head
Lyberta [Fri, 1 Sep 2017 11:31:50 +0000 (14:31 +0300)]
URS: Change license to GPLv2+.

7 years agospawnfuncs: accept gameplay hash change 483/head
TimePath [Fri, 1 Sep 2017 10:10:29 +0000 (20:10 +1000)]
spawnfuncs: accept gameplay hash change

7 years agospawnfuncs: suppress some now visible warnings on init
TimePath [Fri, 1 Sep 2017 09:31:50 +0000 (19:31 +1000)]
spawnfuncs: suppress some now visible warnings on init

7 years agospawnfuncs: hide original .classname
TimePath [Fri, 1 Sep 2017 08:34:06 +0000 (18:34 +1000)]
spawnfuncs: hide original .classname

7 years agospawnfuncs: fix alternate worldspawn classnames
TimePath [Thu, 31 Aug 2017 10:37:27 +0000 (20:37 +1000)]
spawnfuncs: fix alternate worldspawn classnames

7 years agospawnfuncs: initial support for prototypical construction
TimePath [Wed, 30 Aug 2017 11:47:00 +0000 (21:47 +1000)]
spawnfuncs: initial support for prototypical construction

7 years agospawnfuncs: fix SV_OnEntityPreSpawnFunction
TimePath [Wed, 30 Aug 2017 10:07:24 +0000 (20:07 +1000)]
spawnfuncs: fix SV_OnEntityPreSpawnFunction

7 years agoMap bounds: assign reflectively to avoid triggering warning
TimePath [Tue, 29 Aug 2017 11:03:25 +0000 (21:03 +1000)]
Map bounds: assign reflectively to avoid triggering warning

7 years agoStats: don't assign to world
TimePath [Tue, 29 Aug 2017 10:48:12 +0000 (20:48 +1000)]
Stats: don't assign to world

7 years agospawnfuncs: defer spawning until we say so
TimePath [Mon, 28 Aug 2017 12:12:35 +0000 (22:12 +1000)]
spawnfuncs: defer spawning until we say so

7 years agospawnfuncs: simplify SV_OnEntityPreSpawnFunction
TimePath [Sun, 27 Aug 2017 11:40:42 +0000 (21:40 +1000)]
spawnfuncs: simplify SV_OnEntityPreSpawnFunction

7 years agoAdd a note about the reserved nade projectile IDs in the main projectile file
Mario [Fri, 1 Sep 2017 00:35:27 +0000 (10:35 +1000)]
Add a note about the reserved nade projectile IDs in the main projectile file

7 years agoURS: Improved vampire buff.
Lyberta [Wed, 30 Aug 2017 05:05:00 +0000 (08:05 +0300)]
URS: Improved vampire buff.

7 years agoURS: Added GiveResourceWithLimit.
Lyberta [Wed, 30 Aug 2017 04:34:31 +0000 (07:34 +0300)]
URS: Added GiveResourceWithLimit.

7 years agoMerge branch 'master' into Lyberta/URS2
Lyberta [Wed, 30 Aug 2017 03:55:07 +0000 (06:55 +0300)]
Merge branch 'master' into Lyberta/URS2

7 years agoURS: Better hard limit description.
Lyberta [Tue, 29 Aug 2017 23:38:32 +0000 (02:38 +0300)]
URS: Better hard limit description.

7 years agoURS: Added file info.
Lyberta [Tue, 29 Aug 2017 22:06:45 +0000 (01:06 +0300)]
URS: Added file info.

7 years agodisable SNT in ft and as
Martin Taibr [Tue, 29 Aug 2017 18:02:19 +0000 (20:02 +0200)]
disable SNT in ft and as

7 years agodocument potential bug in entcs
Martin Taibr [Tue, 29 Aug 2017 01:59:56 +0000 (03:59 +0200)]
document potential bug in entcs

7 years agoMerge branch 'martin-t/dmgtext' into 'master'
Mario [Tue, 29 Aug 2017 01:41:39 +0000 (01:41 +0000)]
Merge branch 'martin-t/dmgtext' into 'master'

Document spectatee_status, disable 2d dmgtext for observers

See merge request !477

7 years agoURS: Refactored Item_GiveAmmoTo.
Lyberta [Tue, 29 Aug 2017 01:38:48 +0000 (04:38 +0300)]
URS: Refactored Item_GiveAmmoTo.

7 years agoURS: Fixed compilation unit.
Lyberta [Tue, 29 Aug 2017 01:07:06 +0000 (04:07 +0300)]
URS: Fixed compilation unit.

7 years agoURS: Ported g_damage.qc to URS.
Lyberta [Tue, 29 Aug 2017 00:19:16 +0000 (03:19 +0300)]
URS: Ported g_damage.qc to URS.

7 years agoURS: Ported Nades mutator to URS.
Lyberta [Mon, 28 Aug 2017 23:55:38 +0000 (02:55 +0300)]
URS: Ported Nades mutator to URS.

7 years agoURS: Ported NIX mutator to URS.
Lyberta [Mon, 28 Aug 2017 23:34:01 +0000 (02:34 +0300)]
URS: Ported NIX mutator to URS.