upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-04 12:11:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
59,826 Commits 60 Branches 374 Tags
Commit Graph

59826 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Charles Dang
9dba03953b T S1: the student variable should not be translatable 2014-12-30 05:34:32 +11:00
Charles Dang
220e5912e6 T S1: fixup 1c9dc4ae3dcc. Seems we need new turn after all 
Also move the menu item back into the new turn event, so it isn't available on the previous turn
 2014-12-30 05:31:19 +11:00
Charles Dang
695998693f T S1: clear trying_to_be_a_wiseguy on victory 2014-12-30 05:10:07 +11:00
Charles Dang
687919b736 T S1: reduce chance of quintain for dying before turn 4 
The reason for this is that if they player is lucky, they might kill him before turn 4,
and when it dies, Delf leaves, preventing the entire attack exposition from happening.
This cuts off the student's moves after they move to keep on turn 3, and adds a dialog line
by Delf regarding it.

This doesn't fix any situation where the player disregards instructions and doesn't return to
the keep, but that's their problem.
 2014-12-30 05:01:24 +11:00
Charles Dang
0e758a419a Merge branch 'master' of github.com:wesnoth/wesnoth 2014-12-30 04:34:05 +11:00
Charles Dang
8665840ec3 T S1: changed the route Delf takes when he leaves. He now goes via the road 2014-12-30 04:33:41 +11:00
Charles Dang
4473e2c532 T S1: made Delf face the keep after he moves 2014-12-30 04:29:41 +11:00
Charles Dang
1c9dc4ae3d T S1: fixed initial scenario end prompt 
You can't have two events with the same name, and one set to first once. Only the first one will fire.
Use a slightly different name for this one to be clear
 2014-12-30 04:28:17 +11:00
Chris Beck
4d857e4794 lua: fixup 9922b98fa30072b93ed9501acdbcadcbdb30cfdd 
commit failed to register the "gamestate_inspector" fcn with the
lua environment
 2014-12-29 11:59:06 -05:00
Chris Beck
9f67233f22 fixup fa32be5602ca5f00217e2408af09cbd51c0ffd66 
the previous commit forgot to actually register the functions
add/remove_time_area in the lua environment
 2014-12-29 11:49:41 -05:00
Charles Dang
1fab61360d T: moved a wmllint spelling exception to the correct file 2014-12-30 03:49:08 +11:00
Charles Dang
8646c57b77 T S2: initialize starting units in [side]s 2014-12-30 03:47:18 +11:00
Charles Dang
7b899320dd T S1: next_turn var doesn't exist anymore, don't clear it 2014-12-30 03:41:50 +11:00
Charles Dang
9b5ffc8376 Merge branch 'master' of github.com:wesnoth/wesnoth 2014-12-30 03:38:15 +11:00
Charles Dang
a941e3e7d1 T S1: completely refactored scenario code. More tweaks pending 2014-12-30 03:37:49 +11:00
Charles Dang
40a2a5bf1b Merge branch 'master' of github.com:wesnoth/wesnoth 2014-12-30 02:24:19 +11:00
mattsc
77a0be46ad Update Xcode project file 2014-12-29 07:22:36 -08:00
gfgtdf
505f219c91 fixup comment 2014-12-29 16:12:41 +01:00
gfgtdf
4c39a23843 remove duplicate information in attack_type 
previously we stored this information in a config object and in member
variables, now the config object is removed.
 2014-12-29 16:10:36 +01:00
gfgtdf
5c27af2978 replace attack_type::get_cfg() 
the new interface gives more encapsulation.
 2014-12-29 16:10:34 +01:00
gfgtdf
06228f09ec put unit attack_type in new file. 2014-12-29 16:10:33 +01:00
mattsc
637514e523 Update Xcode project file 2014-12-29 06:43:55 -08:00
Charles Dang
d6d952a7b1 T S1: initialize Delf in his [side] 2014-12-30 00:29:45 +11:00
Charles Dang
beaf189a6a T: replaced ALL cases of MOVE with MOVE_UNIT and deleted the former 2014-12-30 00:24:55 +11:00
Charles Dang
799ac9d250 Don't include the tutorial's _main.cfg explicitly 2014-12-30 00:15:34 +11:00
Charles Dang
9b0c1a41bf T: dropped stable_singleplayer ai aliases 2014-12-30 00:11:48 +11:00
Charles Dang
02a79264bd Include utils only once, from main 2014-12-30 00:07:47 +11:00
Charles Dang
124d264f0e Gave the tutorial it's own _main.cfg 2014-12-30 00:05:30 +11:00
Charles Dang
d2fdcefbcb T: dropped variable usage in LABEL and PRINT 2014-12-30 00:00:27 +11:00
Charles Dang
c8756ca92c T S1: beautified map 2014-12-29 23:58:39 +11:00
Charles Dang
d859adef38 Merge util files 2014-12-29 23:48:36 +11:00
Charles Dang
18284fef33 Renamed files for clarity 2014-12-29 23:46:49 +11:00
Charles Dang
62b377235e Tutorial: split S1 map into its own file 2014-12-29 23:41:27 +11:00
Charles Dang
332e64f945 Merge pull request #353 from 8573/8573/fix/lua/tostring-calls-as-1st-operands-of-or-exprs/1 
Lua: Fix uses of `tostring` calls as LHSs to `or`
 2014-12-29 22:43:47 +11:00
8573
e23ff7009c Lua: Fix uses of tostring calls as LHSs to or 
This commit changes occurrences of the pattern `tostring(x) or y` to
`tostring(x or y)` in the following Lua scripts:

  - `data/lua/wml-tags.lua`
  - `data/lua/wml/items.lua`

`tostring(x) or y` is unlikely to do what the author intended (and is
pointless unless `x` is an object of a custom type with unusual
behavior), because `tostring` returns a string (`"false"` or `"nil"`)
if `x` is a falsy value (`false` or `nil`), and all strings are truthy
in Lua — thus, `tostring(x) or y` will (unless `x` is of a custom
type) *always* evaluate to `tostring(x)`, never to `y`.

`tostring(x or y)` should, I expect, give the intended behavior.
 2014-12-29 10:09:48 +00:00
Charles Dang
f8c811fa4f Simplified syntax for wml_actions.chat() 2014-12-29 17:28:06 +11:00
Chris Beck
a273be5520 add a wml unit test for {CLEAR_VARIABLE} macro 2014-12-29 00:39:14 -05:00
Charles Dang
c762937e74 Simplified object:method syntax for trim() and split() 2014-12-29 15:47:44 +11:00
Charles Dang
fa079a1b3f Return first value of trim() within the function as opposed to at the call 2014-12-29 15:44:19 +11:00
Charles Dang
cc0d274c73 Updated codeblocks projectfile 2014-12-29 15:31:07 +11:00
Charles Dang
e35c301ff4 Fixed clear_variable by only calling first argument of of trim() 2014-12-29 15:31:05 +11:00
Chris Beck
dec551ee9e wmi_pager: give better names to some variables 2014-12-28 23:14:57 -05:00
Chris Beck
5c9bb9345c travis: enable MP_TEST on -O0, reduce wml test timer 2014-12-28 19:40:10 -05:00
Chris Beck
64ee2d8e10 Merge branch 'lua' 2014-12-28 19:05:46 -05:00
Chris Beck
978ae9ebc3 travis: fixup 02 vs O0 build 
fixes up commit b70bfddcdebad3117d379c4c8e86501bbfbfbcb3
 2014-12-28 18:46:20 -05:00
Chris Beck
188e5c70b1 fixup menu_item copy ctor 
this fixes up commit 6fc1ac1bb224cddec5ccbb7f7865b69b1b093a01

it does not fix bug 23115
 2014-12-28 18:41:44 -05:00
Chris Beck
032d8c1a93 fixup travis test_wrapper.sh 
fixes up commit 6695365efb25b329a09f7b191f1ebb851cf44d48
 2014-12-28 18:00:41 -05:00
Chris Beck
497ed6f516 move wml [heal_unit] impl to lua 2014-12-28 17:39:39 -05:00
Chris Beck
cf665ffbf2 simplify preprocessor code in seed_rng.cpp 2014-12-28 16:56:11 -05:00
gfgtdf
7f0e7c890d better error on invalid variablename in wesnoth.set_variable 
first we now throw a lua error instead of just giving a log message this
makes it easier to find the source of a bug becase we now get a
stacktrace.

Also we now give a more detailed error message.
 2014-12-28 22:54:27 +01:00