upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-21 14:50:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
59,570 Commits 52 Branches 374 Tags
Commit Graph

59570 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Beck
cf57ddf067 travis: only run apt-get upgrade when the cpp unit tests run 2014-12-12 16:55:10 -05:00
Chris Beck
36e4707ba7 fix copy assignment operator for unit 
The new version is exception safe, using copy and swap, and should
be correct with reference counting.
 2014-12-12 16:46:02 -05:00
Chris Beck
4cb78d9149 travis: skip apt-get upgrade on the CXX11 build 
it doesn't run the test executable anyways
 2014-12-12 14:25:14 -05:00
Chris Beck
3f0aacac0f travis: add apt-get upgrade (experiment) 2014-12-12 05:58:18 -05:00
Chris Beck
bde498b55b travis: refactor and clean up 2014-12-12 04:38:41 -05:00
Alarantalara
7cb0f5c86a Support new versions of Growl and Apple notification center. 2014-12-11 23:27:07 -05:00
gfgtdf
ae86186db7 add utf8 to default locale 
there were some occurences reported in the forum that the old code assumed ascii encoding in some cases.
 2014-12-11 23:10:09 +01:00
gfgtdf
4ec215042e LOG_GAME -> DBG_GAME 2014-12-10 23:31:41 +01:00
gfgtdf
213c8293ba make force_lock_settings default to true for [scenario] 
In most cases the campaigns designer don't want the use to be able to
overwrite scenario properites like "turn limit" or "use fog".

It is easiert to do this here in the code that loads the config than in
the code that reads that value becasue there are multiple codes that
read it and it's not clear that all of then know whether teh scenario
was a [multiplayer] or a [scenario].

Partly implements http://gna.org/bugs/?23037 which suggests to remove
the ability to overwite those settings in capaigns completely.
 2014-12-10 20:33:19 +01:00
Chris Beck
6dfb9d156d fixup HEAD^ 2014-12-10 14:29:06 -05:00
Chris Beck
20e9706c11 refactor commit 3f3687388f7ee528931de15a25a0b5acb4697561 2014-12-10 14:08:02 -05:00
gfgtdf
085507d18a fix compile error 
msvc didn't have a problem with the previous code.
 2014-12-10 19:15:42 +01:00
gfgtdf
7788fbaa01 remove old rng code 
the new boost mt rng returns full 32 bits of random so we don't need to
call it twice anymore if we need more than 15 bits of random.
 2014-12-10 03:50:21 +01:00
gfgtdf
d9352503b2 fix indention 2014-12-10 00:46:13 +01:00
gfgtdf
f8dd7d6c87 catch boost locale conversion_error 
and add some more debug info in boost locale.
 2014-12-10 00:31:06 +01:00
gfgtdf
f996427c7b fix oos message. 2014-12-10 00:31:05 +01:00
gfgtdf
a1d27250c8 simplify use of config_of 2 2014-12-10 00:31:04 +01:00
gfgtdf
9f798cb4f1 add debug info. 2014-12-10 00:31:03 +01:00
gfgtdf
ee3cf59334 fix mp seed generation 2014-12-10 00:31:02 +01:00
ln-zookeeper
2a1387186c Simplify an event 2014-12-09 16:35:05 +02:00
ln-zookeeper
aa685d7e56 Scrap the random guard placement 
The guard placement randomization is practically impossible to write so
that it'd guarantee a route through the map without making it too
trivial.

Now, there are 3 separate hardcoded guard layouts, one of which will be
chosen at random.
 2014-12-09 16:14:47 +02:00
Chris Beck
6102ff4819 add comments about using iomanip with logger 2014-12-07 22:46:55 -05:00
gfgtdf
a9cc3b2753 remove unused lua code 
this lua codes weren't used, on the other hand they break modifications that could be used with LoW otherwise.
 2014-12-07 20:51:22 +01:00
ln-zookeeper
6943bc0d6a Removed uses of SOUND:SLOW and SOUND:POISON 2014-12-07 14:28:46 +02:00
ln-zookeeper
1ff69616bf Decoupled slow and poison sounds from animations 2014-12-07 14:27:05 +02:00
Chris Beck
d1d0990235 add a unit test for wesnoth.require 2014-12-06 23:32:29 -05:00
Chris Beck
69d7924df5 add a wml unit test for lua dofile 2014-12-05 15:30:12 -05:00
Chris Beck
bae61e944f fixup wesnoth.require after commit HEAD^ 
It was implicitly assuming that loadfile takes arguments from the
bottom of the stack.
 2014-12-05 15:26:15 -05:00
Chris Beck
e5d85d2192 fix bug #23027 (wesnoth dofile) 
The bug is fixed by making lua_fileops::load_file consume its
stack argument. That function is also changed so that it takes
its argument from the top of the stack instead of the bottom, which
is a bit more normal.
 2014-12-05 15:02:35 -05:00
gfgtdf
e78fde8137 simplfy use of config_of 
when using config_of with config_of child we now don't need to
explicitly cast the child to config.
 2014-12-05 20:39:01 +01:00
Chris Beck
9aa75d4182 Merge branch 'master' of https://github.com/wesnoth/wesnoth 2014-12-04 18:45:12 -05:00
Chris Beck
675c8a95f7 bugfix: swallow exceptions in save_blocker dtor 
See code comments for more discussion.
 2014-12-04 18:44:39 -05:00
Charles Dang
0c3f3e31e0 Revert "Dropped -fopenmp flags" 
This reverts commit f755b77fbd7fa38c63df8306459b1b9b589c0c98.
 2014-12-05 06:16:12 +11:00
Charles Dang
f755b77fbd Dropped -fopenmp flags 
For some reason CodeBlocks automatically changed all forward slashes to back slashes
This shouldn't mess anything up
 2014-12-05 06:10:39 +11:00
Charles Dang
8ed95e7629 Ignore projectfiles/CodeBlocks/cb/ 
This is the default dir name for the extracted CB SDK zip we provide, and the projectfiles folder
is a logical place to put it
 2014-12-05 05:18:40 +11:00
Charles Dang
ff3f5daf6c UtBS S10: 'tallest peak was build' -> '[...] built' 2014-12-04 19:03:32 +11:00
ln-zookeeper
f27027bfa6 Fix bug #23024 by repositioning {SOUND:SLOW} 2014-12-04 09:40:31 +02:00
anonymissimus
23ca125d4e disable several 1000 boost header level 4 MSVC warnings project-wide 2014-12-03 14:35:31 +01:00
anonymissimus
fbd8652495 avoid MSVC warnings about macro redefinitions INADDR_ANY, -BROADCAST, -NONE 2014-12-03 14:35:25 +01:00
anonymissimus
6983cfb53e mute MSVC warnings in a boost header 2014-12-03 14:35:17 +01:00
anonymissimus
d6ddcb78a3 fix warnings about unreferenced local variable 2014-12-03 14:34:55 +01:00
Chris Beck
392f980dbf Revert "travis: as a test, try turning off the nogui option for play test" 
This reverts commit 6bca3fa96db46908c5914b8315024344e784e882.
 2014-12-02 20:57:13 -05:00
Chris Beck
6bca3fa96d travis: as a test, try turning off the nogui option for play test 2014-12-02 20:12:08 -05:00
gfgtdf
6844e4334a Merge pull request #340 from gfgtdf/wesnothd_sides 
use boost::ptr_vector for wesnothd::game::history_
use boost::ptr_vector for wesnotd::server::games_
 2014-12-02 23:33:39 +01:00
Chris Beck
db481fb984 playcontroller: fixup a return type to be more specific 2014-12-01 19:20:22 -05:00
Chris Beck
c7a0c1e4ef push an assertion re: end turn exception further down callstack 2014-12-01 19:09:08 -05:00
anonymissimus
97bd3a92a5 remove unreachable code 
better fix than 21924cae74ba541d0a2ed035d241346d3c376eb8
 2014-12-01 17:05:30 +01:00
Chris Beck
218d7370ea check properly if a config attribute value is not a boolean 
I don't know if this commit is related to or fixes any bugs, but
there are many bugs reported about fog / shroud / mp campaigns it
seems, and these lines always looked a bit squirrely to me. Since
boolean config values can be indicated by "yes", "no", "true" or
"false", testing for the presence of "yes" / "no" only seems like
it won't work in general, even if it works oftentimes. This commit
replaces it with a test for whether the to_bool function is
selecting the default boolean value.
 2014-11-30 19:40:10 -05:00
anonymissimus
21924cae74 mute an invalid MSVC warning about unreachable code 2014-12-01 00:15:19 +01:00
anonymissimus
ca0a17f791 fix MSVC warning about comparison signed <-> unsigned 2014-11-30 23:58:27 +01:00