upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-05 17:10:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,174 Commits 60 Branches 374 Tags
Commit Graph

57174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aquileia
c19e729c6b gitignore: Merge rules from doc/ and data/tools 2014-06-09 01:00:50 +02:00
aquileia
1715ab3145 gitignore: Include more rules from subdirectories 
That is: data/lua/, scons/, and utils/
 2014-06-09 01:00:45 +02:00
aquileia
1e9a508795 gitignore: Merge rules from projectfiles/ 2014-06-09 01:00:41 +02:00
aquileia
5db587182d gitignore: Block some extensions 2014-06-09 01:00:38 +02:00
aquileia
15503ff27e gitignore: Fix order of rules for Makefiles 
The exceptions were applied before the generic rule, thus they had
no effect.
 2014-06-09 01:00:34 +02:00
aquileia
0abdaf7a96 gitignore: Reduce number of false positives 
Especially in utils/umc_dev/ a massive number of files matched ignore
rules. As tracked files can't be ignored, this had no real consequences.
 2014-06-09 01:00:30 +02:00
aquileia
05641062c8 gitignore: Merge dozens of "Thumbs.db" rules 
It suffices to apply the rule once in the root directory.
 2014-06-09 01:00:26 +02:00
aquileia
665a297445 Remove unnecessary translation scripts 
The new gitignore rules will automatically ignore these.
 2014-06-09 01:00:22 +02:00
aquileia
af9761fa81 gitignore: Merge rules from po/**/.gitignore files 2014-06-09 01:00:18 +02:00
aquileia
cdd8b932ee gitignore: Additional cmake rules 2014-06-09 01:00:15 +02:00
aquileia
88d3d76c12 gitignore: Keep README and COPYING files 2014-06-09 01:00:11 +02:00
aquileia
f30a332963 gitignore: Restructure existing rules 
Organize the rules into groups corresponding to the tools creating
these files.

Use blank lines and comments for clarity.
 2014-06-09 01:00:07 +02:00
aquileia
9b1fea031f Restructure .gitignore file 2014-06-09 01:00:02 +02:00
gfgtdf
bbcae1c14e remove unused function 2014-06-09 00:51:38 +02:00
Ignacio R. Morelle
f7c34dfaad Don't catch config::error in config_cache::read_configs() 
Reverts a bit of commit d6dfec6151fb6eb5dd2d9f2d96920f1a9d7ec1ca to fix
a regression affecting both master and 1.12 since after version 1.11.14
which was causing WML validity errors to not abort the WML load process
or result in a message to the user in the GUI.

The WML parser and preprocessor throw config::error and
preproc_config::error to signal callers of issues with user input (WML
documents, in this case).

We need any exceptions thrown by the WML parser or preprocessor to
propagate upstream so they can be caught by the code responsible for
initiating the sequence so it can best decide how to present them to the
user. For example, the game_config_manager class will format and pass
them to gui2::twml_error so that the user can be informed of errors in
an add-on or mainline through the GUI.

Because config_cache::read_configs() was catching the exception and not
propagating it upstream due to a change that's part of the
aforementioned commit, this sequence was broken, and while the error was
reported to stderr, the game continued as normal in most cases with
a malformed half-parsed WML tree, resulting in all kinds of misbehavior.

This issue was originally reported in the forums by SkyOne:
<http://r.wesnoth.org/p571380>
 2014-06-08 16:47:06 -04:00
Chris Beck
57cc44be64 game_display uses game_board in it's constructor 2014-06-08 14:59:20 -04:00
Chris Beck
8534aa2851 remove unnecessary argument to game_display::scroll_to_leader 
The function was requiring a reference to unit map, although
the game_display owns a referece to this, and it was always
called with that instance.
 2014-06-08 12:44:03 -04:00
Chris Beck
0d0c5df85a Merge pull request #194 from cbeck88/add_catch_all_to_main 
main catches and handles all exceptions last, returning 1

This is to ensure that all resources are freed even after a crash.
 2014-06-08 08:06:50 -04:00
Boldizsár Lipka
2bdb4568eb Use SDL2's render API to clear the background and render the logo. 
Only affects SDL2 builds.
 2014-06-08 10:58:38 +02:00
Boldizsár Lipka
d85f74e64d Make the global twindow object globally available. 
Note: This is a quick an not really elegant change. I'll fix this as
soon as I'll have figured how CVideo and twindow should relate to
eachother.
 2014-06-08 10:58:38 +02:00
Boldizsár Lipka
0ec70a22fd Add a function to check if the handled pointer is NULL. 2014-06-08 10:58:38 +02:00
Boldizsár Lipka
f3258c7504 Add a function that clears the window with a specified color. 2014-06-08 10:58:38 +02:00
Boldizsár Lipka
bccfa89910 Add a default ctor for ttexture. 2014-06-08 10:58:38 +02:00
Boldizsár Lipka
91f00a4c65 Apply a more conventional indent style. 2014-06-08 10:58:37 +02:00
Boldizsár Lipka
eea2f2dae6 Use const arguments where appropriate. 2014-06-08 10:58:37 +02:00
Boldizsár Lipka
8db561f334 Use references where NULL pointers aren't allowed. 2014-06-08 10:58:37 +02:00
Mark de Wever
970c36bbcc Avoid narrowing; it's not allowed in C++11. 2014-06-08 10:05:34 +02:00
Chris Beck
2cf2025ae4 catch exceptions thrown from whitebaord future_map_if_active dtor 2014-06-08 00:05:43 -04:00
Chris Beck
3c90eeb125 catch exceptions thrown from whiteboard future_map dtor 2014-06-08 00:05:08 -04:00
Chris Beck
db09f880c2 catch exceptions thrown from server/game dtor 2014-06-08 00:00:18 -04:00
Chris Beck
29cce9cc97 catch exceptions thrown from game_controller dtor 2014-06-07 23:59:10 -04:00
Chris Beck
5c5eb5bc43 catch exceptions thrown from multiplayer_wait dtor 2014-06-07 23:58:56 -04:00
Chris Beck
b9b3a3bdc7 catch exceptions thrown from multiplayer_configure dtor 2014-06-07 23:58:44 -04:00
Chris Beck
312df6536e catch exceptions thrown from playturn_network_adapter dtor 2014-06-07 23:58:32 -04:00
Chris Beck
a784abd045 catch exceptions thrown from replay_network_sender dtor 2014-06-07 23:56:00 -04:00
Chris Beck
9dd32c490e catch exceptions thrown in server man_manager dtor 2014-06-07 23:44:59 -04:00
Chris Beck
bdd3edd58c catch exceptions thrown in unit_movement_resetter dtor 2014-06-07 23:43:19 -04:00
Chris Beck
0e24beb6aa catch exceptions thrown in unit dtor 2014-06-07 23:42:06 -04:00
Chris Beck
0ce40e751c catch exceptions thrown in tooltips manager dtor 2014-06-07 23:41:26 -04:00
Chris Beck
84b2cb2f67 catch exceptions thrown in whiteboard mapbuilder dtor 2014-06-07 23:40:01 -04:00
Chris Beck
8231aa9345 catch exceptions thrown in whiteboard temporary unit hider dtor 2014-06-07 23:37:36 -04:00
Chris Beck
675eb58975 catch exceptions thrown in whiteboard highlighter dtor 2014-06-07 23:37:22 -04:00
Chris Beck
c65d367c44 catch exceptions thrown in ai::holder dtor 2014-06-07 23:37:00 -04:00
Chris Beck
7b0c4e6f8e catch exceptions in temporary mover, placer, remover dtor's 2014-06-07 23:24:49 -04:00
Chris Beck
4e7aa83647 catch exceptions in game_display, game_display::fake_unit dtor's 2014-06-07 23:22:53 -04:00
Chris Beck
f165a55657 catch exceptions from playmp_controller destructor 2014-06-07 23:20:44 -04:00
Chris Beck
4b2ea78702 catch exceptions from multiplayer_create destructor 2014-06-07 23:19:39 -04:00
Chris Beck
55d5a11c1e catch exceptions in preferences manager destructor 2014-06-07 23:17:28 -04:00
Chris Beck
9da0b4c4c8 Merge pull request #191 from cbeck88/fixup_exceptions 
Fixup exceptions in playcontroller

This sequence of commits attempts to refactor the engine so that at least the play controller does not use "end_level_exception" and "end_turn_exception" for normal flow control. This helps us to simplify the normal working of the engine and make it less opaque, and should help to get the networking logic working as intended more easily.

I suppose that if we continue this way, we could push all the throws into the 
event handler and the replay module. Perhaps could continue from there, 
but likely at some point the exceptions might be the simpler solution. This
seems to be enough for now, and it has been tested thoroughly.
 2014-06-07 21:51:54 -04:00
Chris Beck
5e0f420277 before_human_turn signals rather than throwing 2014-06-07 21:11:15 -04:00