Jonathan G Rennison
|
2a31095118
|
Merge branch 'master' into jgrpp
# Conflicts:
# regression/regression/result.txt
# src/aircraft_cmd.cpp
# src/airport_gui.cpp
# src/articulated_vehicles.cpp
# src/console_cmds.cpp
# src/date_gui.cpp
# src/engine.cpp
# src/genworld_gui.cpp
# src/gfx_layout_fallback.cpp
# src/group_gui.cpp
# src/hotkeys.cpp
# src/network/core/tcp_connect.cpp
# src/network/core/tcp_listen.h
# src/newgrf.cpp
# src/newgrf.h
# src/newgrf_engine.cpp
# src/newgrf_gui.cpp
# src/newgrf_station.cpp
# src/openttd.cpp
# src/order_gui.cpp
# src/os/macosx/osx_main.cpp
# src/pathfinder/yapf/yapf_node_rail.hpp
# src/rail_gui.cpp
# src/saveload/afterload.cpp
# src/saveload/cargopacket_sl.cpp
# src/saveload/linkgraph_sl.cpp
# src/saveload/station_sl.cpp
# src/script/api/script_industrytype.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_table.cpp
# src/settingsgen/settingsgen.cpp
# src/station.cpp
# src/station_cmd.cpp
# src/strings.cpp
# src/timer/timer_game_calendar.cpp
# src/timer/timer_game_calendar.h
# src/timer/timer_manager.h
# src/timer/timer_window.cpp
# src/timetable_cmd.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/town_gui.cpp
# src/train_gui.cpp
# src/vehicle_cmd.h
# src/vehicle_gui.cpp
# src/viewport.cpp
# src/widgets/dropdown.cpp
# src/window_func.h
# src/window_gui.h
|
6 months ago |
|
Jonathan G Rennison
|
0d4d4a9cac
|
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/CompileFlags.cmake
# src/3rdparty/squirrel/squirrel/sqclosure.h
# src/3rdparty/squirrel/squirrel/sqobject.h
# src/3rdparty/squirrel/squirrel/sqvm.h
# src/aircraft.h
# src/airport_gui.cpp
# src/blitter/32bpp_sse_func.hpp
# src/blitter/null.hpp
# src/bridge_gui.cpp
# src/build_vehicle_gui.cpp
# src/cargotype.h
# src/cheat_gui.cpp
# src/command.cpp
# src/command_func.h
# src/company_gui.cpp
# src/console_gui.cpp
# src/date_gui.cpp
# src/depot_gui.cpp
# src/dock_gui.cpp
# src/economy.cpp
# src/error_gui.cpp
# src/fileio.cpp
# src/fios.cpp
# src/fios_gui.cpp
# src/fontcache/spritefontcache.h
# src/framerate_gui.cpp
# src/game/game_text.cpp
# src/gamelog.cpp
# src/genworld_gui.cpp
# src/gfx_layout_fallback.cpp
# src/group_gui.cpp
# src/highscore_gui.cpp
# src/hotkeys.cpp
# src/industry_cmd.cpp
# src/industry_gui.cpp
# src/landscape.cpp
# src/main_gui.cpp
# src/misc_cmd.cpp
# src/misc_gui.cpp
# src/network/core/tcp_game.cpp
# src/network/core/udp.cpp
# src/network/network_chat_gui.cpp
# src/network/network_content_gui.cpp
# src/network/network_gui.cpp
# src/network/network_server.cpp
# src/network/network_server.h
# src/newgrf_airport.cpp
# src/newgrf_airport.h
# src/newgrf_airporttiles.cpp
# src/newgrf_airporttiles.h
# src/newgrf_animation_base.h
# src/newgrf_canal.cpp
# src/newgrf_commons.h
# src/newgrf_config.cpp
# src/newgrf_debug_gui.cpp
# src/newgrf_engine.cpp
# src/newgrf_engine.h
# src/newgrf_generic.cpp
# src/newgrf_gui.cpp
# src/newgrf_house.cpp
# src/newgrf_house.h
# src/newgrf_industries.cpp
# src/newgrf_industries.h
# src/newgrf_industrytiles.cpp
# src/newgrf_industrytiles.h
# src/newgrf_object.cpp
# src/newgrf_object.h
# src/newgrf_railtype.cpp
# src/newgrf_railtype.h
# src/newgrf_roadstop.cpp
# src/newgrf_roadstop.h
# src/newgrf_roadtype.cpp
# src/newgrf_roadtype.h
# src/newgrf_spritegroup.cpp
# src/newgrf_spritegroup.h
# src/newgrf_station.cpp
# src/newgrf_station.h
# src/newgrf_town.cpp
# src/newgrf_town.h
# src/news_gui.cpp
# src/object_gui.cpp
# src/order_gui.cpp
# src/os/macosx/crashlog_osx.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/os/windows/win32.cpp
# src/os/windows/win32_main.cpp
# src/pathfinder/npf/npf.cpp
# src/pathfinder/npf/queue.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/road_gui.cpp
# src/roadveh.h
# src/saveload/saveload.cpp
# src/screenshot.cpp
# src/script/api/script_text.hpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_table.cpp
# src/signs_cmd.cpp
# src/signs_gui.cpp
# src/smallmap_gui.cpp
# src/smallmap_gui.h
# src/spriteloader/grf.hpp
# src/station_cmd.cpp
# src/station_gui.cpp
# src/station_map.h
# src/statusbar_gui.cpp
# src/stdafx.h
# src/strgen/strgen.cpp
# src/table/newgrf_debug_data.h
# src/terraform_gui.cpp
# src/timer/timer_game_calendar.cpp
# src/timer/timer_window.cpp
# src/town.h
# src/town_cmd.cpp
# src/town_gui.cpp
# src/train_gui.cpp
# src/transparency_gui.cpp
# src/vehicle_gui.cpp
# src/water_cmd.cpp
# src/waypoint_cmd.cpp
# src/widget.cpp
# src/widget_type.h
# src/widgets/dropdown.cpp
# src/widgets/rail_widget.h
# src/widgets/terraform_widget.h
# src/window.cpp
# src/window_gui.h
|
7 months ago |
Rubidium
|
f16399f4c9
|
Codechange: replace x.size() > 0 with !x.empty()
|
8 months ago |
frosch
|
b6c8f301be
|
Codechange: Silence warnings about intentionally unused parameters.
|
9 months ago |
|
Rubidium
|
4cf88e068a
|
Remove: unused include of cstdarg/stdarg.h
|
9 months ago |
|
Rubidium
|
5733142b0d
|
Codechange: use string/fmt instead of printf for Squirrel's Raise_Error
|
1 year ago |
|
Rubidium
|
8b93e45e22
|
Codechange: use string/fmt instead of printf for squirrel's PRINTFUNC
|
1 year ago |
Blinnikov Pavel
|
c8043f6e00
|
Update sqbaselib.cpp
(cherry picked from commit 43a4b138a504c0464e6a7bb7b87ac2a90968b0aa)
|
2 years ago |
|
Rubidium
|
a9774f3e34
|
Cleanup: [Squirrel] Use nullptr instead of 0 or NULL
|
3 years ago |
Charles Pigott
|
9b800a96ed
|
Codechange: Remove min/max functions in favour of STL variants (#8502)
|
3 years ago |
glx
|
196157b29e
|
Fix #7966: SQInteger is 64-bit, print it as 64-bit
|
4 years ago |
|
rubidium
|
771dcf3b7b
|
(svn r27003) -Cleanup: fix the use of spaces and asterices "around" some comments
|
10 years ago |
|
rubidium
|
6bf8a63ed9
|
(svn r26783) -Fix (r26781): removed one include too many
|
10 years ago |
|
rubidium
|
9b0c01e9bf
|
(svn r26781) -Codechange [Squirrel]: remove includes/definitions that are already in stdafx.h
|
10 years ago |
|
rubidium
|
9543f4ed1e
|
(svn r26778) -Codechange: remove pointless rsl macro
|
10 years ago |
|
rubidium
|
eb52e65bec
|
(svn r26777) -Codechange: use safe string functions in squirrel code as well, and prevent using the ones that are deemed unsafe
|
10 years ago |
|
rubidium
|
e63ca12ab8
|
(svn r26775) -Cleanup [Squirrel]: "resolve" several of the unicode wrapper defines
|
10 years ago |
|
rubidium
|
33ab505567
|
(svn r26774) -Cleanup [Squirrel]: remove _SC macro
|
10 years ago |
|
rubidium
|
a355e123fc
|
(svn r24153) -Fix [FS#5160]: [Squirrel] Crash when trying to create an array with negative size
|
12 years ago |
|
rubidium
|
cd735fb613
|
(svn r23870) -Fix [FS#5004]: scripts with a bad comparator could lock up OpenTTD
|
13 years ago |
truebrain
|
0c2bbdde5c
|
(svn r23383) -Update: bring Squirrel to 2.2.5; besides some nice bug fixes, it mostly solves the sort() issues
|
13 years ago |
|
rubidium
|
624c8a6173
|
(svn r23190) -Fix: compile error due to Squirrel define messing up another included file
|
13 years ago |
yexo
|
72b1fffe82
|
(svn r23187) -Fix (r23186): MSVC allowed non-const where const was mandatory
|
13 years ago |
|
yexo
|
37797164ca
|
(svn r23186) -Fix [FS#4830]: [Squirrel] replace custom qsort by std::sort to fix stack overflow
|
13 years ago |
|
yexo
|
03d711add3
|
(svn r17195) -Update: squirrel to 2.2.3 stable
|
15 years ago |
|
rubidium
|
1ad50ce4e6
|
(svn r15578) -Change: unexternalise squirrel.
|
15 years ago |