loonycyborg
8ef3e27ece
Fix unknown <> sequence error
2016-07-24 23:19:28 +03:00
Celtic Minstrel
220a85377d
Fix extraneous quote
2016-07-24 14:33:24 -04:00
Charles Dang
aea6cbbabc
Tiny tweak to vertically centered text to make it more centered
2016-07-24 13:51:36 +11:00
ancestral
ce50063f1a
Removed include for sdl_net
2016-07-23 21:45:15 -05:00
Charles Dang
7a859a2ece
Fixup a5130a4c3600 (forgot to include small resolution buttons)
2016-07-24 10:00:01 +11:00
Charles Dang
a5130a4c36
Made sure menu button are flush with window border
2016-07-24 09:56:12 +11:00
Charles Dang
d90f1eae7b
tlua_interpreter: fixed placement of Clear button
2016-07-24 09:48:42 +11:00
Charles Dang
9f6d9b45cb
Use darker borders on titlescreen panels
2016-07-24 09:45:25 +11:00
Charles Dang
a3e535300b
Revert "Don't show any images for buttons in menu bar"
...
This reverts commit a4c4f18a7c45ef8c652fe9be72d166ab3e798309.
2016-07-23 15:27:15 +11:00
Andreas
b9b97bab84
Merge pull request #709 from jyrkive/fix-event-context-crash
...
Fix undefined behavior on destroying an event context
2016-07-23 11:09:34 +12:00
Jyrki Vesterinen
8a296386e3
Fix undefined behavior on destroying an event context
...
The destructor of the context class accidentally incremented the iterator
twice per iteration. If the number of event handlers was odd, the
destructor ended up incrementing the end iterator, which is UB.
I rewrote the whole destructor. It's unnecessary to manually remove event
handlers from the list because the list will do it automatically when it's
destroyed.
2016-07-22 21:05:08 +03:00
Celtic Minstrel
681322bf29
Update changelog
2016-07-21 18:04:04 -04:00
Charles Dang
6ed995c53e
Cleaned up some units/animation.hpp includes
2016-07-22 03:21:17 +11:00
Celtic Minstrel
6587ffeba6
Merge pull request #708 from jyrkive/multiprocessor-compilation
...
Visual Studio: enable multi-processor compilation
2016-07-20 15:13:21 -04:00
Jyrki Vesterinen
f56cb7f9bb
Visual Studio: enable multi-processor compilation
2016-07-20 18:40:05 +03:00
Celtic Minstrel
939e15f771
Merge pull request #670 from dorng/core_logo
...
[game_config]: new keys for logo
2016-07-19 23:14:47 -04:00
Charles Dang
02a43e2d61
tpreferences: small hotkey tooltip tweak
2016-07-20 13:57:04 +11:00
Charles Dang
ee8ff792b5
Cleaned up map generator code
2016-07-20 13:57:03 +11:00
Jyrki Vesterinen
a8c3bac31f
Update Visual Studio project files ( #706 )
2016-07-19 14:08:55 -04:00
Bär Halberkamp
1d8d843a80
move set_variable.rand's logic to helper.rand
2016-07-19 13:48:31 -04:00
Charles Dang
34d78f2a2a
Updated CB projfile
2016-07-20 01:02:19 +11:00
Lari Nieminen
849cacceb1
Merge pull request #699 from GregoryLundberg/GL_L_final
...
Liberty fixes
2016-07-19 16:31:53 +03:00
Lari Nieminen
b02e084064
Merge pull request #690 from GregoryLundberg/GL_AOI_recruit_mages
...
AOI Linaera should recruit Mages, not Elves
2016-07-19 16:30:53 +03:00
Gregory A Lundberg
4e75868bf6
AOI Update changelog
2016-07-19 07:19:58 -05:00
gfgtdf
ca1811228a
fix asserion failure when redoing and undoing menu actions.
2016-07-19 13:46:33 +02:00
gfgtdf
d43e5ad8bc
fix compilation
2016-07-19 13:17:48 +02:00
gfgtdf
084dfc9887
make victory event fire on proceed_to_nextlevel
...
This changes the behaviour of victory event so that they are now also fored when there is at least one human that is victorious, for sp and for coop mp scenarios the conditions when victory is fired is the same as before, in non-coop mp games the victory event will now also be fired whenever there is any human side that wins, since such scenarios usually don't use victory events this is not tha much of an issue. For those cases i added the 'local_victory' event (maybe if people want to print congratulation messages in their mp maps or similar)
The reason for this change is that now, since victory events fire on all client the same ,way we can mark them as synced, this specially fixes issues with invalid unit ids of units created suring victory events in sp.
2016-07-19 13:16:21 +02:00
Lari Nieminen
a09f0ed6a9
Merge pull request #689 from GregoryLundberg/GL_AOI_fixes
...
An Orcish Incursion fixes
2016-07-19 11:25:13 +03:00
Charles Dang
fbcf4943b1
Use darker window border color
2016-07-19 13:07:14 +11:00
Celtic Minstrel
465ca498b6
mapgen: Fix erroneously trying to generate road names
...
when no [naming] is provided
2016-07-18 20:59:49 -04:00
Celtic Minstrel
a824d88079
Lua API: Make end level data mutable
2016-07-18 20:59:49 -04:00
Celtic Minstrel
be2a613fff
Move Lua dispatch shim to top of file
2016-07-18 20:59:49 -04:00
Celtic Minstrel
93c9d7e557
Revert SP uses of end_scenario directly tied to victory
2016-07-18 20:59:49 -04:00
Charles Dang
2a86c6ec46
Cleaned up a few halo.hpp includes
2016-07-19 02:13:08 +11:00
Charles Dang
dd88d4906e
Appropriately handle std::stoi exceptions
2016-07-19 01:38:24 +11:00
Celtic Minstrel
7b83343b36
fixup
2016-07-18 09:11:38 -04:00
Andreas
5e7d558228
Merge pull request #696 from wesnoth/Vultraz-event_handling_fixes
...
Refactored event contexts to use lists instead of vectors
2016-07-18 23:50:21 +12:00
Celtic Minstrel
2d7d6a0dde
Fix crash when trying to draw a unit with no image
2016-07-18 02:39:12 -04:00
Celtic Minstrel
da30504945
Fix issue when generating a name for a raceless unit
2016-07-18 01:29:45 -04:00
Celtic Minstrel
7286ea8e0f
Merge pull request #661 from spixi/name_and_map_generator
...
Improvements in the name and map generators
2016-07-18 01:10:46 -04:00
Celtic Minstrel
ab504f4458
Update XCode project
2016-07-18 00:47:16 -04:00
Celtic Minstrel
01e9f11cfb
Eliminate string_utils include in name_generator.hpp
2016-07-18 00:09:37 -04:00
Celtic Minstrel
275adafa86
Style
...
Fixes a few style issues introduced by #661 and also some that were already there
2016-07-18 00:08:05 -04:00
Celtic Minstrel
649b50d93b
Shorten one of the map name generator keys
2016-07-17 23:50:37 -04:00
Spixi
f96f86245e
Improvements in the map and name generators
...
- Implement a way to escape special characters {|} in the CFG generator
- Eliminate null pointers to name generators
- Invalid generators now throw exceptions
- Name generating rules for different terrain elements can now be specified
(The defaults in english.cfg are still used)
2016-07-17 23:42:19 -04:00
Celtic Minstrel
36eeed413c
Comment fixup
2016-07-17 19:51:09 -04:00
Bär Halberkamp
0a83e2e6b6
Fix [message]s without an image not working
2016-07-17 19:49:29 -04:00
Celtic Minstrel
63e0303c00
Update XCode project so that unit tests build
2016-07-17 18:44:57 -04:00
Celtic Minstrel
20b7e5b757
MP Test: Give up after 100 tries
...
This allows the test script to terminate even if
something went wrong, such as a server crash.
2016-07-17 17:21:13 -04:00
Andreas Löf
9550c3636b
Ensure that focus handling stays the same as before the fix
2016-07-17 22:52:09 +12:00