RepoMirrors/xonotic
1
0
Fork 0
mirror of https://gitlab.com/xonotic/xonotic synced 2024-12-16 11:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
70 Commits 36 Branches 9 Tags 258 MiB
6cac8f921e
Commit Graph

70 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rudolf Polzer
6cac8f921e fix check-gitattributes script ignoring .git folders 2010-04-17 20:49:52 +02:00
Rudolf Polzer
991fbce191 .gitattributes file 2010-04-17 20:47:12 +02:00
Rudolf Polzer
081cbbd21e ./all push -s 
submits the current branches to the repo as finished, to-be-merged, branches
 2010-04-16 19:41:05 +02:00
Rudolf Polzer
0f21e25d2b fix a minor bug in ./all push 2010-04-16 19:36:41 +02:00
Rudolf Polzer
3bd06cf7b9 add some files that should be in this repo 2010-04-16 19:14:21 +02:00
Rudolf Polzer
3413c77de6 set autocrlf and safecrlf in all repos automatically 2010-04-16 19:12:40 +02:00
Rudolf Polzer
5065d94791 let's allow the forcing in git-fetch again, as we WANT to allow rebasing in /rebase/ branches 2010-04-16 19:09:06 +02:00
xonotic
0a079af166 correctly write info.txt 2010-04-15 11:43:40 +02:00
xonotic
9c65237846 new save/restore branches commands 2010-04-15 11:43:40 +02:00
Rudolf Polzer
2a8628fbe7 add "commit" as alias to push in the ./all script 2010-04-11 21:09:32 +02:00
Rudolf Polzer
4ece547f4f add another uname prefix to detect Windows (seen that somewhere) 2010-04-11 12:23:32 +02:00
Rudolf Polzer
f5bb6ca678 ./all - handle upstream rebase better (abort, instead of causing a frankenstein merge) 2010-04-10 18:05:46 +02:00
Rudolf Polzer
2e2d41c6ba "branch" command: always branch off master, not off HEAD, unless a branch is specified 2010-04-05 13:48:23 +02:00
Rudolf Polzer
3db1a93510 REALLY fix that :P 2010-04-02 23:14:58 +02:00
Rudolf Polzer
2afddf0041 fix call to checkself 2010-04-02 23:14:05 +02:00
Rudolf Polzer
7750b15f0a better show the name of "." 2010-04-02 21:25:08 +02:00
Rudolf Polzer
592d77dbf0 better handling of merge conflicts 2010-04-02 21:11:17 +02:00
Rudolf Polzer
a93d716530 new feature: "./all merge" - merges changes from master into your branches (to be done after update) 2010-04-02 20:49:48 +02:00
Rudolf Polzer
e68fe4a5ac detect not having cksum, and prefer md5sum 2010-04-02 20:43:07 +02:00
Rudolf Polzer
7e8af582d1 Make it look nicer, but do the same ;) 2010-04-02 20:35:19 +02:00
Rudolf Polzer
a6f6301818 Workaround for Win32 to prevent self-nuking. 2010-04-02 20:34:05 +02:00
Rudolf Polzer
3dca7f8211 SOme fixes for ../../all 2010-04-02 20:14:19 +02:00
Rudolf Polzer
db1393bf33 Detect calling "all" via e.g. ../../all and chdir where it SHOULD be 2010-04-02 20:12:36 +02:00
Rudolf Polzer
a0f692b0ce Do not forget the "push" question after the "commit" question ;) 2010-04-02 20:09:51 +02:00
Rudolf Polzer
5879acc184 ./all: make "push" autodetect uncommitted changes, and offer commit 2010-04-02 20:09:03 +02:00
Rudolf Polzer
6144f78ae6 also load netradiant in ./all 2010-04-02 15:18:46 +02:00
Rudolf Polzer
5d21c011d8 Merge commit 'origin/esteel/renames' 
Conflicts:
	server/readme.txt
 2010-04-02 14:25:03 +02:00
Rudolf Polzer
1bc0cc65a1 Merge commit 'origin/mand1nga/rebrand' 2010-04-02 14:23:15 +02:00
Stephan Stahl
f6a7278fd8 rerunning did not work for me, this should fix it 2010-03-31 13:27:14 +02:00
xonotic
bea06c4287 .gitignore div0-gittools 2010-03-31 09:40:02 +02:00
xonotic
93c92a7de2 also load div0-gittools 2010-03-31 09:18:59 +02:00
Stephan Stahl
2ec7592650 rm'd further nex-havoc references 
replace nex with xonotic in a lot of places
 2010-03-30 20:55:57 +00:00
Rudolf Polzer
aa6f316cce use cksum instead of md5sum, as that is available on FrickenBSD too. 2010-03-29 15:46:47 +02:00
Rudolf Polzer
535178a2d2 improve the self-check 2010-03-29 15:24:49 +02:00
Rudolf Polzer
85878f81dd undo the escape sequence! 2010-03-29 15:22:29 +02:00
Rudolf Polzer
8d7d78ec84 do the self-check directly after pull 2010-03-29 15:21:24 +02:00
Rudolf Polzer
a3518ca2fb improve the "all" script to notice if it has changed, and rerun 2010-03-29 15:17:50 +02:00
Rudolf Polzer
fe9e135a69 Merge branch 'master' of ssh://git.xonotic.org/xonotic 2010-03-29 08:41:31 +02:00
Rudolf Polzer
879cbba9e2 use the customgame DP feature for branding as Xonotic 2010-03-29 08:41:22 +02:00
Rudolf Polzer
a870e86f2e auto-"git remote prune origin" when ./all update'ing 2010-03-28 20:55:16 +02:00
Rudolf Polzer
087dcc2f5c delete the changes-since-last-release file as it is not current anyway 2010-03-27 13:23:32 +01:00
Rudolf Polzer
61d3ab6f22 .gitignore should also ignore fteqcc now 2010-03-26 09:18:35 +01:00
Rudolf Polzer
d931065aa3 ./all compile and ./all run -nexuiz now work. 
Once xonotic is in DP's game list, ./all run will work too.
 2010-03-26 09:18:04 +01:00
Rudolf Polzer
c2ed283428 Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic 2010-03-26 08:59:18 +01:00
Rudolf Polzer
09956394ea ./all: also download the fteqcc repo 2010-03-26 08:59:06 +01:00
Rudolf Polzer
e4739f5dfb a new synonym "foreach" just so I can see if my change to ciabot.pl works 2010-03-25 15:40:42 +01:00
Rudolf Polzer
561a08c232 a foreach command 2010-03-25 15:37:47 +01:00
Rudolf Polzer
8eaeeaad1f add a feature to run the game. NOTE: the option -xonotic is not implemented yet. 2010-03-25 09:18:19 +01:00
xonotic
8db939c686 empty commits won't do. Instead, adding the synonym "switch" to checkout. 2010-03-24 15:09:55 +01:00
xonotic
6dd44a98a2 an empty commit just because I can 2010-03-24 15:09:16 +01:00