upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-17 23:56:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
65,910 Commits 52 Branches 374 Tags
Commit Graph

65910 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gregory A Lundberg
cb074258e6 HttT S02 Haldiel rides in 
He rides up from a village instead of simply appearing from thin air.
 2016-09-13 16:34:52 -05:00
Celtic Minstrel
1af1932b37 Enable variable scrolling speed in GUI2 end credits 2016-09-13 17:19:11 -04:00
Ignacio R. Morelle
85d277dd45 Drop newly superfluous include 2016-09-13 18:04:52 -03:00
Celtic Minstrel
a3be5244ff Clear allow_plugin_skip earlier in titlescreen and MP lobby / create 2016-09-13 15:26:04 -04:00
Jyrki Vesterinen
e93ae16cfd location_palette_item: Fix signed to unsigned conversion compiler warning 2016-09-13 21:38:22 +03:00
Jyrki Vesterinen
5e930ea5fb Fix GUI2 multiplayer tests getting stuck 2016-09-13 21:22:23 +03:00
Jyrki Vesterinen
c4992dcd38 viesti.txt 2016-09-13 21:18:50 +03:00
loonycyborg
fe07bf500e Replace custom scoped_resource with unique_ptr 2016-09-13 19:03:33 +03:00
mattsc
862fd5f93b Update changelog and release notes 2016-09-12 07:48:31 -07:00
mattsc
cc986bbc50 AI: ensure multiple weapons are always checked for [disable] special 
If the defender has multiple weapons at the range of the attacker
weapon, choose_defender_weapon calculates the combat outcome and
attacker_combatant_ is set. We still need to check the attack weapon
for the [disable] special in this case.
 2016-09-12 07:48:31 -07:00
mattsc
3c98423547 AI: check whether attack is disabled for units with one attack 
The added conditional only checks whether the [disable] tag is present.
If so, weapon 0 is not automatically assigned. It is then checked in
the following whether the tag is active.

This fixes bug 22179.
 2016-09-12 07:48:31 -07:00
gfgtdf
860e6a13d5 Revert "Slightly more sensible scrollbar positioning on content resize" 
this fixed keyboard (arrowdownkey) scrolling in the campaign list dialog
and maybe in other listboxes or treeviews too.

This reverts commit 1209a2fb5b261fa40635a3871bcd831487a6e4c3.
 2016-09-12 16:37:25 +02:00
gfgtdf
2ff3d2d3aa attempt to fix crash in editor starting positions tool. 2016-09-12 15:59:57 +02:00
gfgtdf
9cc80973f8 initialize the lua kernel earlier 
This allows user defined [effect]s to be used in [unit]s in [side],
previously those units were created before custom effects were available,
 2016-09-12 15:59:56 +02:00
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
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 4e21ae709e59 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 0180a72573a482683485821c8d43a82a546a86c6 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 e993e2820b26
 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