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.

Sign up for GitHub

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

Jump to bottom

2403 std #647

Merged
merged 107 commits into from
May 27, 2024
Merged

2403 std #647

merged 107 commits into from
May 27, 2024

Conversation

Ranran-the-JuicyPork
Copy link

No description provided.

Dwachs and others added 30 commits August 16, 2023 21:34
@Dwachs @Ranran-the-JuicyPork
CODE: finish calculation early for convois with one vehicle
3caec38 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10235
8aca7d54-2c30-db11-9de9-000461428c89

# Conflicts:
#	simconvoi.cc
@Ranran-the-JuicyPork
FIX missing include
45f7b67
@Ranran-the-JuicyPork
(Dwachs) CODE: use ranged for instead of FOR macro
ee3b398 
part of r10447
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10447
8aca7d54-2c30-db11-9de9-000461428c89
@Ranran-the-JuicyPork
CODE: Consistent line format with standard
cfd8dd2
@Dwachs @Ranran-the-JuicyPork
FIX crash if desc == NULL (may come from scripts)
9b777e3 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10845
8aca7d54-2c30-db11-9de9-000461428c89
@Dwachs @Ranran-the-JuicyPork
add format specifier to translatable string
a04263b 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10858
8aca7d54-2c30-db11-9de9-000461428c89

# Conflicts:
#	src/base.tab
@Dwachs @Ranran-the-JuicyPork
FIX: cannot build double slopes if the pakset does not support it
9085810 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10866
8aca7d54-2c30-db11-9de9-000461428c89

# Conflicts:
#	src/simutrans/tool/simtool.cc
@Dwachs @Ranran-the-JuicyPork
ADD: scroll to selected font in load-font window
c1fdf90 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10869
8aca7d54-2c30-db11-9de9-000461428c89
@Roboron3042 @Ranran-the-JuicyPork
CODE: translate infowin_event comments
92ae8d7 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10872
8aca7d54-2c30-db11-9de9-000461428c89

# Conflicts:
#	src/simutrans/gui/components/gui_chart.cc
#	src/simutrans/gui/components/gui_combobox.cc
#	src/simutrans/gui/components/gui_container.cc
#	src/simutrans/gui/components/gui_convoiinfo.cc
#	src/simutrans/gui/components/gui_image_list.cc
#	src/simutrans/gui/components/gui_scrollpane.cc
#	src/simutrans/gui/components/gui_textinput.cc
#	src/simutrans/gui/components/gui_world_view.cc
#	src/simutrans/gui/convoi_frame.h
#	src/simutrans/gui/curiositylist_stats.cc
#	src/simutrans/gui/gui_frame.cc
#	src/simutrans/gui/halt_list_stats.cc
#	src/simutrans/gui/labellist_stats.cc
@Dwachs @Ranran-the-JuicyPork
CODE: remove unused function
9976584 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10874
8aca7d54-2c30-db11-9de9-000461428c89
@Dwachs @Ranran-the-JuicyPork
CODE: remove unused parameter
51a3221 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10877
8aca7d54-2c30-db11-9de9-000461428c89
@Dwachs @Ranran-the-JuicyPork
CODE: simplify string length calculation routines
b85352c 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10878
8aca7d54-2c30-db11-9de9-000461428c89

# Conflicts:
#	src/simutrans/gui/vehiclelist_frame.cc
@Dwachs @Ranran-the-JuicyPork
CODE: move methods from simgraph* to unicode.h/.c
4d7ecb1 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10875
8aca7d54-2c30-db11-9de9-000461428c89

# Conflicts:
#	src/simutrans/sys/clipboard_internal.cc
@Ranran-the-JuicyPork
Merge remote-tracking branch 'refs/remotes/origin/std-r10235' into 24…
9b069b8 
…03-std

# Conflicts:
#	vehicle/vehicle.cc
@Ranran-the-JuicyPork
Update cherry-picked-commits.txt
394707d
@Ranran-the-JuicyPork
Revert "FIX: cannot build double slopes if the pakset does not suppor…
5d2c3f1 
…t it"

This reverts commit 9085810.
@Dwachs @Ranran-the-JuicyPork
FIX: window position not being saved in some cases (koroal)
72ab45d 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10822
8aca7d54-2c30-db11-9de9-000461428c89
@Ranran-the-JuicyPork
FIX: merging conflict (simgraph16)
c23a2a1
@Ranran-the-JuicyPork
FIX: merging error of r10875
9bc9597
@Ranran-the-JuicyPork
FIX: Remove unnecessary HEAD mixed in by merging
47e5032
@Dwachs @Ranran-the-JuicyPork
CODE: move uft-types to simtypes.h, reduce include dependency
b5bc081 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10876
8aca7d54-2c30-db11-9de9-000461428c89

# Conflicts:
#	src/simutrans/sys/simsys_s2.cc
@Dwachs @Ranran-the-JuicyPork
FIX: improved width calculation for numberinput elements
b3eeb35 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10880
8aca7d54-2c30-db11-9de9-000461428c89
@Dwachs @Ranran-the-JuicyPork
FIX: do not draw on the window boundary
75f37c9 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10882
8aca7d54-2c30-db11-9de9-000461428c89
@Dwachs @Ranran-the-JuicyPork
CODE: use FT_Load_Char
a2c69c1 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10883
8aca7d54-2c30-db11-9de9-000461428c89

# Conflicts:
#	src/simutrans/display/font.cc
@Dwachs @Ranran-the-JuicyPork
FIX crash in build-station tool without cursor
263f464 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10885
8aca7d54-2c30-db11-9de9-000461428c89
@Ranran-the-JuicyPork
Update cherry-picked-commits.txt
9c230f7
@Ranran-the-JuicyPork
FIX: missing change in r10876
15ea8e0
@Ranran-the-JuicyPork
FIX/CODE: German to English change unintentionally reverted
2f03237
@Dwachs @Ranran-the-JuicyPork
CODE: reduce code duplication for rgb555/565 specific code
3964525 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10846
8aca7d54-2c30-db11-9de9-000461428c89
@Dwachs @Ranran-the-JuicyPork
FIX fix/remove more RGB555 stuff
9dbe80f 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10847
8aca7d54-2c30-db11-9de9-000461428c89
Dwachs and others added 29 commits May 15, 2024 22:58
@Dwachs @Ranran-the-JuicyPork
ADD: command-line parameter -scenario also looks in addons directory
ae66029 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10275 8aca7d54-2c30-db11-9de9-000461428c89
@ceeac @Ranran-the-JuicyPork
ADD: Automated tests + GitHub Action to run them for each nightly build
daae46b 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10171
8aca7d54-2c30-db11-9de9-000461428c89

# Conflicts:
#	tests/all_tests.nut
#	tests/empty-16x16.sve
#	tests/scenario.nut
#	tests/test_helpers.nut
#	tests/tests/test_building.nut
#	tests/tests/test_climate.nut
#	tests/tests/test_depot.nut
#	tests/tests/test_dir.nut
#	tests/tests/test_factory.nut
#	tests/tests/test_good.nut
#	tests/tests/test_halt.nut
#	tests/tests/test_headquarters.nut
#	tests/tests/test_label.nut
#	tests/tests/test_player.nut
#	tests/tests/test_powerline.nut
#	tests/tests/test_reservation.nut
#	tests/tests/test_scenario.nut
#	tests/tests/test_sign.nut
#	tests/tests/test_slope.nut
#	tests/tests/test_terraform.nut
#	tests/tests/test_trees.nut
#	tests/tests/test_way_bridge.nut
#	tests/tests/test_way_road.nut
#	tests/tests/test_way_runway.nut
#	tests/tests/test_way_tram.nut
#	tests/tests/test_way_tunnel.nut
#	tests/tests/test_wayobj.nut
@ceeac @Ranran-the-JuicyPork
Force English language when running tests via run-automated-tests.sh
9dc6704 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10173 8aca7d54-2c30-db11-9de9-000461428c89
@ceeac @Ranran-the-JuicyPork
Limit max runtime of tests in case of unexpected failure
d7c1d8f 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10176 8aca7d54-2c30-db11-9de9-000461428c89
@ceeac @Ranran-the-JuicyPork
Fix compile error
541fc7b
@ceeac @Ranran-the-JuicyPork
Update base scripts
98211f1
@ceeac @Ranran-the-JuicyPork
Fix GitHub Action
da4f9b7
@ceeac @Ranran-the-JuicyPork
Sync run-automated-tests.sh with Standard
76b5271
@ceeac @Ranran-the-JuicyPork
Do not crash immediately on signed integer overflow
3608acd
@ceeac @Ranran-the-JuicyPork
Temporarily disable abort-on-ub
4d8263a
@ceeac @Ranran-the-JuicyPork
FIX slope -> ribi translation
80d8836
@ceeac @Ranran-the-JuicyPork
Fix compilation error on macOS
340e295
@ceeac @Ranran-the-JuicyPork
Add Action to run tests with thread sanitizer
9669f12
@ceeac @Ranran-the-JuicyPork
Improved error messages for ASSERT_TRUE and ASSERT_FALSE
97a9cb6 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@10730 8aca7d54-2c30-db11-9de9-000461428c89
@ceeac @Ranran-the-JuicyPork
Enable test_label
ce58c5f
@ceeac @Ranran-the-JuicyPork
Upgrade to actions/cache v3
07d8455
@ceeac @Ranran-the-JuicyPork
Re-enable abort-on-ub
b2984c3
@ceeac @Ranran-the-JuicyPork
FIX: Main menu is loaded when -scenario is specified
4583201
@ceeac @Ranran-the-JuicyPork
Disable failing tests
bd855fa
@ceeac @Ranran-the-JuicyPork
Run tests on pull_request
4810d84
@ceeac @Ranran-the-JuicyPork
Fix VS project
6246552
@Ranran-the-JuicyPork
FIX: Function override error
7553316
@Ranran-the-JuicyPork
disable ex-15 parameters
bcb5835
@Ranran-the-JuicyPork
bugfix
4cd54ac
@jamespetts @Ranran-the-JuicyPork
FIX: Local compile error
7a272e2
@Ranran-the-JuicyPork
Merge branch 'heads/jamespetts/master' into 2403-std
49dcaa0
@Ranran-the-JuicyPork
CODE: compiler warning
2ec288f
@Ranran-the-JuicyPork
FIX: missing end of parentheses
3a73a29
@Ranran-the-JuicyPork
Merge remote-tracking branch 'refs/remotes/jamespetts/master' into 24…
a202bb1 
…03-std

# Conflicts:
#	script/api/api_player.cc
@jamespetts jamespetts merged commit 6d6692b into jamespetts:master May 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Ranran-the-JuicyPork @jamespetts @Dwachs @Roboron3042 @ceeac