upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-20 00:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,295 Commits 52 Branches 374 Tags
Commit Graph

50295 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon Forsyth
4171cfbebd Use on difficulty to simplify human scouts appearance... 
...and get rid of some useless redraws
 2012-07-12 01:40:55 +00:00
Simon Forsyth
81cf7cee40 Remove stop_flooding variable in the same manner 2012-07-12 01:22:00 +00:00
Simon Forsyth
b7545fd975 Remove some more variables through self removing events 2012-07-12 01:15:04 +00:00
Simon Forsyth
c7765bca1c Read unit variables rather than branching to identify name and race of ally 2012-07-12 01:07:32 +00:00
Simon Forsyth
2c4d9e8eb0 Get rid of useless placeholder unit... 
...and manually place units to achieve effect desired in comment
 2012-07-12 01:00:45 +00:00
Simon Forsyth
340d5822c2 A leaderless side has no need for a flag variant 2012-07-12 00:54:15 +00:00
Mark de Wever
4cbef957f6 Changes the CMake compiler flags. 
At the moment the flags are determined on the first run and stored in
CMAKE_CXX_FLAGS, CMAKE_CXX_FLAGS_DEBUG and CMAKE_CXX_FLAGS_RELEASE[*].
This was actuall not a good idea, since CMake combines CMAKE_CXX_FLAGS
with the CMAKE_CXX_FLAGS_<BUILD_TYPE>. The problem with this setup is
when the compiler is changed the flags are reset to their defaults and
the user made changes to the flags are lost. The second issue with the
old implementation is that the ENABLE_STRICT_COMPILATION CMake option
must be directly set; changing its value after the initial generation
had no effect.

The change will only set CMAKE_CXX_FLAGS, based on the environment
variable $CXXFLAGS, this is stored in its own variable, named
CXX_FLAGS_USER, in CMake and can be changed later. This flag is only
initialised on the first run. It is also based on the default flags we
use for Wesnoth and the _current_ state of the ENABLE_STRICT_COMPILATION
option. For the transition from the old to the new system the old
CMAKE_CXX_FLAGS are used as initial value for the CXX_FLAGS_USER. This
means no flags are lost, but some extra flags are added, will CMake to
cause a recompilation. So it's advised to regenerate the project files
or change the CXX_FLAGS_USER after CMake as updated the flags.

[*] Note I removed the CFlags since all C based code has been removed,
with the removal of the poolallocator.
 2012-07-10 19:07:04 +00:00
Anonymissimus
ac082f4318 Remove _SECURE_SCL=0 from the preprocessor definitions. 
This caused the visual studio release builds to crash instantly
upon startup. Apparently due to it being buggy.

timotei: Please check whether it works for you now.
gabba: Please be careful with such experiments.
 2012-07-10 14:15:03 +00:00
Simon Forsyth
bc0b6f28a2 More filter_conditions to replace ifs 2012-07-10 01:28:03 +00:00
Simon Forsyth
df0e0b72c2 Merge four duplicate dialog blocks 2012-07-10 01:14:36 +00:00
Simon Forsyth
90f6b7e53d Remove captured_keep variable 2012-07-10 01:05:07 +00:00
Simon Forsyth
f8687c7b50 Erase now irrelevant comment 2012-07-10 00:53:45 +00:00
Simon Forsyth
91a330eb71 Use {SCATTER_UNITS} instead of custom {CREATE_BATS} 2012-07-10 00:50:08 +00:00
Simon Forsyth
449aaf0da2 Side 5 is only used for cutscenes, 
...so give it a null controller to avoid wasting time between turns
 2012-07-10 00:20:44 +00:00
Simon Forsyth
f1f5b5a8d9 Side 9 is never used, so kill it 2012-07-10 00:14:23 +00:00
Anonymissimus
b3f2c5e1a3 Do not attempt to copy from the command line if there is no selection. 
This caused an out-of-bounds problem. Found by visual studio debugger.
 2012-07-09 20:50:53 +00:00
Nils Kneuper
0f43f9178d updated Japanese translation 2012-07-09 20:06:19 +00:00
Fabian Müller
afead1632d Made the editor brushbar configurable by theme WML... 
...instead of being hardcoded.
 2012-07-09 16:18:13 +00:00
Fabian Müller
b9b015ec86 Support for displaying the costs of vision and jamming... 
...in the unit description.
 2012-07-09 16:12:46 +00:00
Simon Forsyth
7e01ac0c57 The meaning of turns=-1 does not require a comment. 2012-07-09 04:06:13 +00:00
Simon Forsyth
02af0c3145 Remove variables for the rest of the optional item pickup events 2012-07-09 03:55:53 +00:00
Simon Forsyth
1aeeb858a6 Variable free item pickup! 2012-07-09 03:41:45 +00:00
Simon Forsyth
10e087b4d2 delete a pile of pointless comments... 
...about snapshot=no means there is no snap shot in saved games and
that the turns macro makes the number of turns vary by difficulty
 2012-07-09 03:31:35 +00:00
Simon Forsyth
9cc75b9266 Remove test_counter variable. 2012-07-09 03:23:40 +00:00
Simon Forsyth
34a22cca83 delete pointless comment given new event name 2012-07-09 03:10:36 +00:00
Steven Panek
550b7a65f7 Killed extra space in a string. 2012-07-09 03:00:23 +00:00
Simon Forsyth
a781150b3f Keep Esanoo from referring to himself in the third person 2012-07-09 02:52:52 +00:00
Simon Forsyth
3cd0d3979b More duplicate dialog elimination. 
Also allow translators to distinguish between male/female
speakers/addressees for this dialog.
 2012-07-09 02:41:54 +00:00
Simon Forsyth
b18b8cb1ed Unduplicate some dialog text 2012-07-09 02:11:14 +00:00
Simon Forsyth
1b0fc4e0c3 Someone succumbed to temptation, making a comment no longer applicable 2012-07-09 01:38:43 +00:00
Simon Forsyth
d9a6cc94ed Remove some redundant conditions 2012-07-09 00:04:47 +00:00
Simon Forsyth
65025e1f4f Use [filter_condition] in scenario 11 and 12 2012-07-08 23:51:29 +00:00
Simon Forsyth
787f575697 Use [filter_condition] in scenario 9 2012-07-08 23:31:29 +00:00
Anonymissimus
6ea950f6bb fix an MSVC warning about unused local variable 2012-07-08 23:21:09 +00:00
Simon Forsyth
45361183a6 Allow undoing moves when moving to a location... 
...where an unrescued merfolk was after they were killed
 2012-07-08 22:44:33 +00:00
Simon Forsyth
b3fef72362 Remove events and kill variable 2012-07-08 22:03:42 +00:00
Simon Forsyth
7663f20802 [filter_condition] in scenario 8 2012-07-08 21:29:54 +00:00
Simon Forsyth
ae0fca377d [filter_condition] in scenario 6b 2012-07-08 21:05:03 +00:00
Simon Forsyth
965dfb4899 Use [modify_unit], rather than store/modify/unstore... 
...to convert Grog to player side
 2012-07-08 20:51:08 +00:00
J. Tyne
a1c095a7fa Changelog entries for 2012-07-08T20:23:08Z!jt_coding@verizon.net 2012-07-08 20:25:48 +00:00
J. Tyne
4680619bbc Prevent recruitment/recalling into/through shrouded hexes. 
Rest of the fix for bug #19844.
 2012-07-08 20:23:08 +00:00
Simon Forsyth
d7ac2bb3b6 Use filter condition in scenarios 4-6a 2012-07-08 20:20:02 +00:00
Simon Forsyth
345dd56c15 Remove a meaningless #ifdef 2012-07-08 19:51:17 +00:00
Simon Forsyth
55f578bbe9 Do not store casualties on turn 12 - Garak already has his recruits 2012-07-08 19:45:46 +00:00
J. Tyne
01d4d1d883 Remove changelog entry for a bugfix where the bug was never in a release 
(Repository only).
 2012-07-08 19:27:52 +00:00
Simon Forsyth
3442eb1345 Use filter_condition where appropriate in scenarios 1 & 2 2012-07-08 19:22:03 +00:00
J. Tyne
cdbe06adac Suppress recruit/recall commands from the context menu... 
...for shrouded and visibly occupied hexes.

Part of a fix for bug #19844.
 2012-07-08 18:59:16 +00:00
J. Tyne
461b89e3dd Remove some redundant on_board() and is_keep() calls. 
(on_board() is part of is_castle() and
is_keep() is part of can_recruit_on().)
 2012-07-08 18:02:25 +00:00
J. Tyne
5dc6a7b178 Remove the "End scenario" menu item at the end of tutorial S1. 2012-07-08 17:52:49 +00:00
J. Tyne
8177d0804c Adding some comments for my algorithm. This includes revised complexity notes. 2012-07-08 17:49:43 +00:00