Elvish_Hunter
8c098c3264
wmlscope: refactored collision detection
...
This fixes the breakage caused by the Python 3 zip() function, which like all generators may be iterated only once; also, it finally returns a meaningful output, instead of the obscure list of filenames which was formerly returned
2015-08-05 20:38:49 +02:00
Elvish_Hunter
c1a783b038
all main wml tools: use filter(), map() and zip() from Python 3
...
The main difference is that these functions return generators instead of lists. This actually breaks wmlscope's collision detection, which will be fixed in my next commit.
2015-08-05 20:38:48 +02:00
Elvish_Hunter
6d67feff9f
wmlscope and wmltools: removed calls to cmp() function
...
Just like the __cmp__ method, the cmp() function isn't available on Python 3
2015-08-05 20:38:48 +02:00
Elvish_Hunter
ad3631419c
wmltools and wmliterator: removed __cmp__ method
...
The __cmp__ method isn't supported any more by Python 3.
Instead, one should define the six usual comparison methods, or define only two of them and let the @total_ordering decorator handle the rest
2015-08-05 20:38:48 +02:00
Elvish_Hunter
778e9296d8
wmlscope: fixed files being incorrectly opened as UTF8 instead of binary
2015-08-05 20:38:48 +02:00
Elvish_Hunter
90919e12c6
wmllint, wmlindent, wmltools: fixed dir being used as variable name
...
In Python, dir is an in-built function
2015-08-05 20:38:48 +02:00
gfgtdf
39ffd1e37d
Merge pull request #441 from gfgtdf/lua_random
...
Add wesnoth.random and sync helper.shuffle
2015-08-04 23:33:13 +02:00
gfgtdf
0038448fcb
make helper.shuffle synced
...
using helper.shuffle now doesn't casue OOS anymore used. It is possible
to get the old behaviour by passing math.random as a second parameter.
2015-08-04 22:36:54 +02:00
gfgtdf
2cd2cf47c0
add wesnoth.random lua function
...
wesnoth.random has the same interface as math.random. So it can
substitute that function easily.
2015-08-04 22:36:52 +02:00
gfgtdf
f5c64af8de
use mt19937 also in default random generator
...
previously rng::next_random_impl() returned rand() which is in range
1-2^16. so random_new::generator->next_random() would return a number
1-2^16 in unsynced context and a number in 1-2^32 in synced contexts.
Now it always returns a number in 1-2^32.
2015-08-04 20:25:50 +02:00
lipk
5aab187ee6
Merge pull request #437 from aginor/sdl2
...
Make the game compile with SDL2.
2015-08-04 16:12:28 +02:00
gfgtdf
8c9416cfaf
fix msvc compiler warning.
2015-08-04 16:00:45 +02:00
aquileia
f3ee4548fb
Merge pull request #442 from pquentin/travis-wait
...
Prefix `apt-get -qq with `travis_wait` to fix timeout
2015-08-04 14:27:17 +02:00
Andreas Löf
f0613f48bd
Remove defunct code.
...
This removes code that relied on the defunct class ttexture. Since it will not be reintroduced it is instead removed completely.
2015-08-04 22:59:45 +12:00
Elvish_Hunter
499866323b
GUI.pyw: fixed an obscure bug triggered by Unicode literals
2015-08-04 10:07:59 +02:00
Elvish_Hunter
cebfbba68e
wmllint and wmlscope: fixed encoding declarations
2015-08-04 10:07:59 +02:00
Elvish_Hunter
eaf6a9bd09
wmltools: fixed MD5 hashing not working with UTF-8
2015-08-04 10:07:58 +02:00
Elvish_Hunter
005337ec33
wmltools: use print function
2015-08-04 10:07:58 +02:00
Elvish_Hunter
5149be176c
wmliterator: used print function
2015-08-04 10:07:58 +02:00
Elvish_Hunter
43d83609f4
wmltools: open files as UTF-8 and use Unicode literals
2015-08-04 10:07:58 +02:00
Elvish_Hunter
d91c9f1fba
wmllint and wmliterator: open files as UTF-8 and use Unicode literals
...
This is a single commit, because modifying only one of the two files broke the other
2015-08-04 10:07:58 +02:00
Elvish_Hunter
ab88b9091f
wmlscope: open files as UTF-8 and use Unicode literals
2015-08-04 10:07:58 +02:00
Elvish_Hunter
501b3aa2d9
wmlindent: open files as UTF-8 and use Unicode literals
2015-08-04 10:07:57 +02:00
Quentin Pradet
c2808da642
Prefix apt-get -qq with travis_wait`
...
`apt-get -qq` is completely quiet. If `apt-get` takes more than 10
minutes to execute, nothing will be outputted for 10 minutes, and travis
will kill the build. Using `travis_wait` ensures the commands will not be
killed for 20 minutes. See [the documentation] for details.
[the documentation]: http://docs.travis-ci.com/user/build-timeouts/#Build-times-out-because-no-output-was-received )
2015-08-04 09:59:57 +02:00
Ignacio R. Morelle
66511d2c2a
Merge pull request #444 from midzer/VC14
...
Added VC14 support
2015-08-04 00:38:34 -03:00
midzer
7a32ff0e45
Added VC14 support
2015-08-04 03:35:45 +02:00
Charles Dang
d2375c07b6
Merge pull request #438 from PBechon/master
...
Fix a compilation error with XCode Version 6.2 on OSX 10.9
2015-08-04 01:51:11 +11:00
Charles Dang
d10b206a8b
Some on-launch stderr formatting
2015-08-03 20:36:41 +11:00
Patrick Bechon
deafe6e0f6
Fix a compilation error with XCode Version 6.2 on OSX 10.9
2015-08-02 20:12:44 +02:00
Andreas Löf
aae2ad77e6
Make the game compile with SDL2.
...
This does the bare minimum to get the game compiling and running again with SDL 2. It fixes all of the compile errors, adds a missing seek operation to the SDL_RWops. The missing seek operation caused a NULL pointer dereference during game start.
2015-08-02 22:09:02 +12:00
Elvish_Hunter
5227785034
wmllint: use print function
2015-08-01 15:27:58 +02:00
Elvish_Hunter
54a006383b
wmllint: automatically handle values above 255 when converting to Pango
2015-08-01 13:43:47 +02:00
Elvish-Hunter
627e00a3e4
Merge pull request #428 from iKevinY/wmllint
...
Improve idiomaticity of wmllint
2015-08-01 10:20:00 +02:00
ln-zookeeper
ae2abf65e9
Tweaked the new water images as per LordBob's suggestion.
2015-08-01 00:14:37 +03:00
Lari Nieminen
5495339a55
Merge pull request #435 from chisquare130/master
...
South Guard text change
2015-07-31 02:21:47 +03:00
Charles Dang
300b62e304
Use icons/icon-game for all hardcoded logo needs
2015-07-31 06:14:41 +11:00
Charles Dang
8d06d3f70d
Removed extra unused icon
2015-07-31 06:10:18 +11:00
mattsc
f168f1d3e2
Update Xcode project file
2015-07-30 10:41:46 -07:00
Charles Dang
111e938319
TSG: saved maps in new format
2015-07-30 23:21:58 +11:00
Elvish_Hunter
d8e69a4c40
wmlscope: used print function
...
This replaces usages of print >> sys.stderr adn sys.stderr.write
2015-07-30 10:51:49 +02:00
Elvish_Hunter
2dee033335
wmlscope: fixed sorted() and type() being used as variable names
2015-07-30 10:48:28 +02:00
Charles Dang
e7345dd69a
Updated codeblocks projectfile to use boost 1.58 libs
2015-07-30 17:53:19 +11:00
Ignacio R. Morelle
c4e7b15ebc
Update and reorganize Packagers section in the credits
...
Now the list is split between active and inactive packagers, and we also
list SDK maintainers (aquileia, loonycyborg).
Also restored alphabetical order, fixed comments and names, and added
aquileia, ancestral, mattsc, and vincent_c.
2015-07-30 03:10:15 -03:00
Ignacio R. Morelle
a16cc24d8c
Merge branch 'staging/pr-434' (PR #434 )
2015-07-30 02:58:19 -03:00
Ignacio R. Morelle
b650686888
preproc: Minor coding style nitpick
2015-07-30 02:56:23 -03:00
Kevin Yap
a3fd3c71e1
Loop over lines in wmllint using enumerate()
2015-07-29 21:08:22 -07:00
Kevin Yap
2e30e0e7fe
Improve idiomaticity of wmllint
...
- Remove unused variables.
- Prefer `x in y` to `y.count(x)` and `y.find(x)`.
- Use dictionary comprehension in consistency_check().
- Change `not x in y` to `x not in y`.
- Various whitespace changes.
2015-07-29 20:49:42 -07:00
Charles Dang
7923a41663
cmake: drop reference to standalone editor icon and .desktop files
...
These were removed in 176bda844c7d.
2015-07-30 13:09:51 +11:00
Charles Dang
60400f29a2
Merge pull request #426 from Vultraz/master
...
Display an error if trying to upload an addon with an invalid icon
2015-07-30 13:02:27 +11:00
Ignacio R. Morelle
d7686f4895
Merge branch 'macro-argument-location' of https://github.com/halfspiral/wesnoth into staging/pr-434
2015-07-29 22:51:24 -03:00
