]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Martin Taibr [Sun, 29 Oct 2017 00:36:16 +0000 (02:36 +0200)]
Merge branch 'master' into martin-t/okc2
terencehill [Tue, 24 Oct 2017 08:30:12 +0000 (10:30 +0200)]
Reduce some duplicated code
terencehill [Tue, 24 Oct 2017 07:59:55 +0000 (09:59 +0200)]
Reduce indentation level of 2 functions thanks to 2 early returns
terencehill [Mon, 23 Oct 2017 16:41:48 +0000 (18:41 +0200)]
Rename 2 macros
terencehill [Sun, 15 Oct 2017 11:11:20 +0000 (13:11 +0200)]
Fix event log reporting a name change event on connect
Mario [Sun, 15 Oct 2017 07:24:15 +0000 (17:24 +1000)]
Revert previous "fix" (didn't work)
terencehill [Fri, 13 Oct 2017 21:10:31 +0000 (23:10 +0200)]
Remove useless label
terencehill [Fri, 13 Oct 2017 21:09:27 +0000 (23:09 +0200)]
Add missing indentation
Mario [Fri, 13 Oct 2017 01:29:50 +0000 (11:29 +1000)]
Move netname_previous out of ClientState (possible fix for IRC bots showing a name change every match)
Mario [Thu, 12 Oct 2017 10:33:38 +0000 (20:33 +1000)]
Filter the target fields in spawnfuncs too, fixes CTS checkpoint waypoints
terencehill [Tue, 10 Oct 2017 20:01:06 +0000 (22:01 +0200)]
Check for invisible name only when player name changes
terencehill [Tue, 10 Oct 2017 19:56:23 +0000 (21:56 +0200)]
Invisible name check: detect all utf8 space characters
terencehill [Tue, 10 Oct 2017 19:49:28 +0000 (21:49 +0200)]
IS_REAL_CLIENT here too
Mario [Tue, 10 Oct 2017 07:16:27 +0000 (07:16 +0000)]
Merge branch 'matthiaskrgr/nadecountdown_nopicmip' into 'master'
shaders: mark nade countdown texture with nopicmip keyword
See merge request xonotic/xonotic-data.pk3dir!465
Mario [Tue, 10 Oct 2017 06:02:05 +0000 (16:02 +1000)]
Activate targets with the correct activator/trigger when a door is opening (possible fix for some very oddly handled CTS maps)
Mirio [Mon, 2 Oct 2017 14:09:20 +0000 (14:09 +0000)]
Update common.pot
Mirio [Mon, 2 Oct 2017 14:06:49 +0000 (14:06 +0000)]
Merge branch 'typofix' into 'master'
someone got too close _to_ someones rocket
See merge request xonotic/xonotic-data.pk3dir!500
Amadeusz Sławiński [Mon, 2 Oct 2017 12:52:27 +0000 (12:52 +0000)]
someone got to close _to_ someones rocket
TimePath [Sat, 30 Sep 2017 04:31:20 +0000 (04:31 +0000)]
Merge branch 'Lyberta/GenmodFix' into 'master'
Fixed genmod.sh
See merge request xonotic/xonotic-data.pk3dir!498
Lyberta [Thu, 28 Sep 2017 06:49:16 +0000 (09:49 +0300)]
Fixed genmod.sh
Mario [Sun, 24 Sep 2017 02:09:34 +0000 (02:09 +0000)]
Merge branch 'Lyberta/RandomStartWeapons' into 'master'
Random start weapons
See merge request xonotic/xonotic-data.pk3dir!468
Lyberta [Sat, 23 Sep 2017 19:18:36 +0000 (22:18 +0300)]
Fixed compilation units.
Lyberta [Sat, 23 Sep 2017 07:02:40 +0000 (10:02 +0300)]
Random start weapons: Rename i and j.
Lyberta [Sat, 23 Sep 2017 06:46:03 +0000 (09:46 +0300)]
Random start weapons: Make g_random_start_weapons an autocvar.
Lyberta [Sat, 23 Sep 2017 06:27:13 +0000 (09:27 +0300)]
Merge branch 'master' into Lyberta/RandomStartWeapons
Lyberta [Sat, 23 Sep 2017 06:26:35 +0000 (09:26 +0300)]
Random start weapons: Move ammo into an entity.
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
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
Lyberta [Sat, 23 Sep 2017 02:22:41 +0000 (05:22 +0300)]
New dynamic handicap algorithm.
terencehill [Wed, 20 Sep 2017 18:43:40 +0000 (20:43 +0200)]
Fix some wrongly indented curly braces
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
Martin Taibr [Wed, 20 Sep 2017 17:57:43 +0000 (19:57 +0200)]
fix vote timing out when none is called
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
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
terencehill [Mon, 18 Sep 2017 17:30:16 +0000 (19:30 +0200)]
Oops, fix build and shorten a few instructions
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
terencehill [Mon, 18 Sep 2017 12:03:46 +0000 (14:03 +0200)]
Fix reason string in the kick command displayed only partially
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))
terencehill [Mon, 18 Sep 2017 11:25:32 +0000 (13:25 +0200)]
privelages --> privileges
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
terencehill [Sat, 16 Sep 2017 13:48:36 +0000 (15:48 +0200)]
Remove intialization of .dmg for players as it isn't used anywhere
TimePath [Sat, 16 Sep 2017 04:34:54 +0000 (14:34 +1000)]
spawnfuncs: fix SV_OnEntityPreSpawnFunction
Lyberta [Sat, 16 Sep 2017 03:37:10 +0000 (06:37 +0300)]
Merge branch 'master' into Lyberta/URS3
TimePath [Sat, 16 Sep 2017 03:26:28 +0000 (13:26 +1000)]
Add missing generated files
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
Lyberta [Sat, 16 Sep 2017 02:37:33 +0000 (05:37 +0300)]
Handicap: Use ClientState.
Lyberta [Sat, 16 Sep 2017 02:33:26 +0000 (05:33 +0300)]
Dynamic handicap: removed debug code.
Mario [Wed, 13 Sep 2017 02:42:57 +0000 (12:42 +1000)]
Update ready and vote counts when a player becomes an observer
Lyberta [Sun, 10 Sep 2017 23:39:30 +0000 (02:39 +0300)]
Merge branch 'master' into Lyberta/DynamicHandicap
Lyberta [Sun, 10 Sep 2017 23:38:38 +0000 (02:38 +0300)]
Merge branch 'Lyberta/URS3' into Lyberta/RandomStartWeapons
Lyberta [Sun, 10 Sep 2017 23:19:54 +0000 (02:19 +0300)]
Merge branch 'master' into Lyberta/URS3
Martin Taibr [Sat, 9 Sep 2017 19:24:15 +0000 (21:24 +0200)]
Merge branch 'master' into martin-t/okc2
terencehill [Sat, 9 Sep 2017 13:06:02 +0000 (15:06 +0200)]
Fix compilation units test; update hash
TimePath [Sat, 9 Sep 2017 03:10:26 +0000 (13:10 +1000)]
Fix max_shot_distance
Lyberta [Thu, 7 Sep 2017 15:45:59 +0000 (18:45 +0300)]
URS: Fixed weapon spawning.
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)
terencehill [Wed, 6 Sep 2017 15:17:22 +0000 (17:17 +0200)]
More BITs (and less variables)
Lyberta [Wed, 6 Sep 2017 15:16:10 +0000 (18:16 +0300)]
URS: Better header inclusion.
terencehill [Wed, 6 Sep 2017 14:05:52 +0000 (16:05 +0200)]
Fix mixed tabs and spaces in some newly added code
Lyberta [Wed, 6 Sep 2017 11:45:48 +0000 (14:45 +0300)]
Merge branch 'Lyberta/URS3' into Lyberta/RandomStartWeapons
Lyberta [Wed, 6 Sep 2017 11:44:44 +0000 (14:44 +0300)]
Merge branch 'master' into Lyberta/URS3
Lyberta [Wed, 6 Sep 2017 11:44:09 +0000 (14:44 +0300)]
Merge branch 'master' into Lyberta/DynamicHandicap
TimePath [Wed, 6 Sep 2017 10:41:59 +0000 (20:41 +1000)]
Fix initialization of maxclients
Closes #1948
Lyberta [Wed, 6 Sep 2017 06:34:52 +0000 (09:34 +0300)]
Handicap: fixed compilation units.
Lyberta [Wed, 6 Sep 2017 05:55:03 +0000 (08:55 +0300)]
Added handicap API.
Lyberta [Mon, 4 Sep 2017 14:49:47 +0000 (17:49 +0300)]
Rerun genmod.sh.
Lyberta [Mon, 4 Sep 2017 14:40:24 +0000 (17:40 +0300)]
Typo.
Lyberta [Mon, 4 Sep 2017 14:33:31 +0000 (17:33 +0300)]
Added Dynamic handicap.
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
Martin Taibr [Sun, 3 Sep 2017 19:13:13 +0000 (21:13 +0200)]
Merge branch 'master' into martin-t/okc2
Lyberta [Sat, 2 Sep 2017 18:53:41 +0000 (21:53 +0300)]
Merge branch 'master' into Lyberta/TeamplayFixes_
Lyberta [Sat, 2 Sep 2017 18:51:57 +0000 (21:51 +0300)]
Random Start Weapons: Updated to URS3.
Lyberta [Sat, 2 Sep 2017 14:50:01 +0000 (17:50 +0300)]
Merge branch 'Lyberta/URS3' into Lyberta/RandomStartWeapons
Lyberta [Sat, 2 Sep 2017 14:19:30 +0000 (17:19 +0300)]
Merge branch 'master' into Lyberta/URS3
Lyberta [Sat, 2 Sep 2017 12:30:40 +0000 (15:30 +0300)]
URS: Fixed compilation units.
TimePath [Sat, 2 Sep 2017 09:55:58 +0000 (19:55 +1000)]
compilationunits.sh: accept arguments
TimePath [Sat, 2 Sep 2017 08:06:24 +0000 (18:06 +1000)]
CMake: really rebuild if the compiler changes
Lyberta [Sat, 2 Sep 2017 09:24:49 +0000 (12:24 +0300)]
USR: Ported ammo.
Lyberta [Sat, 2 Sep 2017 06:33:18 +0000 (09:33 +0300)]
Merge branch 'master' into Lyberta/RandomStartWeapons
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
Martin Taibr [Sat, 2 Sep 2017 01:47:00 +0000 (03:47 +0200)]
use expression to enable SNT
TimePath [Sat, 2 Sep 2017 01:30:30 +0000 (11:30 +1000)]
Make some mutators accept cvar expressions for being enabled
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
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
Lyberta [Fri, 1 Sep 2017 11:31:50 +0000 (14:31 +0300)]
URS: Change license to GPLv2+.
TimePath [Fri, 1 Sep 2017 10:10:29 +0000 (20:10 +1000)]
spawnfuncs: accept gameplay hash change
TimePath [Fri, 1 Sep 2017 09:31:50 +0000 (19:31 +1000)]
spawnfuncs: suppress some now visible warnings on init
TimePath [Fri, 1 Sep 2017 08:34:06 +0000 (18:34 +1000)]
spawnfuncs: hide original .classname
TimePath [Thu, 31 Aug 2017 10:37:27 +0000 (20:37 +1000)]
spawnfuncs: fix alternate worldspawn classnames
TimePath [Wed, 30 Aug 2017 11:47:00 +0000 (21:47 +1000)]
spawnfuncs: initial support for prototypical construction
TimePath [Wed, 30 Aug 2017 10:07:24 +0000 (20:07 +1000)]
spawnfuncs: fix SV_OnEntityPreSpawnFunction
TimePath [Tue, 29 Aug 2017 11:03:25 +0000 (21:03 +1000)]
Map bounds: assign reflectively to avoid triggering warning
TimePath [Tue, 29 Aug 2017 10:48:12 +0000 (20:48 +1000)]
Stats: don't assign to world
TimePath [Mon, 28 Aug 2017 12:12:35 +0000 (22:12 +1000)]
spawnfuncs: defer spawning until we say so
TimePath [Sun, 27 Aug 2017 11:40:42 +0000 (21:40 +1000)]
spawnfuncs: simplify SV_OnEntityPreSpawnFunction
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
Martin Taibr [Wed, 30 Aug 2017 17:11:18 +0000 (19:11 +0200)]
Merge branch 'master' into matthiaskrgr/nadecountdown_nopicmip
Lyberta [Wed, 30 Aug 2017 05:07:32 +0000 (08:07 +0300)]
Merge branch 'Lyberta/URS2' into Lyberta/RandomStartWeapons
Lyberta [Wed, 30 Aug 2017 05:05:00 +0000 (08:05 +0300)]
URS: Improved vampire buff.
Lyberta [Wed, 30 Aug 2017 04:34:31 +0000 (07:34 +0300)]
URS: Added GiveResourceWithLimit.
projects / xonotic / xonotic-data.pk3dir.git / log