upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-06 19:15:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
63,974 Commits 60 Branches 374 Tags
Commit Graph

63974 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Löf
358bd1235f Remove SDL1.2 code 
This removes all legacy SDL1.2 code. It was done by invoking:
coan source --replace --no-transients -D"SDL_VERSION_ATLEAST(X, Y, Z)"=1 <file>
on each file.
 2016-03-13 11:34:34 +13:00
Andreas Löf
5c6e7c7d20 Remove SDL1 from SCons and CMake 
This makes SDL2 the only build alternative for Wesnoth. Any
conditionals are removed, leaving only the settings that rely on SDL2.
 2016-03-13 11:34:29 +13:00
Elias Pschernig
1279214968 [wmlparser3] use less recursion when parsing 
specifically, avoid recursion for every double double-quite (i.e. the
escaping of " as "")
 2016-03-11 17:12:36 -05:00
Charles Dang
cd84293b63 taddon_list: cleanup and progress 2016-03-12 02:33:14 +11:00
Charles Dang
80bd8883cd taddon_list: more layout progress 2016-03-11 23:02:39 +11:00
Charles Dang
4b2e7217d8 GUI2: added Large button definition 
Right now this uses the @2x images intended for Retina support. Should look into
getting some dedicated images made.
 2016-03-11 23:02:00 +11:00
Charles Dang
cb0f7d81fa Added macro for a horizontal spacer line 2016-03-11 21:40:41 +11:00
Charles Dang
aa880e57e9 Exclude addon_list from tests 2016-03-11 18:17:50 +11:00
Charles Dang
07065cea46 Purge RELEASE_NOTES 2016-03-11 15:42:13 +11:00
Charles Dang
c6aa92d028 taddon_list: initial prototype for new full-window GUI2 addons manager 
This is still behind the --new_widgets guard and is not ready for deployment yet
 2016-03-11 01:56:28 +11:00
Charles Dang
7bb10ec2d6 tunit_recruit: use full unit preview pane 2016-03-11 00:34:55 +11:00
Charles Dang
dc2a4d05c6 tunit_create: make sure listbox fills horizontal space 2016-03-11 00:29:37 +11:00
Charles Dang
60c7680ba4 tunit_preview_pane: moved unit name under profile button 2016-03-11 00:04:50 +11:00
Charles Dang
475e87c076 tunit_recruit: used help button definition for help button 2016-03-11 00:03:54 +11:00
Charles Dang
7c239974da GUI2: added 'help' button definition 2016-03-11 00:03:12 +11:00
Charles Dang
0584118c7e Updated GUI2 schema for unit preview pane 2016-03-10 22:39:11 +11:00
Charles Dang
cb0ebc01d4 tunit_preview_pane: removed invalid keys in toplevel grid 2016-03-10 22:37:47 +11:00
Charles Dang
481bad8539 tunit_preview_pane: removed newlines between attacks to save some space 2016-03-10 22:06:52 +11:00
Charles Dang
49102677a9 Improved Hotkeys icon for prefs 2016-03-10 21:50:56 +11:00
Andreas
6128aef97a Merge pull request #625 from Wedge009/patch-1 
Add files missing from VC project
 2016-03-10 20:33:25 +13:00
Wedge009
206bed161e Add missing files 2016-03-10 18:31:31 +11:00
Charles Dang
07302e2730 More attempts to fix tests 2016-03-10 17:05:39 +11:00
Charles Dang
8b22341e19 Attempt to fix tests, again 2016-03-10 14:22:18 +11:00
gfgtdf
1667e8680c attempt to fix bug in gui2 listbox filters. 2016-03-10 03:48:49 +01:00
Charles Dang
7b23a3940b Fixup 09bb648bfa98 2016-03-10 04:41:04 +11:00
gfgtdf
fce35e3ad6 attempt to fix bug related to leaders id attribute 2016-03-09 17:37:14 +01:00
Charles Dang
09bb648bfa Add Unit Recruit to gui2 unit tests 2016-03-10 03:30:31 +11:00
gfgtdf
d424911eeb Revert "Fix team_info::side_name() returning wrong type" 
This reverts commit 89ef1d318a7f219586ee894da46514dbb312cfe7.

That commit made side_name() return a wrong value in case
current_player changed during a game.
 2016-03-09 16:12:20 +01:00
gfgtdf
49ee9daad7 dont have reserved sides in singleplayer connect engine. 2016-03-09 16:12:08 +01:00
gfgtdf
4810e2c0ff add warning if current_player attribute is specified by wml 
specifying this attribute in [side] can result in assertion failure.
 2016-03-09 16:12:08 +01:00
Charles Dang
f4590e6bda Fixed recruitment accidentally using type name instead of id 2016-03-10 01:33:42 +11:00
Celtic Minstrel
26be1be486 Update XCode project 2016-03-09 09:15:00 -05:00
Celtic Minstrel
89ef1d318a Fix team_info::side_name() returning wrong type 
This info is translatable, but it was returned as a plain string.
 2016-03-09 08:56:43 -05:00
Charles Dang
e7c2533c5e Slightly bumped contrast on Rockbound Cave 2016-03-09 23:42:40 +11:00
Charles Dang
cab4d9fe48 Attempt to fix a compile error in master 2016-03-09 20:57:40 +11:00
Charles Dang
1265ee1fc9 Merge pull request #623 from Vultraz/unit_preview_pane 
GUI2: Unit preview pane
 2016-03-09 20:43:43 +11:00
Charles Dang
42816df6f6 Converted Recruit dialog to GUI2 2016-03-09 19:52:25 +11:00
Charles Dang
2b46bb7e46 tunit_preview_pane: added minimal definition (no image/title) 2016-03-09 19:19:08 +11:00
Charles Dang
99ea0aa716 tunit_create: made use of unit preview pane widget 2016-03-09 19:15:14 +11:00
Charles Dang
29e19cd854 GUI2: implemented a Unit Preview Pane widget 2016-03-09 19:15:13 +11:00
gfgtdf
41f5853028 Merge pull request #622 from gfgtdf/side_name 
Side name
 2016-03-08 20:23:24 +01:00
gfgtdf
c941f60c49 add new attribute side_name= in [side] 
We cannot call it name becasue thats already used by the unti that is
generated from the side tag.

if given (nonempty), side_name= will be used instead of current_player
in some dialogs (new turn dialog, statistics).

In [scenario] side_name= defaults to name= while in [multiplayer]
side_name= defaults to empty (so that current_player is used in those
dialogs by default).

This specially fixes http://gna.org/bugs/?24226 while still giving wml
authors in mp and in sp the option to use the real players name in those
dialogs.
 2016-03-08 17:44:30 +01:00
gfgtdf
0d254fb03e 'current_player' shouldn't default to 'save_id' 
this doesn't make sense, specially because 'current_player' is a string
used to display in dialogs and 'save_id' is an internal id string

https://gna.org/bugs/?22324,
 2016-03-08 17:04:05 +01:00
gfgtdf
fcf8619a69 rename a c++ varaible to match config attribute name. 2016-03-08 17:00:15 +01:00
ln-zookeeper
6b297edfed Added chasm transitions for mine walls, and tweaked a few tiles 2016-03-08 17:26:10 +02:00
ln-zookeeper
f3d5092534 Replaced regular mountains with desert/snowy mountains in a few places 2016-03-08 11:47:58 +02:00
ln-zookeeper
b23e6d7882 Added missing portrait credits 2016-03-08 02:01:20 +02:00
gfgtdf
1efd5c750e Update schema.cfg 2016-03-07 23:16:28 +01:00
gfgtdf
90643a6336 have modifications in campaign dialog visible by default. 2016-03-07 22:39:03 +01:00
gfgtdf
c357d91a43 implement up/down key handlers for treeviews 2016-03-07 22:38:46 +01:00