Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge from standard #100

Merged
merged 21 commits into from Jan 8, 2019

Conversation

@Phystam
Copy link

commented Jan 8, 2019

This pull-request contains changes in standard from Dec. 4 2014 to Dec. 7 (from r7395 to r7408).

Dwachs and others added 21 commits Dec 4, 2014
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@7397 8aca7d54-2c30-db11-9de9-000461428c89
Merge branch 'master' of https://github.com/aburch/simutrans into standard

# Conflicts:
#	.desktop
#	Makefile
#	Nettool.vcxproj
#	Nettool.vcxproj.filters
#	Simutrans.vcxproj
#	bauer/brueckenbauer.cc
#	bauer/brueckenbauer.h
#	bauer/fabrikbauer.cc
#	bauer/fabrikbauer.h
#	bauer/goods_manager.cc
#	bauer/goods_manager.h
#	bauer/hausbauer.cc
#	bauer/hausbauer.h
#	bauer/tunnelbauer.cc
#	bauer/tunnelbauer.h
#	bauer/vehikelbauer.cc
#	bauer/vehikelbauer.h
#	bauer/wegbauer.cc
#	bauer/wegbauer.h
#	boden/boden.cc
#	boden/brueckenboden.h
#	boden/fundament.cc
#	boden/fundament.h
#	boden/grund.cc
#	boden/grund.h
#	boden/tunnelboden.cc
#	boden/wasser.cc
#	boden/wasser.h
#	boden/wege/kanal.cc
#	boden/wege/maglev.cc
#	boden/wege/maglev.h
#	boden/wege/monorail.cc
#	boden/wege/monorail.h
#	boden/wege/narrowgauge.cc
#	boden/wege/narrowgauge.h
#	boden/wege/runway.cc
#	boden/wege/runway.h
#	boden/wege/schiene.cc
#	boden/wege/schiene.h
#	boden/wege/strasse.cc
#	boden/wege/strasse.h
#	boden/wege/weg.cc
#	boden/wege/weg.h
#	common.mk
#	config.default.in
#	config.template
#	configure.ac
#	dataobj/crossing_logic.cc
#	dataobj/crossing_logic.h
#	dataobj/environment.cc
#	dataobj/environment.h
#	dataobj/gameinfo.cc
#	dataobj/gameinfo.h
#	dataobj/height_map_loader.cc
#	dataobj/koord.cc
#	dataobj/koord.h
#	dataobj/koord3d.cc
#	dataobj/loadsave.cc
#	dataobj/loadsave.h
#	dataobj/marker.cc
#	dataobj/marker.h
#	dataobj/objlist.cc
#	dataobj/powernet.h
#	dataobj/records.cc
#	dataobj/ribi.cc
#	dataobj/ribi.h
#	dataobj/route.cc
#	dataobj/route.h
#	dataobj/scenario.cc
#	dataobj/scenario.h
#	dataobj/schedule.cc
#	dataobj/schedule.h
#	dataobj/schedule_entry.h
#	dataobj/settings.cc
#	dataobj/settings.h
#	dataobj/tabfile.cc
#	dataobj/tabfile.h
#	dataobj/translator.cc
#	dataobj/translator.h
#	descriptor/bridge_desc.cc
#	descriptor/bridge_desc.h
#	descriptor/building_desc.cc
#	descriptor/building_desc.h
#	descriptor/citycar_desc.h
#	descriptor/crossing_desc.h
#	descriptor/factory_desc.cc
#	descriptor/factory_desc.h
#	descriptor/goods_desc.cc
#	descriptor/goods_desc.h
#	descriptor/ground_desc.cc
#	descriptor/ground_desc.h
#	descriptor/groundobj_desc.h
#	descriptor/image.cc
#	descriptor/image.h
#	descriptor/image_array.h
#	descriptor/image_list.h
#	descriptor/intro_dates.h
#	descriptor/obj_base_desc.cc
#	descriptor/obj_base_desc.h
#	descriptor/obj_desc.h
#	descriptor/pedestrian_desc.h
#	descriptor/reader/bridge_reader.cc
#	descriptor/reader/building_reader.cc
#	descriptor/reader/citycar_reader.cc
#	descriptor/reader/crossing_reader.cc
#	descriptor/reader/factory_reader.cc
#	descriptor/reader/good_reader.cc
#	descriptor/reader/groundobj_reader.cc
#	descriptor/reader/image_reader.cc
#	descriptor/reader/obj_reader.cc
#	descriptor/reader/obj_reader.h
#	descriptor/reader/pedestrian_reader.cc
#	descriptor/reader/roadsign_reader.cc
#	descriptor/reader/tree_reader.cc
#	descriptor/reader/tunnel_reader.cc
#	descriptor/reader/vehicle_reader.cc
#	descriptor/reader/way_obj_reader.cc
#	descriptor/reader/way_reader.cc
#	descriptor/roadsign_desc.h
#	descriptor/skin_desc.h
#	descriptor/spezial_obj_tpl.h
#	descriptor/tree_desc.h
#	descriptor/tunnel_desc.cc
#	descriptor/tunnel_desc.h
#	descriptor/vehicle_desc.cc
#	descriptor/vehicle_desc.h
#	descriptor/way_desc.cc
#	descriptor/way_desc.h
#	descriptor/way_obj_desc.h
#	descriptor/writer/bridge_writer.cc
#	descriptor/writer/building_writer.cc
#	descriptor/writer/citycar_writer.cc
#	descriptor/writer/crossing_writer.cc
#	descriptor/writer/factory_writer.cc
#	descriptor/writer/good_writer.cc
#	descriptor/writer/ground_writer.cc
#	descriptor/writer/image_writer.cc
#	descriptor/writer/pedestrian_writer.cc
#	descriptor/writer/roadsign_writer.cc
#	descriptor/writer/sim_writer.cc
#	descriptor/writer/sound_writer.cc
#	descriptor/writer/tunnel_writer.cc
#	descriptor/writer/vehicle_writer.cc
#	descriptor/writer/way_obj_writer.cc
#	descriptor/writer/way_writer.cc
#	display/font.cc
#	display/font.h
#	display/simgraph.h
#	display/simgraph0.cc
#	display/simgraph16.cc
#	display/simview.cc
#	display/viewport.cc
#	display/viewport.h
#	distribute.sh
#	finder/building_placefinder.h
#	finder/placefinder.cc
#	finder/placefinder.h
#	findversion.sh
#	freight_list_sorter.cc
#	get_lang_files.sh
#	get_pak.sh
#	gui/banner.cc
#	gui/banner.h
#	gui/base_info.cc
#	gui/baum_edit.cc
#	gui/baum_edit.h
#	gui/city_info.cc
#	gui/city_info.h
#	gui/citybuilding_edit.cc
#	gui/citylist_frame_t.cc
#	gui/citylist_frame_t.h
#	gui/citylist_stats_t.cc
#	gui/citylist_stats_t.h
#	gui/climates.cc
#	gui/components/gui_button.cc
#	gui/components/gui_chart.cc
#	gui/components/gui_combobox.cc
#	gui/components/gui_container.cc
#	gui/components/gui_container.h
#	gui/components/gui_convoiinfo.cc
#	gui/components/gui_fixedwidth_textarea.cc
#	gui/components/gui_fixedwidth_textarea.h
#	gui/components/gui_flowtext.cc
#	gui/components/gui_image_list.cc
#	gui/components/gui_komponente.h
#	gui/components/gui_label.cc
#	gui/components/gui_label.h
#	gui/components/gui_map_preview.h
#	gui/components/gui_numberinput.cc
#	gui/components/gui_scrolled_list.cc
#	gui/components/gui_scrolled_list.h
#	gui/components/gui_scrollpane.cc
#	gui/components/gui_tab_panel.cc
#	gui/components/gui_textarea.cc
#	gui/components/gui_textarea.h
#	gui/components/gui_textinput.cc
#	gui/components/gui_world_view_t.cc
#	gui/components/gui_world_view_t.h
#	gui/convoi_detail_t.cc
#	gui/convoi_filter_frame.cc
#	gui/convoi_filter_frame.h
#	gui/convoi_frame.cc
#	gui/convoi_info_t.cc
#	gui/curiosity_edit.cc
#	gui/curiositylist_stats_t.cc
#	gui/depot_frame.cc
#	gui/depot_frame.h
#	gui/display_settings.cc
#	gui/display_settings.h
#	gui/enlarge_map_frame_t.cc
#	gui/enlarge_map_frame_t.h
#	gui/extend_edit.cc
#	gui/extend_edit.h
#	gui/fabrik_info.cc
#	gui/factory_chart.cc
#	gui/factory_edit.cc
#	gui/factorylist_frame_t.cc
#	gui/factorylist_frame_t.h
#	gui/factorylist_stats_t.cc
#	gui/factorylist_stats_t.h
#	gui/goods_frame_t.cc
#	gui/goods_frame_t.h
#	gui/goods_stats_t.cc
#	gui/ground_info.cc
#	gui/gui_frame.cc
#	gui/gui_frame.h
#	gui/gui_theme.cc
#	gui/gui_theme.h
#	gui/halt_detail.cc
#	gui/halt_detail.h
#	gui/halt_info.cc
#	gui/halt_info.h
#	gui/halt_list_frame.cc
#	gui/halt_list_stats.cc
#	gui/jump_frame.cc
#	gui/karte.cc
#	gui/karte.h
#	gui/kennfarbe.cc
#	gui/label_info.cc
#	gui/labellist_stats_t.cc
#	gui/line_item.cc
#	gui/line_management_gui.cc
#	gui/line_management_gui.h
#	gui/load_relief_frame.cc
#	gui/loadsave_frame.cc
#	gui/loadsave_frame.h
#	gui/map_frame.cc
#	gui/map_frame.h
#	gui/message_frame_t.cc
#	gui/messagebox.cc
#	gui/messagebox.h
#	gui/money_frame.cc
#	gui/money_frame.h
#	gui/obj_info.cc
#	gui/optionen.cc
#	gui/pakselector.cc
#	gui/pakselector.h
#	gui/password_frame.cc
#	gui/player_frame_t.cc
#	gui/player_frame_t.h
#	gui/savegame_frame.cc
#	gui/savegame_frame.h
#	gui/scenario_info.cc
#	gui/schedule_gui.cc
#	gui/schedule_gui.h
#	gui/schedule_list.cc
#	gui/schedule_list.h
#	gui/server_frame.cc
#	gui/settings_frame.cc
#	gui/settings_stats.cc
#	gui/signal_spacing.cc
#	gui/signal_spacing.h
#	gui/simwin.cc
#	gui/simwin.h
#	gui/sprachen.cc
#	gui/station_building_select.cc
#	gui/tool_selector.cc
#	gui/tool_selector.h
#	gui/trafficlight_info.cc
#	gui/welt.cc
#	gui/welt.h
#	ifc/simtestdriver.h
#	makeobj/Makefile
#	makeobj/makeobj.cc
#	music/music.h
#	music/w32_midi.cc
#	nettools/Makefile
#	network/network.cc
#	network/network.h
#	network/network_cmd.h
#	network/network_cmd_ingame.cc
#	network/network_cmd_ingame.h
#	network/network_cmp_pakset.cc
#	network/network_cmp_pakset.h
#	network/network_file_transfer.cc
#	network/pakset_info.cc
#	nsis/paksets.nsh
#	nsis/simutrans.nsi
#	obj/baum.cc
#	obj/baum.h
#	obj/bruecke.cc
#	obj/bruecke.h
#	obj/crossing.cc
#	obj/crossing.h
#	obj/dummy.h
#	obj/field.cc
#	obj/field.h
#	obj/gebaeude.cc
#	obj/gebaeude.h
#	obj/groundobj.cc
#	obj/groundobj.h
#	obj/label.cc
#	obj/leitung2.cc
#	obj/leitung2.h
#	obj/pillar.cc
#	obj/pillar.h
#	obj/roadsign.cc
#	obj/roadsign.h
#	obj/signal.cc
#	obj/signal.h
#	obj/tunnel.cc
#	obj/tunnel.h
#	obj/wayobj.cc
#	obj/wayobj.h
#	obj/wolke.cc
#	obj/wolke.h
#	obj/zeiger.cc
#	obj/zeiger.h
#	old_blockmanager.cc
#	player/ai.cc
#	player/ai.h
#	player/ai_goods.cc
#	player/ai_goods.h
#	player/ai_passenger.cc
#	player/ai_passenger.h
#	player/finance.cc
#	player/finance.h
#	player/simplay.cc
#	player/simplay.h
#	revision.jse
#	script/api/Doxyfile_SQAPI
#	script/api/api_city.cc
#	script/api/api_command.cc
#	script/api/api_command.h
#	script/api/api_const.cc
#	script/api/api_convoy.cc
#	script/api/api_doc.h
#	script/api/api_factory.cc
#	script/api/api_halt.cc
#	script/api/api_include.cc
#	script/api/api_line.cc
#	script/api/api_map_objects.cc
#	script/api/api_obj_desc.cc
#	script/api/api_obj_desc_base.cc
#	script/api/api_obj_desc_base.h
#	script/api/api_player.cc
#	script/api/api_settings.cc
#	script/api/api_simple.cc
#	script/api/api_skeleton.h
#	script/api/api_tiles.cc
#	script/api/api_world.cc
#	script/api/changelog.h
#	script/api/export_desc.cc
#	script/api/export_desc.h
#	script/api/squirrel_types_ai.awk
#	script/api/squirrel_types_scenario.awk
#	script/api_function.cc
#	script/api_function.h
#	script/api_param.cc
#	script/api_param.h
#	script/dynamic_string.cc
#	script/dynamic_string.h
#	script/script.cc
#	script/script.h
#	simcity.cc
#	simcity.h
#	simcolor.h
#	simconst.h
#	simconvoi.cc
#	simconvoi.h
#	simdepot.cc
#	simdepot.h
#	simevent.cc
#	simevent.h
#	simfab.cc
#	simfab.h
#	simhalt.cc
#	simhalt.h
#	siminteraction.cc
#	simintr.cc
#	simline.cc
#	simline.h
#	simlinemgmt.cc
#	simlinemgmt.h
#	simloadingscreen.cc
#	simmain.cc
#	simmenu.cc
#	simmenu.h
#	simmesg.cc
#	simmesg.h
#	simobj.cc
#	simobj.h
#	simplan.cc
#	simplan.h
#	simres.rc
#	simskin.cc
#	simskin.h
#	simsound.cc
#	simsound.h
#	simsys.cc
#	simsys.h
#	simsys_opengl.cc
#	simsys_posix.cc
#	simsys_s.cc
#	simsys_s2.cc
#	simsys_w.cc
#	simticker.cc
#	simticker.h
#	simtool-dialogs.h
#	simtool.cc
#	simtool.h
#	simtypes.h
#	simunits.h
#	simutrans/config/simuconf.tab
#	simutrans/history.txt
#	simutrans/license_squirrel.txt
#	simutrans/music/43-Driving-on-the-midnight-highway.mid
#	simutrans/music/44-Above-the-sky.mid
#	simutrans/music/45-Misty-Forest.mid
#	simutrans/music/46-House-in-the-station.mid
#	simutrans/music/music.tab
#	simutrans/script/new_scenario_template.nut
#	simutrans/script/scenario_base.nut
#	simutrans/text/be.tab
#	simutrans/text/bg.tab
#	simutrans/text/ca.tab
#	simutrans/text/cn.tab
#	simutrans/text/cn/baum_build.txt
#	simutrans/text/cn/color.txt
#	simutrans/text/cz.tab
#	simutrans/text/cz/airtools.txt
#	simutrans/text/cz/baum_build.txt
#	simutrans/text/cz/citybuilding_build.txt
#	simutrans/text/cz/citylist_filter.txt
#	simutrans/text/cz/citywindow.txt
#	simutrans/text/cz/climates.txt
#	simutrans/text/cz/convoidetail.txt
#	simutrans/text/cz/convoiinfo.txt
#	simutrans/text/cz/curiosity_build.txt
#	simutrans/text/cz/curiositylist_filter.txt
#	simutrans/text/cz/settings.txt
#	simutrans/text/de.tab
#	simutrans/text/de/convoiinfo.txt
#	simutrans/text/de/display.txt
#	simutrans/text/de/finances.txt
#	simutrans/text/de/industry_info.txt
#	simutrans/text/de/linemanagement.txt
#	simutrans/text/de/load.txt
#	simutrans/text/de/save.txt
#	simutrans/text/de/sound.txt
#	simutrans/text/dk.tab
#	simutrans/text/en.tab
#	simutrans/text/en/baum_build.txt
#	simutrans/text/en/citywindow.txt
#	simutrans/text/en/climates.txt
#	simutrans/text/en/convoiinfo.txt
#	simutrans/text/en/curiosity_build.txt
#	simutrans/text/en/display.txt
#	simutrans/text/en/finances.txt
#	simutrans/text/en/goods_filter.txt
#	simutrans/text/en/language.txt
#	simutrans/text/en/linemanagement.txt
#	simutrans/text/en/load_relief.txt
#	simutrans/text/en/new_world.txt
#	simutrans/text/en/options.txt
#	simutrans/text/en/removal_tool.txt
#	simutrans/text/en/simutrans.txt
#	simutrans/text/en/slopetools.txt
#	simutrans/text/en/sound.txt
#	simutrans/text/en/window.txt
#	simutrans/text/es.tab
#	simutrans/text/et.tab
#	simutrans/text/fi.tab
#	simutrans/text/fr.tab
#	simutrans/text/fr/finances.txt
#	simutrans/text/gr.tab
#	simutrans/text/hr.tab
#	simutrans/text/hu.tab
#	simutrans/text/id.tab
#	simutrans/text/it.tab
#	simutrans/text/ja.tab
#	simutrans/text/ja/password.txt
#	simutrans/text/ja/signal_spacing.txt
#	simutrans/text/ja/simutrans.txt
#	simutrans/text/ja/slopetools.txt
#	simutrans/text/ja/trafficlight_info.txt
#	simutrans/text/ko.tab
#	simutrans/text/lt.tab
#	simutrans/text/nl.tab
#	simutrans/text/no.tab
#	simutrans/text/pl.tab
#	simutrans/text/pt.tab
#	simutrans/text/pt/trafficlight_info.txt
#	simutrans/text/ro.tab
#	simutrans/text/ru.tab
#	simutrans/text/ru/baum_build.txt
#	simutrans/text/sk.tab
#	simutrans/text/sv.tab
#	simutrans/text/th.tab
#	simutrans/text/zh.tab
#	simutrans/text/zh/baum_build.txt
#	simutrans/text/zh/color.txt
#	simutrans/themes/themes.tab
#	simversion.h
#	simware.cc
#	simware.h
#	simworld.cc
#	simworld.h
#	sound/sdl_mixer_sound.cc
#	sound/sdl_sound.cc
#	sound/win32_sound.cc
#	squirrel/sqstdlib/sqstdstream.h
#	squirrel/squirrel.h
#	squirrel/squirrel/sqcompiler.cc
#	squirrel/squirrel/sqdebug.cc
#	squirrel/squirrel/sqvm.cc
#	squirrel/squirrel/sqvm.h
#	tpl/quickstone_tpl.h
#	tpl/weighted_vector_tpl.h
#	unicode.h
#	utils/dr_rdpng.cc
#	utils/log.cc
#	utils/searchfolder.cc
#	utils/simrandom.cc
#	utils/simrandom.h
#	utils/simstring.cc
#	utils/simstring.h
#	utils/simthread.h
#	vehicle/movingobj.cc
#	vehicle/movingobj.h
#	vehicle/simpeople.cc
#	vehicle/simpeople.h
#	vehicle/simroadtraffic.cc
#	vehicle/simroadtraffic.h
#	vehicle/simvehicle.cc
#	vehicle/simvehicle.h
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@7398 8aca7d54-2c30-db11-9de9-000461428c89
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@7401 8aca7d54-2c30-db11-9de9-000461428c89
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@7402 8aca7d54-2c30-db11-9de9-000461428c89
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@7403 8aca7d54-2c30-db11-9de9-000461428c89
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@7404 8aca7d54-2c30-db11-9de9-000461428c89
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@7405 8aca7d54-2c30-db11-9de9-000461428c89
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@7406 8aca7d54-2c30-db11-9de9-000461428c89
…rio window (Dwachs)

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@7407 8aca7d54-2c30-db11-9de9-000461428c89
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@7408 8aca7d54-2c30-db11-9de9-000461428c89
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@7412 8aca7d54-2c30-db11-9de9-000461428c89
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@7414 8aca7d54-2c30-db11-9de9-000461428c89
CODE: wkz_remover_t can remove objects of type specified by default_param
Phystam: merged into tool_remover_t instead of wkz_remover_t
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@7415 8aca7d54-2c30-db11-9de9-000461428c89
Phystam: changed translation from German to English
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@7416 8aca7d54-2c30-db11-9de9-000461428c89
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@7417 8aca7d54-2c30-db11-9de9-000461428c89
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@7418 8aca7d54-2c30-db11-9de9-000461428c89
Fixed translation issue
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@7419 8aca7d54-2c30-db11-9de9-000461428c89
CODE: remove unnecessary get_2d() calls (Dwachs)

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@7420 8aca7d54-2c30-db11-9de9-000461428c89
@jamespetts jamespetts merged commit 679f12d into jamespetts:master Jan 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.