lp:~widelands-dev/widelands/peaceful
Created by
Benedikt Straub
and last modified
Branch merges
Propose for merging
No branches
dependent on this one.
- Widelands Developers: Pending requested
-
Diff: 793 lines (+289/-16)28 files modifieddata/campaigns/fri02.wmf/scripting/mission_thread.lua (+26/-9)
data/scripting/win_conditions/artifacts.lua (+1/-0)
data/scripting/win_conditions/collectors.lua (+1/-0)
data/scripting/win_conditions/defeat_all.lua (+1/-0)
data/scripting/win_conditions/endless_game.lua (+1/-0)
data/scripting/win_conditions/endless_game_fogless.lua (+1/-0)
data/scripting/win_conditions/territorial_lord.lua (+1/-0)
data/scripting/win_conditions/territorial_time.lua (+1/-0)
data/scripting/win_conditions/wood_gnome.lua (+1/-0)
src/game_io/game_player_info_packet.cc (+16/-2)
src/logic/game.cc (+13/-0)
src/logic/game_settings.h (+7/-1)
src/logic/player.cc (+17/-1)
src/logic/player.h (+5/-0)
src/logic/single_player_game_settings_provider.cc (+8/-0)
src/logic/single_player_game_settings_provider.h (+3/-0)
src/network/gameclient.cc (+13/-0)
src/network/gameclient.h (+3/-0)
src/network/gamehost.cc (+28/-0)
src/network/gamehost.h (+1/-0)
src/network/network_protocol.h (+9/-1)
src/scripting/lua_game.cc (+35/-0)
src/scripting/lua_game.h (+2/-0)
src/ui_fsmenu/launch_game.cc (+29/-0)
src/ui_fsmenu/launch_game.h (+9/-0)
src/ui_fsmenu/launch_mpg.cc (+11/-2)
src/ui_fsmenu/launch_spg.cc (+8/-0)
test/maps/port_space.wmf/scripting/test_attack_forbidden.lua (+38/-0)
Related bugs
Related blueprints
Branch information
Recent revisions
This branch has not been scanned yet.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:widelands