upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-18 21:49:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
64,691 Commits 52 Branches 374 Tags
Commit Graph

64691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gfgtdf
092bb15240 fix starting positions beeing off by one. 2016-06-17 19:33:46 +02:00
gfgtdf
42d93236e0 allow to special apceisl locations in the map_data 
it is now possible to specify locations in the editor that can then be
read with wml (without the create scenario editor mode). These special
locations can be placed like starting positions, and can them be used in
the wml code like:
'location_id=<id>' in standard location filters or 'placement=<id>' in
[unit], i also intend to add a lua interface wesnoth.special_locations
later.

It's currently not possible to have multiple special  locations in the
same hex, the main reason is that i'm unsure about how to integrate that
in the editor ui.
 2016-06-17 19:33:44 +02:00
gfgtdf
a0ce7dc194 less string copying in string_to_number_ (parsing terrains) 2016-06-17 19:33:41 +02:00
gfgtdf
1e088d9a50 add remove button to location palette 2016-06-17 19:33:39 +02:00
gfgtdf
6424d79f48 use palettes in for the starting positions tool instead of a popup dialog 2016-06-17 19:33:37 +02:00
gfgtdf
672ef61a34 small editor palette refactor 
Remove unused editor_display::palette_report_ member
Added 'tristate_palette' interface to that classes inheriting from
common_palette don't have to implement select_fg_item/select_bg_item
 2016-06-17 19:28:07 +02:00
gfgtdf
3cd73e407b fix msvc warning 2016-06-17 19:28:05 +02:00
gfgtdf
7e22e4034f use a map for starting locations 
this will make it easier to have non-int keys later.
 2016-06-17 19:28:03 +02:00
loonycyborg
44fa6651c8 scons: help text clarification for extra_flags_* variables 2016-06-17 13:22:54 +03:00
loonycyborg
fccf4f067f scons: add an option to enable clang/GCC sanitizer functionality 2016-06-17 12:51:46 +03:00
loonycyborg
fe8044801a Fix transmission dialog tracking upload(instead of download) progress, bug #24758 2016-06-16 15:31:14 +03:00
ln-zookeeper
2642c104d3 EI: Restored the holy amulet in S9 and fixed unit position screwup 2016-06-13 12:34:34 +03:00
ln-zookeeper
9e557f37b1 EI: Fix screwup which made Owaec loyal as a leader 2016-06-13 12:20:15 +03:00
ln-zookeeper
349069110b EI: Fix screwup in S4c 2016-06-13 12:18:18 +03:00
Celtic Minstrel
e8d1934142 Merge pull request #669 from AncientLich/wmlxgettext 
terminal colored text extended to windows
(from AncientLich/wmlxgettext-unoff#3)
 2016-06-12 12:26:02 -04:00
Elvish_Hunter
d7b2fad190 wmllint: fix unknown IDs in [generator] tag 2016-06-12 12:12:07 +02:00
Elvish_Hunter
85f1869e56 wmllint: fix unknown IDs in OptionWML tags 2016-06-12 12:12:07 +02:00
Elvish_Hunter
270809c68c GUI.pyw: fix an error that seems to happen only on Python 3.5 
When closing down the program, this error message appeared: 'TypeError: catching classes that do not inherit from BaseException is not allowed'. It seems to depend on Tkinter's PhotoImage object being destroyed after the root windows's destroy() method is called.
 2016-06-12 12:12:07 +02:00
Elvish_Hunter
5001c58fde LoW: wmlindent run 2016-06-12 12:12:07 +02:00
Elvish_Hunter
9d1265139b LoW: fixed 'unknown Kalenz/Landar referred to by id' wmllint warnings 2016-06-12 12:12:07 +02:00
Elvish_Hunter
ee12780360 wmllint: handle new name generator syntax 2016-06-12 12:12:07 +02:00
Nobun
fa20da9821 terminal colored text extended to windows 2016-06-12 11:58:26 +02:00
Ignacio R. Morelle
e86fea358a units.w.o: Use https where applicable 2016-06-12 00:20:54 -04:00
Charles Dang
709b078a7a CB: removed thread.*pp from main binary 2016-06-12 05:10:45 +11:00
Charles Dang
fbc5d46b38 Cleaned up some unused thread.hpp stuff in the main binary files 2016-06-12 05:10:15 +11:00
Alexander van Gessel
50e8fcda08 Merge branch 'master' of github.com:wesnoth/wesnoth 2016-06-10 21:25:19 +02:00
Alexander van Gessel
75e2608ed0 Initialize all members 
Found by coverity
 2016-06-10 21:16:53 +02:00
Alexander van Gessel
2ecbb19a59 Initialize all members 
Found by coverity
 2016-06-10 21:10:47 +02:00
Elvish_Hunter
d625798ea5 LoW: fixed 'side number is out of sequence' wmllint warnings 2016-06-10 21:00:40 +02:00
loonycyborg
5a7b555d3a scons: don't add redundant include path for /usr/include 2016-06-10 21:54:08 +03:00
Alexander van Gessel
433a3ad7a4 Properly handle an error condition 
Found by coverity
 2016-06-10 20:15:48 +02:00
Alexander van Gessel
54c03ea6cb Don't store pointers to internal state of temporaries 
Found by coverity
 2016-06-10 20:01:51 +02:00
Elvish_Hunter
e83d1de05e Lua: make wesnoth.set_variable() return nil if a variable doesn't exist 
Fixes bug #24740.
 2016-06-10 12:01:15 +02:00
Elvish_Hunter
2b3d54d5f4 wmllint: handle HelpWML markup correctly while spellchecking 
This fixes bug #22780, as well as several false positives when checking the /data/core/editor/help.cfg file.
 2016-06-10 12:01:15 +02:00
Ignacio R. Morelle
d5fdc951c1 wesnoth-optipng: Fix compatibility issues with newer versions of PIL 2016-06-09 21:44:55 -04:00
Ignacio R. Morelle
73a8cf4a8b wesnoth-optipng: Run companion script with Python 3 
No actual porting work required, the code is already compatible.
 2016-06-09 21:44:08 -04:00
loonycyborg
550fa9086b Revert "scons: remove SDL_net dependency from unit tests" 
This reverts commit 101e5d36ef3c799bf43668cdd901f2e4080914c3.
 2016-06-09 12:29:08 +03:00
loonycyborg
101e5d36ef scons: remove SDL_net dependency from unit tests 2016-06-09 12:04:27 +03:00
loonycyborg
3ee7fe2e59 scons: no longer link client against SDL_net 2016-06-08 17:20:59 +03:00
loonycyborg
e8c624eb68 Update changelog about asio port of wesnothd 2016-06-08 16:54:41 +03:00
Lari Nieminen
23dcbcecd8 Merge pull request #668 from sigurdfdragon/Use_Mdd_in_Random_map_(Desert) 
MP Random map (Desert): Use new desert mountains.
 2016-06-08 08:43:55 +03:00
Lari Nieminen
b3402ed161 Merge pull request #665 from sigurdfdragon/HttT_Journey_19c_20b 
Htt t journey 19c 20b
 2016-06-08 08:40:14 +03:00
sigurdfdragon
87b55feb59 MP Random map (Desert): Use new desert mountains. 2016-06-08 00:30:03 -04:00
Celtic Minstrel
7257294894 Merge pull request #667 from sigurdfdragon/wmllint_comment_fix 2016-06-07 18:16:16 -04:00
sigurdfdragon
a199eec22e wmllint: add missing instructions for "#wmllint: skip-side". 
Thanks to Elvish_Hunter for telling me what it supposed to do.
 2016-06-07 16:35:01 -04:00
sigurdfdragon
8bd4df9c00 HttT: Add journey tracks for Cliffs of Thoria / Underground Channels path. 2016-06-07 16:15:45 -04:00
gfgtdf
722d186fed fix client not sending [leave_game] 
this restores some codes that send the [leave_game] that was accidently lost when porting the client cost to boost asio.
I'm still unsure about whether it really makes sense to do it this way, specially that we send [leave_game] after (instead of before) calling enter_create_mode in line 501. (Which is was the pre-boost-asio code did aswell).
 2016-06-07 22:08:18 +02:00
Wedge009
47ad8d3833 VC project files: Removing network code from libwesnoth as requested by gfgtdf. 2016-06-08 04:36:22 +10:00
loonycyborg
dce503ebec Fix UB when sending game history due to misuse of simple_wml 2016-06-07 20:58:38 +03:00
Wedge009
f62a52ebfe Update VC project files for recent file additions and deletions. 2016-06-07 19:07:40 +10:00