Commit graph

66063 commits

Author SHA1 Message Date
Celtic Minstrel
3dba60bcd7 Update Visual Studio project 2016-09-12 09:45:02 -04:00
Charles Dang
62f864da02 Scrollbar mode code cleanup 2016-09-12 17:32:49 +11:00
Gregory A Lundberg
a878981628 Fix bug: Map may not have starting positions
Look before you leap ...
2016-09-11 18:21:05 -05:00
Celtic Minstrel
905e1a00a3 Update changelog 2016-09-11 17:11:42 -04:00
Celtic Minstrel
8683210901 Fix formula= in weapon filter causing the filter to pass even if other keys failed 2016-09-11 17:05:59 -04:00
Celtic Minstrel
2f5b956690 Add matches function to Lua unit attacks table 2016-09-11 17:05:57 -04:00
Celtic Minstrel
c621c95df8 Include male/female variations in unit variations table iteration 2016-09-11 17:05:56 -04:00
Celtic Minstrel
eb187b23e4 Make unit types lookup table a userdata 2016-09-11 17:05:54 -04:00
Celtic Minstrel
56a0f369cb Add matches method to team metatable 2016-09-11 17:05:53 -04:00
Celtic Minstrel
b8b1e8a223 Store unit methods in metatable instead of doing linear search 2016-09-11 17:05:51 -04:00
Celtic Minstrel
f1422579eb Enable ipairs() iteration over unit attack lists 2016-09-11 17:05:42 -04:00
Celtic Minstrel
e90a256489 Update XCode project 2016-09-11 17:05:20 -04:00
Charles Dang
352e5f2600 End Credits: delay slightly before beginning scroll 2016-09-11 23:46:03 +11:00
Charles Dang
8604d811e0 End Credits: hack to hide the scrollbar 2016-09-11 23:14:50 +11:00
gfgtdf
9915a10b67 Merge pull request #771 from GregoryLundberg/GL_fix_load_replay
Fix bug: Crash loading replay
2016-09-11 13:40:33 +02:00
Charles Dang
20831bf853 Updated schema for 4e21ae709e 2016-09-11 22:35:43 +11:00
Charles Dang
d822e672ba End Credits: centered text 2016-09-11 22:19:41 +11:00
Charles Dang
4e21ae709e Scroll Labels: allow setting text alignment 2016-09-11 22:18:09 +11:00
Charles Dang
d2f31787dd End Credits: added some (as yet) unused code for scroll speed control and increased said speed to a more reasonable level 2016-09-11 22:07:43 +11:00
Charles Dang
b789d8db1f End Credits: implements automatic (and slllooowww) scrolling
Scrollbars need refactoring in order to get this to work smoothly and at a better speed.
2016-09-11 21:38:10 +11:00
Charles Dang
d0cae514ff Added basic GUI2 end credits dialog (incomplete) 2016-09-11 18:55:38 +11:00
Charles Dang
865f7262f9 Added large scroll label definition 2016-09-11 18:53:48 +11:00
Charles Dang
838c0e0a09 Renamed title_screen panel definition and added a blur-less version 2016-09-11 18:53:47 +11:00
Celtic Minstrel
982aea6a02 Disable title screen unit test
Based on tests yesterday in a branch, the title screen appears to be the cause of the bad_alloc on Travis
2016-09-11 01:22:38 -04:00
Ignacio R. Morelle
2483fc80e4 scons: Don't pass a C++ compiler flag to C compilers
Needed since 0180a72573 introduces the
requirement of a C compiler in the building process. Otherwise we get
this from GCC 6.1.1:

  cc1: error: command line option ‘-Wold-style-cast’ is valid for C++/ObjC++ but not for C [-Werror]
2016-09-11 02:11:22 -03:00
Charles Dang
9c239d1fab Prevent copy of top border drawing when mousing over widgets with blurred parent widget backgrounds
I have no idea why this works
2016-09-11 13:42:12 +11:00
Gregory A Lundberg
07d609632c Fix bug: Crash loading replay
For reproduce: play a scene, when the next settles down use Menu|Load to load the replay just created for the previous scene.

gtgftd suggested this patch. Seems to work. PR to document change for review.
2016-09-10 21:25:07 -05:00
Celtic Minstrel
9232b5bf87 Fix compiler warnings 2016-09-10 21:47:48 -04:00
Celtic Minstrel
e3ab484f5e Update XCode project 2016-09-10 21:46:08 -04:00
Charles Dang
659e482e01 Moved eras files back to multiplayer/ since its movement caused errors in replays pre-move 2016-09-11 10:23:53 +11:00
Celtic Minstrel
6baee82e9c Merge pull request #769 from GregoryLundberg/GL_fix_object_silent
Fix bug: 'text' is nil
2016-09-10 17:13:59 -04:00
Gregory A Lundberg
6af699fdf3 Fix bug: 'text' is nil 2016-09-10 14:20:04 -05:00
gfgtdf
eb3e27b819 clena some includes. 2016-09-10 20:45:24 +02:00
gfgtdf
dcd037e530 small load_game_exception refactor
* Moves load_game_exception to savegame.hpp and cleans some #includes
* Removes the load_game_exception statis members and replaces them with
a non-static load_game_metadata member.
* Adds loadgame::DIALOG_TYPE to remove the gui1 dependency.
* Fixes loading of replay saves.
* Adds soem mising override specifers in savegame.hpp
2016-09-10 20:33:18 +02:00
Charles Dang
54e879b183 Fix not being able to load a game from within a game
Every time an attempt was made, the titlescreen got in the way.
2016-09-11 00:19:11 +11:00
Charles Dang
eaf5ef96ed Buttons: refactored procedural drawing to avid alpha-corner hack
That hacked stopped being a thing in e993e2820b
2016-09-10 21:44:28 +11:00
Charles Dang
6758ef48d3 Some fixes and optimizations to the GUI2 canvas 2016-09-10 17:13:25 +11:00
Celtic Minstrel
5e750b0083 Fix some Travis compile errors (#768) 2016-09-09 22:55:42 -04:00
Charles Dang
e993e2820b Refactored GUI2 canvas to use an SDL_Renderer context 2016-09-10 13:46:25 +11:00
Charles Dang
3a9caf70f4 Removed problem line from eea7bc0c63 altogether 2016-09-10 10:36:27 +11:00
Charles Dang
eea7bc0c63 Editor: fixed crash when loading scenarios 2016-09-10 10:10:45 +11:00
Charles Dang
9630ed4937 Unit Attack: removed assert in favor of min 2016-09-10 09:29:58 +11:00
Charles Dang
da2027c274 MP Create: added framework for background images 2016-09-10 08:54:24 +11:00
Charles Dang
7ade61cfc2 Load widgets before dialogs
This allows any defined we want global in widgets to be used in dialog.
2016-09-10 08:52:15 +11:00
Celtic Minstrel
ab6369098f Remove *.vcxproj.user files
While they did contain settings that are required for Wesnoth to run
correctly in the Visual Studio debugger, these settings can also be
specified in the main project file (even if only by manually editing
the XML).

Including the *.user files is problematic since it also includes things
that a developer may wish to frequently change, such as command-line
arguments.

Thus, the settings have been moved into the main project file.
2016-09-09 17:17:53 -04:00
Jyrki Vesterinen
cd779200a1 Fix crash in GUI2 multiplayer test
Because the join script attempts to join the game immediately after it has
been found, it tried to join the game before it had been added to the
games_ vector (from games_by_id_).

In addition to that, the check for if there is such a game had an
off-by-one error.

The two bugs, in combination, caused the game to index an empty vector.
Even if the STL implementation doesn't immediately crash the game, it's
going to crash later when it tries to interpret garbage data as the game
information.

Fixed by making the game update the games_ vector immediately after
fetching games from the server, and also fixing the off-by-one error.
2016-09-09 22:05:49 +03:00
Jyrki Vesterinen
3366e9c683 Fix crash in GUI2 multiplayer tests 2016-09-09 21:46:40 +03:00
Jyrki Vesterinen
adc598b388 Apply recent MP test fixes to the GUI2 MP test, too 2016-09-09 20:52:11 +03:00
Celtic Minstrel
8a80af4c69 Update XCode project 2016-09-08 17:36:20 -04:00
Celtic Minstrel
0d47ea2522 Update Visual Studio project 2016-09-08 17:29:53 -04:00