0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
57758 commits 51 branches 369 tags 4.7 GiB
Commit graph

57758 commits

This branch
This branch
All branches
Author SHA1 Message Date
gfgtdf
a4d64cf193 add stdout.txt to gitignore 2015-01-13 19:30:50 +01:00
gfgtdf
c942bfe052 ignore stderr.txt file 2015-01-13 19:30:49 +01:00
Boldizsár Lipka
5315c8a108 Don't ignore txt files. 2015-01-13 19:30:49 +01:00
Boldizsár Lipka
c1a4710428 Don't ignore CMakeLists. 2015-01-13 19:30:48 +01:00
aquileia
0c8fb6b99c gitignore: Merge rules from src/ directory 
Conflicts:
	src/.gitignore
 2015-01-13 19:28:41 +01:00
Mark de Wever
d8a7b3daf5 Ignore doc/doxygen/html in older versions of git. 
The ** syntax is introduced in a newer version of git.
 2015-01-13 19:28:13 +01:00
Chris Beck
9d98968c2b add callgrind output files to .gitignore 2015-01-13 19:28:12 +01:00
aquileia
e13a477fb6 gitignore: Merge rules from doc/ and data/tools 2015-01-13 19:28:12 +01:00
aquileia
74e1a11b45 gitignore: Include more rules from subdirectories 
That is: data/lua/, scons/, and utils/
 2015-01-13 19:28:11 +01:00
aquileia
f21dc312ef gitignore: Merge rules from projectfiles/ 
Conflicts:
	projectfiles/CodeBlocks/.gitignore
 2015-01-13 19:28:04 +01:00
aquileia
47e9da5094 gitignore: Block some extensions 2015-01-13 19:25:52 +01:00
aquileia
47974ca4eb gitignore: Fix order of rules for Makefiles 
The exceptions were applied before the generic rule, thus they had
no effect.
 2015-01-13 19:25:51 +01:00
aquileia
6a0c88f38c gitignore: Reduce number of false positives 
Especially in utils/umc_dev/ a massive number of files matched ignore
rules. As tracked files can't be ignored, this had no real consequences.
 2015-01-13 19:25:51 +01:00
aquileia
02732ae01c gitignore: Merge dozens of "Thumbs.db" rules 
It suffices to apply the rule once in the root directory.
 2015-01-13 19:25:50 +01:00
aquileia
62e45369f0 gitignore: Merge rules from po/**/.gitignore files 2015-01-13 19:25:49 +01:00
aquileia
7115d61910 gitignore: Additional cmake rules 2015-01-13 19:25:48 +01:00
aquileia
9c84b0e214 gitignore: Keep README and COPYING files 2015-01-13 19:25:48 +01:00
aquileia
b4d3f81b75 gitignore: Restructure existing rules 
Organize the rules into groups corresponding to the tools creating
these files.

Use blank lines and comments for clarity.
 2015-01-13 19:25:47 +01:00
aquileia
02f76b5f96 Prepare merge of gitignore rules from master 2015-01-13 19:25:30 +01:00
aquileia
73c6b8598f Extend .gitignore for VC project files 
This commit adapts .gitignore to the new MSVC compilation
recommandations on the wiki.

Signed-off-by: aquileia <sk.aquileia@gmail.com>
 2015-01-13 19:22:37 +01:00
Ignacio R. Morelle
3a77e4d917 Fixed multiple issues with the changelogs 2015-01-12 21:00:44 -03:00
Ignacio R. Morelle
c394060a7d preproc: Use the same format as #error for reporting #warning lines 
Adds a preprocessor_streambuf::warning() method, equivalent to
preprocessor_streambuf::error() but logging to the warning logger and
returning to the caller instead of throwing an exception.
 2015-01-12 20:48:14 -03:00
gfgtdf
7aaa9829a6 Update changelog 2015-01-10 15:44:22 +01:00
Nils Kneuper
0764e0ac13 updated Russian translation 2015-01-10 10:04:36 +01:00
gfgtdf
fd6ad6d464 don't allow toggle shroud during enemies turn. 
whether DSU (= delayed shroud updates) is enabled for a team is part of
the gamestate and toggeling it during a turn of a networked side will
cause OOS sooner or later. So we cannot toggle it then.

backports 2a395fb750
 2015-01-10 02:01:43 +01:00
gfgtdf
ff05e0038e don't set current_player for ai sides when loading side users. 
makes the code more robust against https://gna.org/bugs/?22968 but i'm not sure whether it is really needed.
 2015-01-09 18:41:42 +01:00
Boldizsár Lipka
cf52bab908 Changelog entries for previous commit. 2015-01-09 13:41:03 +01:00
Boldizsár Lipka
155270b605 Change title screen music to transience.ogg. 2015-01-09 13:34:30 +01:00
gfgtdf
8597e02377 Merge pull request #362 from mstrebel/1.12 
Update changelog for bug #18926 in 1.12
 2015-01-07 23:57:09 +01:00
Michael Strebel
f46baf2711 Add Michael Strebel to miscellaneous contributors. 2015-01-07 22:56:45 +01:00
Michael Strebel
3855016974 Update changelog and player_changelog. 
Fixed bug #18926
 2015-01-07 22:51:43 +01:00
gfgtdf
dc4be12350 fix segfault on hotkeys for titlescreen tips 
backports 3b1abdf1e7 by mstrebel.

Fixes bug #18926
 2015-01-07 17:56:22 +01:00
gfgtdf
cba025d149 Update changelog 2015-01-07 16:06:39 +01:00
gfgtdf
ed18b98fbe Update changelog 2015-01-04 03:20:41 +01:00
gfgtdf
75ed1be82b Merge pull request #350 from gfgtdf/mp_1_12_fixes 
Mp 1.12 fixes

Untested. May fix https://gna.org/bugs/index.php?23036 and https://gna.org/bugs/?22968
 2015-01-04 03:11:38 +01:00
Groggy Dice
128798d28c data/campaigns: correct "... then" to "... than" 
Inspired by seeing a spelling correction by Vultraz in the logs back in
February.

Cannot be backported to 1.11 yet due to the stringfreeze.
 2015-01-03 04:53:39 -03:00
Ignacio R. Morelle
b60437f1ce cmake: Add missing object file target to fix wesnothd build 
This was missing from commit 121f9bc9a9 by
iceiceice.
 2015-01-02 17:47:58 -03:00
Ignacio R. Morelle
1398133eac addons.w.o: New Year copyright update 2015-01-01 18:58:12 -03:00
Ignacio R. Morelle
3e5196b088 website: New Year copyright update 2015-01-01 18:58:08 -03:00
Ignacio R. Morelle
b335b1026d units.w.o: New Year copyright update 2015-01-01 18:58:04 -03:00
Ignacio R. Morelle
b12f4fabac New Year copyright update 2015-01-01 18:50:27 -03:00
ln-zookeeper
68c5a2e8a5 Tweaked and expanded music playlists in HttT 
Conflicts:
	changelog
 2014-12-31 23:58:55 +02:00
Charles Dang
3383d6462a Don't show ellipsecheck warning if ellipse=none 2014-12-31 15:01:26 +11:00
Charles Dang
3cc1015d0c Ignore projectfiles/CodeBlocks/cb/ 
This is the default dir name for the extracted CB SDK zip we provide, and the projectfiles folder
is a logical place to put it
 2014-12-29 04:05:37 +11:00
gfgtdf
9c6b5df231 maybe fix mp campaign define 
follows the suggestion in the first reply in https://gna.org/bugs/index.php?23036.
 2014-12-27 22:09:24 +01:00
gfgtdf
95d650c9f7 don't assign computer sides to new players. 
maybe fix https://gna.org/bugs/?22968
 2014-12-27 22:06:00 +01:00
ln-zookeeper
47a3f8bec9 Restored a subtler Shaun and Ed easter egg 2014-12-27 15:06:40 +02:00
Ignacio R. Morelle
8ae98d442a cmake: Fix pot-update target breakage when bash isn't the default shell 
(Default shell as in the /bin/sh executable.)

On Debian and other systems using a different Bourne-compatible shell
that doesn't support some of Bash's syntax extensions (in particular,
'&>' as a redirection operator targeting stdout+stderr), the pot-update
target is completely broken, stuffing the POTFILES.in lists for either
the last (wesnoth-utbs) or first (wesnoth-ai) textdomains with paths for
every C/C++ source file from our tree.

Shells that do not interpret &> the way Bash does consider it to be the
stdout redirection operator following an asynchronous invocation. Of
course such a thing is bound to cause weird issues like this.
 2014-12-27 05:46:54 -03:00
loonycyborg
9bc5b15d5f scons: fix mingw32 cross-compile 
Made check for PNG support in SDL always succeed for cross-compile scenarios
because it requires running a test program.
 2014-12-26 18:51:26 +03:00
Ignacio R. Morelle
50eb709439 fs: Quietly ignore non-dir targets in get_files_in_dir() (BFS only) 
The non-BFS implementation already ignored this case without making
noise in stderr, and this function is used by delete_directory(), which
also accepts both regular files and directories. The add-ons management
code has always relied on this behavior.
 2014-12-23 22:53:05 -03:00