upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-29 04:48:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,204 Commits 56 Branches 373 Tags
Commit Graph

66204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Celtic Minstrel
a8aa38277e Revert accidentally-committed code in c5ce248f54695316d4603c18b7e5e485b2564d24. 2016-09-29 14:40:46 -04:00
Celtic Minstrel
357047db78 Update XCode readme 2016-09-29 11:35:35 -04:00
Celtic Minstrel
57ff44316e Update changelog 2016-09-29 11:25:12 -04:00
Celtic Minstrel
1fabd6f23e Update INSTALL 
I figure it's silly to state different minimum requirements for various
Boost libs when different versions are not guaranteed to be compatible.

Also add some minor notes related to Mac and Windows.
 2016-09-29 11:24:01 -04:00
Celtic Minstrel
c5ce248f54 Update credits listing 
This adds a large number of people gleaned from the logs with:
	git log --merges --since=Jan.1.2015

If any of the people added in this commit wish to change how they
are referenced, they are of course free to contact us.
 2016-09-29 11:21:05 -04:00
Celtic Minstrel
d944f41b0e Enable #wesnoth.unit_types and #wesnoth.unit_types[type].variations 2016-09-29 11:02:48 -04:00
Celtic Minstrel
b563d8d8cd Put fixed passability check on separate line 2016-09-29 10:23:56 -04:00
ln-zookeeper
b2d054253f Fixed broken start event 2016-09-29 11:22:34 +03:00
ln-zookeeper
9dbb917b7b Fixed bug #25131: [move_unit] check_passability=no doesn't work 2016-09-29 10:28:28 +03:00
Celtic Minstrel
bbdb7fab38 Merge pull request #805 from lv-zheng/fix_time_t 
include ctime header for time_t
 2016-09-29 00:59:33 -04:00
Zheng Lv
5ed58a9aea include ctime header for time_t 
Missing #include causes compilation error with clang++.
 2016-09-29 12:51:05 +08:00
Charles Dang
090f695c03 Made connect_engine::receive_from_server public 2016-09-29 14:09:00 +11:00
Charles Dang
75636ee17c MP Staging: some progress with getting the network processing working, as well as using the dialog for non-hosts 2016-09-29 13:37:22 +11:00
Celtic Minstrel
4488e35706 Fixup some overlooked semantic changes from fe08701b7ca3639b17dca20023d2bb34433042c6 2016-09-28 19:48:11 -04:00
Ignacio R. Morelle
aae20e7c0c addon/mg: Use flip() instead of a 32-bits ulong to appease the pedants 
We're never going to have more than 32 add-on categories before this
code is obsoleted by the GUI2 transition, but whatever.
 2016-09-28 18:45:34 -03:00
Ignacio R. Morelle
c26b13372b addon/mg: Fix regression causing all categories to be filtered out by default 
Turns out unsigned long(true) is not a comprehensive enough value for
setting a boost::dynamic_bitset to have all bits initially on.
Regression introduced by commit
fe08701b7ca3639b17dca20023d2bb34433042c6.

Fixes the more visible half of bug #25073.
 2016-09-28 06:38:18 -03:00
Jyrki Vesterinen
9811ad334b Fix: the plugin version of wesnoth.delay() didn't wait with --nogui 
CVideo::delay() is a no-op when --nogui is used.
 2016-09-28 06:57:13 +03:00
Charles Dang
1848c8c919 MP Method Selection: specify max username input length 
This was already checked when the password was parsed by the server, so it makes sense for the UI
to reflect that restriction.
 2016-09-28 12:58:02 +11:00
Charles Dang
5f043a79f1 More detailed explanation of the workaround added in 6c2e2e9bf7e 2016-09-28 12:29:59 +11:00
Celtic Minstrel
6c2e2e9bf7 Fix crash when selecting the selected item from a dropdown menu 2016-09-27 19:17:50 -04:00
Jyrki Vesterinen
296902d426 Add a "simulate lobby activity" plugin 
This is the first step towards creating artificial load and testing if the
GUI2 lobby still performs well under load.

I also implemented ability to leave the game in the GUI2 MP staging dialog.
Previously the server continued to believe that the player remains in the
game when he/she closed the MP staging dialog.
 2016-09-27 22:52:07 +03:00
Lari Nieminen
b3dc6ac265 Merge pull request #803 from sevu/master 
refactored Troll Shaman animation
 2016-09-27 11:46:30 +03:00
Severin Glöckner
dc2b95c364 refactored Troll Shaman animation 2016-09-27 01:11:01 +02:00
Charles Dang
bee748329b Attempt to fix recent unit drawing problems introduced in 55ba8c95bcc 2016-09-27 06:26:13 +11:00
Charles Dang
005432a43f Faction Select: fixed a crash when selecting new faction 
This occurred when selecting a new faction if the old selection's leader choice had an index value
larger than the size of the new selection's leader list.
 2016-09-27 03:32:57 +11:00
mattsc
f6da072685 Update changelog with AI bug fixes 2016-09-26 08:34:26 -07:00
mattsc
efe3c54fdc SotBE S6: use new syntax of wesnoth.put_unit() in custom AI code 
To stop deprecation warning.
 2016-09-26 07:32:46 -07:00
mattsc
d2dc72a8ee SotBE S6: fix custom Lua CA to conform to new syntax 2016-09-26 07:32:46 -07:00
mattsc
3382f491d3 EI S8: fix custom Lua CA to conform to new syntax 2016-09-26 07:32:46 -07:00
doofus-01
83bc21c5d8 update images/animations for Dark Queen, Princess, and Sea Orc 2016-09-26 21:59:02 +11:00
Charles Dang
4661375783 Merge pull request #802 from doofus-01/wooden_floor_fixes 
clean up wooden floor terrain transitions
 2016-09-26 21:47:36 +11:00
Espreon
fe2534edf4 Fixed remaining time formatting strings in wesnoth/en@shaw.po 
This one should actually fix bug #25074, as far as users
of en@shaw go.
 2016-09-25 14:45:43 -04:00
Espreon
e607e791c7 Removed extraneous quotation marks from wesnoth/en@shaw.po 2016-09-25 14:28:05 -04:00
Jyrki Vesterinen
a29c669866 Merge pull request #787 from wesnoth/enable-gui2-lobby-in-gui2-lobby-test 
Enable GUI2 lobby in GUI2 MP test
 2016-09-25 20:18:47 +03:00
Jyrki Vesterinen
1c97c8890c Mark mp_test_executor-gui2.sh as executable 2016-09-25 20:17:48 +03:00
Jyrki Vesterinen
e1895e8eaa Enable the GUI2 lobby in the GUI2 lobby test 2016-09-25 20:17:47 +03:00
Jyrki Vesterinen
419a30b45e Cherry-pick useful parts of pull request #801 2016-09-25 20:15:17 +03:00
Charles Dang
9ccc4300b9 Update CB projfile 2016-09-26 04:02:52 +11:00
Espreon
7e9941441a Fixed time formatting characters for en@shaw 
(partial) fix for bug #25074
 2016-09-25 12:56:54 -04:00
Jyrki Vesterinen
4e49f2647d Merge pull request #786 from wesnoth/expose-preferences-to-lua 
Expose preferences to plugins
 2016-09-25 19:50:23 +03:00
ln-zookeeper
9d1346ed57 Removed unintended non-transparent white pixels 2016-09-25 18:04:09 +03:00
Charles Dang
2ef46193c9 Text: cleanup and a small 'fix' to the rendering code 
The proper way to get stride is with cairo_format_stride_for_width. I made the code use that instead
of just multiplying width by 4.
 2016-09-26 01:34:14 +11:00
mattsc
f7fd9ee77e TRoW S15: fix custom Lua CAs to conform to new syntax 
It was forgotten to update these CAs in the AI code refactoring for
1.13.5.

This fixes bug #25123.
 2016-09-25 07:21:11 -07:00
Charles Dang
07e993ce3e Convert more cases of blit_surface to sdl_blit 
Includes a change I forgot to include in 67348181f5d2
 2016-09-25 15:50:42 +11:00
Charles Dang
67348181f5 Use sdl_blit instead of custom blitting function (blit_surface) in editor 2016-09-25 15:28:50 +11:00
Charles Dang
00b2715460 Fixup 6797e82414fe 2016-09-25 14:56:42 +11:00
Charles Dang
6bfe9d0109 Use sdl_blit instead of custom blitting function (blit_surface) for IPF functions 2016-09-25 14:55:44 +11:00
Charles Dang
31b08a25f2 Properly save blank-hex.png as full alpha instead of hex-masked 2016-09-25 14:31:50 +11:00
mattsc
3d0c29b7fc Experimental AI: do not let AI try to recruit on fogged/shrouded hexes 
The engine will refuse to recruit on shrouded hexes, which will result
in part or all of the rest of the AI actions to be disabled.  Fogged
hexes may cause problems also if there is an enemy unit on them.

This fixes at least part of bug #25112.
 2016-09-24 19:17:39 -07:00
Charles Dang
6797e82414 Fixup 55ba8c95bcc48 (~O was broken) 
Seems the Opacity IPF needs the per-pixel alpha manipulation method. Restoring locally for convenience.
 2016-09-25 13:16:04 +11:00