upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-17 02:43:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
61,957 Commits 52 Branches 374 Tags
Commit Graph

61957 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Celtic Minstrel
78fd51ffab Add exclude_amla key to disable an advancement if other advancements are already present 2015-08-22 07:58:56 -04:00
Celtic Minstrel
7a5ba33f5a Change [advance] modifications to [advancement] 
This change maintains backwards compatibility
- [advance] will still work if present
- attempts to add [advance] via Lua will instead add [advancement].
 2015-08-22 07:58:47 -04:00
Nils Kneuper
9a752aa3d9 updated French translation 2015-08-22 12:59:58 +02:00
Charles Dang
a3e8ee38f5 Merge pull request #469 from aginor/sdl2 
Quck fix for textbox input under SDL2
 2015-08-22 21:19:58 +11:00
Ignacio R. Morelle
f852044d4c Merge branch 'staging/pr-449-4' 2015-08-22 02:32:38 -03:00
Ignacio R. Morelle
e399258b44 campaignd: Record the hashed passphrase for new uploads 
Otherwise no passphrase is recorded into the server config and it
becomes impossible to reupload the add-on without admin assistance.
 2015-08-22 02:27:41 -03:00
Ignacio R. Morelle
2278219348 Merge branch 'master' of https://github.com/JohnAnthony/wesnoth into staging/pr-449-4 2015-08-22 01:17:05 -03:00
Charles Dang
6df77620de Replaced story image with larger updated one by LordBob 2015-08-22 10:29:01 +11:00
Andreas Löf
8a7cb40944 Quck fix for textbox input under SDL2 2015-08-21 16:43:34 +12:00
Elvish_Hunter
512c7adb98 wmllint 1.4: used print function 2015-08-20 21:52:42 +02:00
Ignacio R. Morelle
636cc6315f gui2/tgamestate_inspector: Add views for event and menu item handlers 2015-08-20 06:06:32 -03:00
Charles Dang
6e0af4f77e Increased canvas size of English logo and logo bg to 600 (was 440) 
This is for standardization as per discussion with Sgt. Groovy here:
http://forums.wesnoth.org/viewtopic.php?p=588663#p588663
 2015-08-20 19:37:19 +11:00
Charles Dang
f808f3d737 Increased width params of titlescreen progress bar definition to 600 2015-08-20 19:35:08 +11:00
Charles Dang
0103c40c84 Removed orphaned (as of 9f6935da3f13) logo translations from core 
Logo internalization is now kept in root/images/misc
 2015-08-20 15:16:14 +11:00
Charles Dang
bb8fcc8d49 Be less polite in invalid-image-on-upload warning 2015-08-20 14:14:08 +11:00
Charles Dang
f7f497566f Update API to work with the new two layer logo 2015-08-20 13:58:43 +11:00
Charles Dang
f1256049fd New style logo text by Sgt. groovy (English) 
The background is kept in a separate image and the two layers will be blitted together at runtime.
This is to simplify any future needs regarding changes to the text or the background logo, without
having to re-render the whole thing.
 2015-08-20 13:57:00 +11:00
Charles Dang
9f6935da3f Removed unused copy of logo from core 
I thought the help browser might use this, but it uses the logo in root/images/
 2015-08-20 13:52:41 +11:00
Charles Dang
eecbf6efc4 Add 12 new generic storyscreen art pieces by LordBob 
http://forums.wesnoth.org/viewtopic.php?p=551341#p551341
 2015-08-20 10:44:53 +11:00
John Anthony
e50ee3db41 Added password hashing to campaignd 
This will also update existing campaigns stored with a plaintext password to use
the new, more secure system.
 2015-08-19 09:10:07 +01:00
Ignacio R. Morelle
056189d1c6 Fix several null pointer checks done after first use 2015-08-19 02:08:39 -03:00
Ignacio R. Morelle
1f50e28023 gui1: Formatting tweak 
Just so I can get an amendment to the previous commit's message (commit
65ea7152d039b175a80096a6b4077cfbebc7e24f) in without force-pushing.

It was a bitwise AND, yes. That doesn't make any more sense in context
than the fictitious bitwise OR version.
 2015-08-19 01:56:03 -03:00
Ignacio R. Morelle
65ea7152d0 gui1: Fix nonsensical bitwise OR 
This was equivalent to `2 | !1` -> `2 | 0` -> `2`.

Spotted by reluctant_deity from Reddit.
 2015-08-19 01:50:31 -03:00
Ignacio R. Morelle
f572f2f49f Fix unit [resistance] and [jamming_costs] not being used in sync checks 
The typo this commit fixes would direct the game to a non-existent (and
invalid) [jamming_costs resistance] tag instead.

Reported by reluctant_deity on Reddit.
 2015-08-19 01:43:57 -03:00
Ignacio R. Morelle
44312adfcb config: Fix child/const_child_iterator implementations of operator> 
These were identical to operator<, which is clearly not intended. This
wouldn't trigger bugs in practice because they are currently unused
(tested by compiling with the definition removed).
 2015-08-19 01:37:24 -03:00
Charles Dang
c3c0c9c2fd Merge pull request #462 from Vultraz/addon_version_validation 
Addon version validation
 2015-08-19 12:08:34 +11:00
Charles Dang
d51ba383d4 Changelog entry for addon version validation 2015-08-19 12:07:58 +11:00
Celtic Minstrel
deb1cfbd47 Update UtBS to use new female_text= feature for stun special 2015-08-18 21:39:22 -03:00
Charles Dang
4e682dd31e LoW: drop unnecessary small_profile key 2015-08-19 11:37:50 +11:00
Ignacio R. Morelle
5216c544fe Merge branch 'staging/pr-465' 2015-08-18 21:34:57 -03:00
Ignacio R. Morelle
a0268c7ccc Merge branch 'female_text' of https://github.com/CelticMinstrel/wesnoth into staging/pr-465 2015-08-18 21:31:12 -03:00
Elvish-Hunter
66a9cb0986 Merge pull request #460 from Vultraz/master 
Improvement to the bundled GUI.pyw icon
 2015-08-18 20:40:09 +02:00
Elvish_Hunter
427f73815d UtBS: fixed a wmllint warning about translation marks 2015-08-18 20:30:44 +02:00
Celtic Minstrel
001fcdcd89 Update DW to use new female_text= feature for stun special 
(Note: UtBS, and possibly others, should probably be updated too.)
 2015-08-18 14:14:23 -04:00
Celtic Minstrel
766f3a7701 Fix up female_text= especially in [unstore_unit], update changelog 2015-08-18 14:13:48 -04:00
Charles Dang
d13d249ca9 LoW: merged two lua files and cleaned up contents 
This drops preload events for the [shift_labels] WML tag, now putting it cleanly
in the global campaign "namespace"
 2015-08-19 00:42:31 +11:00
Charles Dang
d6c67db110 LoW: expand most util macros from S7 and S16. Delete unused ones 
This removes the redundant inclusion step causing duplicate macro definitions
 2015-08-19 00:17:07 +11:00
Charles Dang
ad127d662f Validate whether addon version to upload is greater than its remote version 2015-08-18 20:43:34 +11:00
Charles Dang
ee549394ed Record remote addon version when fetching tracking info 2015-08-18 19:44:22 +11:00
ln-zookeeper
8f48eab652 Added #undef before NEW_JOURNEY macro redefinition 2015-08-18 10:23:19 +03:00
Ignacio R. Morelle
5108fa05ad Fix version_info ctor calls expecting the sane parameter 
The sane parameter was removed in commit
02a31a5b8945fd6dff235157e317660ae048a89c, but I did not realize that
`false` would still be implicitly cast to char and invoke the usual list
constructor.

Fix this by using the default constructor instead, which does what we
want sans removed parameter.

Note that this mistake and subsequent fix has no bearing on anything
other than code presentation because false and '\0' are the same value
and the three number values are 0 with the default ctor too.
 2015-08-18 03:56:19 -03:00
Ignacio R. Morelle
c36bb4c5d0 preproc: Fix macro definition lines being offset by 1 
This is most noticeable in preprocessor messages involving the
definition location of a macro (redefine warning, argument mismatch
errors). The preprocessor_data linenum_ variable never starts at zero as
far as I can tell.
 2015-08-18 03:22:53 -03:00
Ignacio R. Morelle
987bb787ce preproc: Add warning on macro redefinitions without #undef 
This is intended to help guard authors against unintentional name
clashes.
 2015-08-18 03:20:45 -03:00
Celtic Minstrel
3564b88460 Add female_text= to [unstore_unit] and [animate_unit] 2015-08-18 00:51:27 -04:00
Charles Dang
f07c67ec3e Improvement to the bundled GUI.py icon 2015-08-18 07:36:04 +11:00
Elvish_Hunter
5fd31c88a5 wml tools GUI: added a window icon 2015-08-17 17:02:00 +02:00
Ignacio R. Morelle
5832925172 Merge pull request #450 from Wedge009/master 
Correct handling of Ctrl+Return/Enter hot-key.
 2015-08-17 00:50:52 -03:00
mattsc
6a37f437be Xcode project: update pango modules 
The previous version of the modules worked only with OS X 10.9. This
version works with both 10.10 and 10.9 (and potentially with 10.8; we
currently have no 10.8 system available for testing).

These modules do not work on OS X 10.6 and 10.7. Different methods of
building Wesnoth will be provided for those OS X versions (and
potentially for 10.8).

OS X 10.5 and earlier is no longer supported by Wesnoth 1.13 (that is
unchanged by this commit).
 2015-08-16 19:16:11 -07:00
Ignacio R. Morelle
e7d4eed00d Merge pull request #458 from aginor/sdl2 
Add SDL2 support to CMake, advertise clipboard availabilty and remove a small piece of dead code
 2015-08-16 21:29:56 -03:00
Charles Dang
0dfe2a21d9 Deprecate ANIMATED_CAMPFIRE and ANIMATED_BRAZIER 
Both of these have been replaced with embellishment overlay terrains
 2015-08-17 10:41:46 +11:00