62841 Commits

Author SHA1 Message Date
Martin Proud
44cf166010 Update SDLMain.m
Fixes crash on launch for SDL2 on OS X.
2015-12-29 08:14:12 -06:00
Martin Proud
6738f37375 Merge pull request #1 from ancestral/ancestral-apple-ctrl-click
Update mouse_handler_base.cpp for OS X to look for ctrl-click instead of command-click
2015-12-29 07:58:15 -06:00
Martin Proud
70f04dd2b1 Update mouse_handler_base.cpp
For Apple, control is the modifier key that is used for contextual menus.

KMOD_CTRL will check for a control-click. This fixes #15259 (https://gna.org/bugs/?15259). (I’ve built and verified with this patch, it works correctly.)
2015-12-29 07:53:02 -06:00
gfgtdf
461d2335de fixed build for some compilers. 2015-12-29 02:13:00 +01:00
gfgtdf
781397650e fix test_filesystem 2015-12-28 18:18:07 +01:00
gfgtdf
38af44f734 fixed missing semicolon. 2015-12-28 17:53:46 +01:00
gfgtdf
745f587207 Check fpu rounding mode on non-windows too 2015-12-28 17:16:27 +01:00
gfgtdf
5b79d34de9 Add unit test for correct lua rounding.
http://gna.org/bugs/?24223
2015-12-28 17:02:07 +01:00
gfgtdf
cfca8cf201 Fix luaL_checkinteger rounding
we now always use LUA_IEEE754TRICK to convert double to lua_number even
when lua_number is > 32 bits and LUA_IEEE754TRICK handles numbers with
more than 32 bits incorrectly. (I just assume noone want to deal with
integers > 2^32 in wesnoth anyway)
2015-12-28 17:01:58 +01:00
gfgtdf
a79dd0df9b Attempt to fix strict ansi builds
We now asume IEEE754 when __STDC_IEC_559__ is defined, even when
__STRICT_ANSI__ is also defined. This should specially fix the travis builds
which seem to define __STRICT_ANSI__.
2015-12-28 16:58:44 +01:00
gfgtdf
4924082687 Check floating point mode at startup
this detects wrong floating point modes which cause OOS
(http://gna.org/bugs/?24223) or even casue lua to crash, because lua relies
on IEEE 754 double precision and also on IEEE 754 nearest rounding.
2015-12-28 14:27:37 +01:00
gfgtdf
3955308e7e reorder includes 2015-12-28 14:27:36 +01:00
gfgtdf
3a7e7b4588 add enum -> cstring conversion functions to MAKE_ENUM 2015-12-28 14:27:35 +01:00
gfgtdf
7df90e31a5 format fixes 2015-12-28 14:27:34 +01:00
gfgtdf
d0c011ea01 attempt to fix OOS caused by luaL_checkinteger
http://gna.org/bugs/?24223
2015-12-28 14:27:32 +01:00
gfgtdf
b60c168adb always use '_' instead of ' ' in eventnames in wesnoth.game_events.on_event
This makes the envtnames in on_event consistent, i chose to use '_'
instead of ' ' becasue those eventnames can then for example be used as
lua variablenames.
2015-12-28 14:27:31 +01:00
gfgtdf
f85af1c1d4 fix linger mode saves beeing loaded incorrectly. 2015-12-28 14:27:30 +01:00
Charles Dang
eb61323e73 tunit_create: fix unit attack damage/strikes being displayed in the wrong order 2015-12-27 15:14:50 +11:00
Andreas Löf
bca463d10e Update RELEASE_NOTES and INSTALL for SDL2 2015-12-27 10:00:34 +13:00
Celtic Minstrel
aa1ea043bb Use boost::none instead of boost::none_t()
Fixes bug 24227
2015-12-25 08:17:33 -05:00
loonycyborg
da721f7a77 scons: pass -F pe-i386 to windres for 32-bit multilib builds 2015-12-23 16:25:32 +03:00
ln-zookeeper
a8f59fb11e Removed a redundant accidentally unique string 2015-12-22 19:36:19 +02:00
ln-zookeeper
70aa77d456 Defense and magic animations for Orcish Shamans, by SkyOne
Also slightly changed baseframes for old and novice.
2015-12-22 18:57:47 +02:00
ln-zookeeper
6c6623f5ea Unified crossbow timing to -300 2015-12-22 18:27:45 +02:00
ln-zookeeper
28354fb66f Tweaked Mage of Light melee animation slightly 2015-12-22 18:21:30 +02:00
ln-zookeeper
94bb8d4857 Unified flail sound timing to -250 2015-12-22 18:20:30 +02:00
ln-zookeeper
73f0b59b61 Unified mace sound timing to -100 2015-12-22 17:53:00 +02:00
ln-zookeeper
eb1da88f67 Unified staff sound timing to -125 2015-12-22 17:44:51 +02:00
ln-zookeeper
d8e5410086 Wired in the new staff sounds 2015-12-22 17:34:01 +02:00
ln-zookeeper
d684d3c0d9 Fixed Relana's screwed up mace sound and shortened the animation a bit 2015-12-22 17:25:05 +02:00
ln-zookeeper
00fe63b474 Fixed Relana's gender not working 2015-12-22 17:21:44 +02:00
ln-zookeeper
3118969428 Wired in new mace sounds 2015-12-22 17:07:21 +02:00
ln-zookeeper
54757dc776 Added animations and fixed TC for Naga Hunter and Naga Guardian line 2015-12-22 16:58:15 +02:00
ln-zookeeper
df3b0da213 Updated sprites for Naga Hunter and Naga Guardian line 2015-12-22 14:21:36 +02:00
Charles Dang
c951043d58 Resave lua codeblocks projfile
File generated with CB 13.12
2015-12-22 16:36:23 +11:00
Charles Dang
b8a821e388 Enable SDL2 building by default in codeblocks project 2015-12-22 16:35:56 +11:00
gfgtdf
571014f374 remove undocumented [wml_action] tag
there is no reason to use this when lua code can easily add a function
to wesnoth.wml_actions directly.
2015-12-21 23:32:47 +01:00
gfgtdf
4c955e7461 don't use __shallow_literal directly
the passed config might not be a vconfig.
2015-12-21 20:53:47 +01:00
gfgtdf
1eefcddc17 use wesnoth.advance_unit to advance units in [harm_unit] 2015-12-21 20:53:45 +01:00
gfgtdf
b4e5f16d74 improve formatting in lua code.
This also fixes a bug in [harm_unit] where a second arument was passed
to wml_actions.animate_unit which was obviously meant to be part of the
first argument.

This also changes harm_unit to use wml_actions.animate_unit instead of
wesnoth.animate_unit becasue the former is better known an thus easier
to understand.
2015-12-21 20:53:44 +01:00
Elvish_Hunter
9b7b1751fd Removed trailing tabs and whitespaces from C++ source
I used this command line: find <source directory> -name \*.\[ch\]pp -print0 | xargs -0 sed -i 's/[[:blank:]]*$//'
2015-12-21 20:39:46 +01:00
gfgtdf
203f7b0ded clenaup DW scenario9 scorpion placement code. 2015-12-21 13:11:14 +01:00
ln-zookeeper
13aef0a542 Added SkyOne to art credits 2015-12-21 09:10:39 +02:00
ln-zookeeper
0b5e960f59 Defense animations for the Rogue Mage line, by Skyone 2015-12-21 09:09:56 +02:00
gfgtdf
ad424f8c03 remove duration='turn_end' ('turn end' still works)
'turn end' did exactly the same. So we we basicalls did this work twice.
'expire_modifications' is not a cheap taks because it needs to check
every modification in every unit.
2015-12-20 22:06:10 +01:00
gfgtdf
d02f76e3c0 disable show replay for start-of-scenario saves
This also disables 'cancel orders' for those saves.

Actually 'show replay' should also be disabled when loading the save via
mp load game dialog, but implementing that would be wasted time if we
decide to support replays in map some time.
2015-12-20 22:06:07 +01:00
gfgtdf
7199146978 replace all '_' with spaces in event names
This incnsitency was confusing, i choose to use spaces becasue thats
what most event names used.
2015-12-20 22:06:04 +01:00
Elvish_Hunter
5d390d4de1 changelog entry 2015-12-20 21:49:34 +01:00
Elvish_Hunter
9b1262acc6 Converted imgcheck to Python 3
This commit also fixes the Pillow library not being imported correctly, which prevented the script from running at all, and slightly reformats the output.
2015-12-20 21:46:25 +01:00
Charles Dang
d84445f4aa Editor: don't use border when applying mask 2015-12-20 13:22:54 +11:00