]> git.rm.cloudns.org Git - xonotic/xonotic.git/log
xonotic/xonotic.git
8 years agoUpdate gitignore
TimePath [Thu, 14 Apr 2016 12:39:17 +0000 (22:39 +1000)]
Update gitignore

8 years agoMerge branch 'TimePath/cmake'
TimePath [Thu, 14 Apr 2016 04:21:46 +0000 (14:21 +1000)]
Merge branch 'TimePath/cmake'

8 years agoCMake: make everything optional
TimePath [Thu, 14 Apr 2016 04:16:06 +0000 (14:16 +1000)]
CMake: make everything optional

8 years agoCMake: incremental pk3 building
TimePath [Mon, 21 Mar 2016 23:47:42 +0000 (10:47 +1100)]
CMake: incremental pk3 building

8 years agoCMake: port most of the release script
TimePath [Mon, 21 Mar 2016 12:08:11 +0000 (23:08 +1100)]
CMake: port most of the release script

8 years agoAdd CMakeLists.txt
TimePath [Sat, 19 Mar 2016 04:19:17 +0000 (15:19 +1100)]
Add CMakeLists.txt

8 years agoRemove some old cvars from server.cfg
Mario [Thu, 24 Mar 2016 17:09:19 +0000 (03:09 +1000)]
Remove some old cvars from server.cfg

8 years agoFix MSYS2 xonotic-data.pk3dir/qcsrc rebuild detection
TimePath [Sat, 19 Mar 2016 05:09:17 +0000 (16:09 +1100)]
Fix MSYS2 xonotic-data.pk3dir/qcsrc rebuild detection

8 years agoUpdate Windows SDL to 2.0.4.
Rudolf Polzer [Mon, 14 Mar 2016 15:51:12 +0000 (16:51 +0100)]
Update Windows SDL to 2.0.4.

8 years agoUpdate Mac OS X SDL framework to 2.0.4
Mario [Sun, 13 Mar 2016 01:45:55 +0000 (17:45 -0800)]
Update Mac OS X SDL framework to 2.0.4

8 years agoMerge branch 'packer/fix_team_chat_beep' into 'master'
TimePath [Mon, 11 Jan 2016 00:23:37 +0000 (00:23 +0000)]
Merge branch 'packer/fix_team_chat_beep' into 'master'

fix team chat beep sound

There are two beep sounds :
* General chat and (**talk.wav**)
* team messages (**talk2.wav**)

These should not be converted to **ogg**, otherwise the engine does not find **talk2.wav**.

See: https://gitlab.com/xonotic/darkplaces/blob/div0-stable/cl_parse.c#L517

This causes that the beep sound for general chat is used for team messages, too.

The script *cached_converter.sh* already tries excludes them (But uses wrong path.)

See merge request !15

8 years agofix team chat beep sound 15/head
packer [Sun, 10 Jan 2016 23:57:40 +0000 (00:57 +0100)]
fix team chat beep sound

9 years agoFix bot scripts.
Rudolf Polzer [Mon, 12 Oct 2015 01:00:26 +0000 (03:00 +0200)]
Fix bot scripts.

9 years agoAllow remapping a channel to multiple channels (to duplicate notes).
Rudolf Polzer [Mon, 12 Oct 2015 00:32:09 +0000 (02:32 +0200)]
Allow remapping a channel to multiple channels (to duplicate notes).

9 years agoStart the version update notifier.
Rudolf Polzer [Wed, 30 Sep 2015 16:04:17 +0000 (18:04 +0200)]
Start the version update notifier.

9 years agoMake the Xonotic maps no longer exempt of the sRGB requirement, now that all fulfill...
Rudolf Polzer [Wed, 9 Sep 2015 13:36:00 +0000 (15:36 +0200)]
Make the Xonotic maps no longer exempt of the sRGB requirement, now that all fulfill it. YIIIEEEEAAAAAHHH!!1

9 years agoFix msg 57
Mirio [Wed, 2 Sep 2015 17:11:16 +0000 (19:11 +0200)]
Fix msg 57

9 years agoFix msg 39
Mirio [Mon, 31 Aug 2015 17:05:31 +0000 (19:05 +0200)]
Fix msg 39

9 years agoFix an endless loop in the-big-benchmark on Windows affecting all users.
Rudolf Polzer [Wed, 26 Aug 2015 12:07:52 +0000 (14:07 +0200)]
Fix an endless loop in the-big-benchmark on Windows affecting all users.

9 years agoPass the input path. xonotic-v0.8.1
Rudolf Polzer [Tue, 25 Aug 2015 01:55:38 +0000 (03:55 +0200)]
Pass the input path.

9 years agoTry adding the Luma version builder.
Rudolf Polzer [Tue, 25 Aug 2015 01:48:37 +0000 (03:48 +0200)]
Try adding the Luma version builder.

9 years agoMerge branch 'Mirio/helpsystem' into 'master'
Mirio [Sun, 23 Aug 2015 14:17:17 +0000 (14:17 +0000)]
Merge branch 'Mirio/helpsystem' into 'master'

Mirio/helpsystem

Fixing the first message, the nick color, add some colors to highlight words.

See merge request !13

9 years agoColors are now fixed
Mirio [Thu, 20 Aug 2015 23:44:48 +0000 (01:44 +0200)]
Colors are now fixed

9 years agoColor codes were removed sigh
Mirio [Thu, 20 Aug 2015 23:38:00 +0000 (01:38 +0200)]
Color codes were removed sigh

9 years agoFix an error when using help_loop
Mirio [Thu, 20 Aug 2015 23:32:59 +0000 (01:32 +0200)]
Fix an error when using help_loop

9 years agoFix typo in msg 35
Mirio [Thu, 20 Aug 2015 23:24:49 +0000 (01:24 +0200)]
Fix typo in msg 35

9 years agoFix quotation in msg 1, which broke it. Fix color code of nick, add some color highlights
Mirio [Thu, 20 Aug 2015 23:22:49 +0000 (01:22 +0200)]
Fix quotation in msg 1, which broke it. Fix color code of nick, add some color highlights

9 years agoDisable hotfix and set new recommended servers
Mario [Tue, 18 Aug 2015 22:15:35 +0000 (08:15 +1000)]
Disable hotfix and set new recommended servers

9 years agoMerge branch 'sev/unifont_update' into 'master'
Rudolf Polzer [Mon, 3 Aug 2015 16:14:34 +0000 (16:14 +0000)]
Merge branch 'sev/unifont_update' into 'master'

Unifont update

This branch updates the GNU Unifont from version 5.1 to version 7.0.06.
It also makes two changes which I consider useful:

- Remove the version string from the font file name.
This way, any future updates will not invalidate all references to the font. A problem that is illustrated with this update.

- Move the Unifont to a dedicated package. Currently, individual copies are added to the other font packages.
This causes a lot of redundancy. More importantly, it gives the impression that this is necessary for custom fonts as well,
causing more redundancy and inconsistencies if the unifont is shared in custom font pk3 archives.
This change also eliminates possible confusions about authorship of the fonts.

See merge request !7

9 years agoMerge branch 'sev/xolonium3' into 'master'
Mario [Sun, 2 Aug 2015 13:02:22 +0000 (13:02 +0000)]
Merge branch 'sev/xolonium3' into 'master'

Update Xolonium font to version 3.1

This merge request accompanies xonotic/xonotic-data.pk3dir!144

Also see http://forums.xonotic.org/showthread.php?tid=5466

See merge request !11

9 years agoUpdate server readme.txt
Mario [Thu, 30 Jul 2015 05:24:54 +0000 (15:24 +1000)]
Update server readme.txt

9 years agoMore improvements by packer
Mirio [Mon, 27 Jul 2015 17:40:05 +0000 (19:40 +0200)]
More improvements by packer

9 years agoSigh
Mirio [Mon, 27 Jul 2015 16:20:39 +0000 (18:20 +0200)]
Sigh

9 years agoFix sentence about Arc
Mirio [Mon, 27 Jul 2015 16:18:15 +0000 (18:18 +0200)]
Fix sentence about Arc

9 years agoFix #146
Mirio [Mon, 27 Jul 2015 16:13:51 +0000 (18:13 +0200)]
Fix #146

9 years agoFix 146
Mirio [Mon, 27 Jul 2015 16:11:50 +0000 (18:11 +0200)]
Fix  146

9 years agoMerge branch 'master' of gitlab.com:xonotic/xonotic into sev/xolonium3
Severin Meyer [Thu, 9 Jul 2015 08:52:25 +0000 (10:52 +0200)]
Merge branch 'master' of gitlab.com:xonotic/xonotic into sev/xolonium3

9 years agoMerge branch 'BuddyFriendGuy/fixVolumeReset' into 'master'
Ant Zucaro [Tue, 23 Jun 2015 12:56:37 +0000 (12:56 +0000)]
Merge branch 'BuddyFriendGuy/fixVolumeReset' into 'master'

fix volume value preservation bug in NexuizDemoRecorder

Symptom: In the original code, the user's original volume value is not preserved (the default behavior is to mute the volume during fast forward) so the program fails to set the correct volume value back -- in fact it sets it to an illegal variable name.

Code problem: This bug happens in the case of user choosing to record the demo early on, i.e. the loop enters the second stage right away, so injectAtStart was never executed. Besides, srvLoop and firstLoop seem to do the same thing.

Fix: Make sure injectAtStart is executed exactly once.

See merge request !12

9 years agoMerge branch 'master' of gitlab.com:xonotic/xonotic into sev/xolonium3
Severin Meyer [Thu, 11 Jun 2015 17:30:52 +0000 (19:30 +0200)]
Merge branch 'master' of gitlab.com:xonotic/xonotic into sev/xolonium3

9 years agoMerge branch 'master' of gitlab.com:xonotic/xonotic into sev/unifont_update
Severin Meyer [Thu, 11 Jun 2015 17:27:33 +0000 (19:27 +0200)]
Merge branch 'master' of gitlab.com:xonotic/xonotic into sev/unifont_update

Conflicts:
data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
data/font-xolonium.pk3dir/font-xolonium.cfg

9 years agoUpdate Xolonium font to version 3.1
Severin Meyer [Thu, 11 Jun 2015 15:14:40 +0000 (17:14 +0200)]
Update Xolonium font to version 3.1

9 years agooops, typo
Rudolf Polzer [Fri, 5 Jun 2015 20:13:59 +0000 (22:13 +0200)]
oops, typo

9 years agosetmodelindex also relinks
Rudolf Polzer [Fri, 5 Jun 2015 20:12:27 +0000 (22:12 +0200)]
setmodelindex also relinks

9 years agosetorigin also relinks, mention this
Rudolf Polzer [Thu, 4 Jun 2015 14:04:42 +0000 (16:04 +0200)]
setorigin also relinks, mention this

9 years agoIt's nicer with []
Rudolf Polzer [Thu, 4 Jun 2015 14:03:00 +0000 (16:03 +0200)]
It's nicer with []

9 years agoFix detection of setorigin/setsize/setmodel.
Rudolf Polzer [Thu, 4 Jun 2015 13:55:37 +0000 (15:55 +0200)]
Fix detection of setorigin/setsize/setmodel.

9 years agoDetect assignment to foo.solid without a call to setmodel/setsize following it.
Rudolf Polzer [Thu, 4 Jun 2015 12:59:07 +0000 (14:59 +0200)]
Detect assignment to foo.solid without a call to setmodel/setsize following it.

9 years agoAlso find setmodel, setsize builtins.
Rudolf Polzer [Thu, 4 Jun 2015 12:02:40 +0000 (14:02 +0200)]
Also find setmodel, setsize builtins.

9 years agoFix field names displayed for gmqcc progs.
Rudolf Polzer [Thu, 4 Jun 2015 11:56:25 +0000 (13:56 +0200)]
Fix field names displayed for gmqcc progs.

9 years agoLNO support.
Rudolf Polzer [Thu, 4 Jun 2015 10:57:43 +0000 (12:57 +0200)]
LNO support.

9 years agoMerge branch 'terencehill/font_fix' into 'master'
Rudolf Polzer [Mon, 18 May 2015 14:12:51 +0000 (14:12 +0000)]
Merge branch 'terencehill/font_fix' into 'master'

Fix for a minor font issue

Apply commit 6909a1d4e: "Also load the menu bold font at size 12 as we are using that." to the other font configs too. It completely fixes xonotic/xonotic-data.pk3dir#1432 "Header labels flicker"

See merge request !10

9 years agofix previous commit's bug; now the loop logic is the same as the original version...
BuddyFriendGuy [Sat, 16 May 2015 04:19:54 +0000 (00:19 -0400)]
fix previous commit's bug; now the loop logic is the same as the original version, except for injectAtStart is surely to run once

9 years agoremove unnecessary variable
BuddyFriendGuy [Sat, 16 May 2015 03:40:23 +0000 (23:40 -0400)]
remove unnecessary variable

9 years agofix volume value preservation bug
BuddyFriendGuy [Sat, 16 May 2015 03:36:13 +0000 (23:36 -0400)]
fix volume value preservation bug

9 years agoUpdate Xolonium font to version 3.0
Severin Meyer [Mon, 4 May 2015 17:13:18 +0000 (19:13 +0200)]
Update Xolonium font to version 3.0

9 years agoApply commit 6909a1d4e: "Also load the menu bold font at size 12 as we are using...
terencehill [Mon, 27 Apr 2015 13:06:52 +0000 (15:06 +0200)]
Apply commit 6909a1d4e: "Also load the menu bold font at size 12 as we are using that." to the other font configs too. It completely fixes #1432 "Header labels flicker"

9 years agoMerge branch 'BuddyFriendGuy/rid_scr_centersize' into 'master'
Mario [Sat, 25 Apr 2015 00:36:13 +0000 (00:36 +0000)]
Merge branch 'BuddyFriendGuy/rid_scr_centersize' into 'master'

got rid of remaining scr_centersize that was removed in 6a966ce59127e888e11aa8dded8809e2e0b78f71

scr_centersize was removed in https://gitlab.com/xonotic/xonotic-data.pk3dir/commit/6a966ce59127e888e11aa8dded8809e2e0b78f71 but some cfg for fonts still use it, causing warnings. See the discussion on http://forums.xonotic.org/showthread.php?tid=5262

See merge request !9

9 years agogot rid of remaining scr_centersize that was removed in 6a966ce59127e888e11aa8dded880...
BuddyFriendGuy [Fri, 24 Apr 2015 19:26:03 +0000 (15:26 -0400)]
got rid of remaining scr_centersize that was removed in 6a966ce59127e888e11aa8dded8809e2e0b78f71

9 years agoAdd a command ./all serverbench dedicated to quickly run serverbench.
Rudolf Polzer [Sun, 1 Feb 2015 17:58:11 +0000 (18:58 +0100)]
Add a command ./all serverbench dedicated to quickly run serverbench.

9 years agoMerge branch 'mrbougo/win-rsync-filenames' into 'master'
Rudolf Polzer [Tue, 27 Jan 2015 13:14:29 +0000 (13:14 +0000)]
Merge branch 'mrbougo/win-rsync-filenames' into 'master'

Mrbougo/win rsync filenames

This should fix issue #120.

See merge request !8

9 years agoupdate filenames to SDL and 64bit defaults in Windows rsync updaters
MrBougo [Sun, 25 Jan 2015 19:53:20 +0000 (20:53 +0100)]
update filenames to SDL and 64bit defaults in Windows rsync updaters

9 years agoVersion bump for the notification
Rudolf Polzer [Tue, 20 Jan 2015 20:11:33 +0000 (21:11 +0100)]
Version bump for the notification

9 years agoHotfix the chat bubble for 0.8.
Rudolf Polzer [Sun, 18 Jan 2015 15:47:01 +0000 (07:47 -0800)]
Hotfix the chat bubble for 0.8.

9 years agoRemove usage of resedit.exe, as it no longer works anyway.
Rudolf Polzer [Sun, 18 Jan 2015 15:34:42 +0000 (07:34 -0800)]
Remove usage of resedit.exe, as it no longer works anyway.

9 years agoAlso load the menu bold font at size 12 as we are using that. xonotic-v0.8.0
Rudolf Polzer [Sun, 11 Jan 2015 20:34:45 +0000 (12:34 -0800)]
Also load the menu bold font at size 12 as we are using that.

9 years agox64 is the new default. Let x86 get the odd name instead then.
Rudolf Polzer [Thu, 8 Jan 2015 16:47:43 +0000 (17:47 +0100)]
x64 is the new default. Let x86 get the odd name instead then.

9 years agoFix xonotic.exe name
Rudolf Polzer [Sun, 4 Jan 2015 13:22:30 +0000 (14:22 +0100)]
Fix xonotic.exe name

9 years agoMake SDL the default build everywhere in releases.
Rudolf Polzer [Sat, 3 Jan 2015 16:00:40 +0000 (17:00 +0100)]
Make SDL the default build everywhere in releases.

Only really affects Win32, for other platform this merely changes the build order/priority.

10 years agoUpdate GNU Unifont to version 7.0.06, create a dedicated package for it
Severin Meyer [Fri, 26 Dec 2014 00:18:56 +0000 (01:18 +0100)]
Update GNU Unifont to version 7.0.06, create a dedicated package for it

10 years agoMerge branch 'sev/xolonium' into 'master'
Rudolf Polzer [Tue, 23 Dec 2014 21:47:58 +0000 (21:47 +0000)]
Merge branch 'sev/xolonium' into 'master'

Xolonium font update

Since Xolonium version 2.0 (current master), I've added various pictographs and emoticons to the font,
to provide a Unicode compatible replacement of the legacy special characters.

Note:
I'm currently working on version 3.0 of Xolonium, which is a major (and hopefully final) revision.
However, it might not be ready for Xonotic 0.8. Hence I've pushed the preliminary version 2.4, which
includes up-to-date changes to the pictograph assignments.

See merge request !6

10 years agoMerge branch 'master' into sev/xolonium
Severin Meyer [Tue, 23 Dec 2014 19:48:00 +0000 (20:48 +0100)]
Merge branch 'master' into sev/xolonium

Conflicts:
data/font-xolonium.pk3dir/font-xolonium.cfg

10 years agoUpdate Xolonium font to version 2.4
Severin Meyer [Tue, 23 Dec 2014 19:23:40 +0000 (20:23 +0100)]
Update Xolonium font to version 2.4

10 years agoAdd some recommended servers to the list
Mario [Sat, 20 Dec 2014 03:07:42 +0000 (14:07 +1100)]
Add some recommended servers to the list

10 years agoFix build failure detection.
Rudolf Polzer [Fri, 5 Dec 2014 15:47:17 +0000 (16:47 +0100)]
Fix build failure detection.

10 years agoMerge branch 'nyov/wiki' into 'master'
Mario [Thu, 27 Nov 2014 08:34:30 +0000 (08:34 +0000)]
Merge branch 'nyov/wiki' into 'master'

gitignore new wiki repo

I'm sorry I forgot this in the original commit.

See merge request !5

10 years agoand gitignore the wiki, too
nyov [Thu, 27 Nov 2014 08:08:37 +0000 (08:08 +0000)]
and gitignore the wiki, too

10 years agoMerge branch 'nyov/instagib-rename' into 'master'
Mario [Thu, 27 Nov 2014 05:39:59 +0000 (05:39 +0000)]
Merge branch 'nyov/instagib-rename' into 'master'

instagib rename

See merge request !4

10 years agoRenaming MinstaGib mode to InstaGib, as per xonvote (#31)
nyov [Sun, 16 Nov 2014 04:46:13 +0000 (04:46 +0000)]
Renaming MinstaGib mode to InstaGib, as per xonvote (#31)

10 years agoMerge branch 'nyov/wiki' into 'master'
Rudolf Polzer [Wed, 26 Nov 2014 11:52:16 +0000 (11:52 +0000)]
Merge branch 'nyov/wiki' into 'master'

Allow cloning wiki from './all'

This enables cloning the wiki by adding a `wiki.yes` file for `all`.

As the setup stands, it would require @divVerent to mirror the repo first at de.x.o before this can work.
(Alternatively re-enable gitlab as a valid location named `lab` and `./all update -l lab` to test or use it.)

See merge request !1

10 years agoMerge branch 'nyov/recompile-qc' into 'master'
Mario [Thu, 13 Nov 2014 17:50:58 +0000 (17:50 +0000)]
Merge branch 'nyov/recompile-qc' into 'master'

switch for 'all' to (re)compile qc only

I've been using this locally for a while, I think it would make sense to have.

See merge request !2

10 years agoswitch for 'all' to (re)compile qc only
nyov [Thu, 13 Nov 2014 10:10:54 +0000 (10:10 +0000)]
switch for 'all' to (re)compile qc only

10 years agooptionally clone wiki
nyov [Thu, 13 Nov 2014 09:55:30 +0000 (09:55 +0000)]
optionally clone wiki

10 years agoBail out if no single OS has all required binaries.
Rudolf Polzer [Thu, 9 Oct 2014 12:34:26 +0000 (14:34 +0200)]
Bail out if no single OS has all required binaries.

10 years agoMake sure to bail out on empty binary files.
Rudolf Polzer [Thu, 9 Oct 2014 12:31:29 +0000 (14:31 +0200)]
Make sure to bail out on empty binary files.

10 years agoRemove redundant DLL files.
Rudolf Polzer [Thu, 9 Oct 2014 12:30:14 +0000 (14:30 +0200)]
Remove redundant DLL files.

10 years agoAdd missing +x bits.
Rudolf Polzer [Thu, 9 Oct 2014 12:29:11 +0000 (14:29 +0200)]
Add missing +x bits.

10 years agopoint at SDL2 for OS X and Windows.
Rudolf Polzer [Tue, 2 Sep 2014 12:56:34 +0000 (14:56 +0200)]
point at SDL2 for OS X and Windows.

10 years agoDelete code to compile the OS X agl client.
Rudolf Polzer [Tue, 2 Sep 2014 12:48:57 +0000 (14:48 +0200)]
Delete code to compile the OS X agl client.

10 years agoDo not include SDL2 DLLs - we link to them statically.
Rudolf Polzer [Tue, 2 Sep 2014 12:41:26 +0000 (14:41 +0200)]
Do not include SDL2 DLLs - we link to them statically.

10 years agoChange the messages to mention gitlab.
Rudolf Polzer [Sat, 30 Aug 2014 09:40:20 +0000 (11:40 +0200)]
Change the messages to mention gitlab.

10 years agoAllow the repo's default branch to differ from master.
Rudolf Polzer [Sat, 30 Aug 2014 09:29:30 +0000 (11:29 +0200)]
Allow the repo's default branch to differ from master.

10 years agodo not webp
Rudolf Polzer [Thu, 28 Aug 2014 16:28:24 +0000 (18:28 +0200)]
do not webp

10 years agoSwitch to s2tc for now - fix the crap later.
Rudolf Polzer [Thu, 28 Aug 2014 13:29:25 +0000 (15:29 +0200)]
Switch to s2tc for now - fix the crap later.

10 years agoFix pulling of travis binaries.
Rudolf Polzer [Thu, 28 Aug 2014 12:31:09 +0000 (14:31 +0200)]
Fix pulling of travis binaries.

10 years agoUse the proper gmqcc binary.
Rudolf Polzer [Thu, 28 Aug 2014 11:17:30 +0000 (13:17 +0200)]
Use the proper gmqcc binary.

10 years agoFIx the icon changing.
Rudolf Polzer [Thu, 28 Aug 2014 11:16:19 +0000 (13:16 +0200)]
FIx the icon changing.

10 years agoUpgrade to SDL2 on OS X too.
Rudolf Polzer [Wed, 27 Aug 2014 13:08:58 +0000 (15:08 +0200)]
Upgrade to SDL2 on OS X too.

10 years agoFix the downloading.
Rudolf Polzer [Wed, 27 Aug 2014 11:02:42 +0000 (13:02 +0200)]
Fix the downloading.

10 years ago./all release: Just download stuff from travis.
Rudolf Polzer [Wed, 27 Aug 2014 10:58:22 +0000 (12:58 +0200)]
./all release: Just download stuff from travis.

10 years agoSwitch win32 to SDL2 2.0.3 too, as this worked so well for Win64.
Rudolf Polzer [Wed, 27 Aug 2014 09:12:43 +0000 (11:12 +0200)]
Switch win32 to SDL2 2.0.3 too, as this worked so well for Win64.