Jonathan G Rennison
|
853ed272be
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/airport_gui.cpp
# src/blitter/32bpp_optimized.cpp
# src/blitter/32bpp_simple.cpp
# src/blitter/32bpp_sse2.cpp
# src/blitter/8bpp_optimized.cpp
# src/blitter/8bpp_simple.cpp
# src/blitter/null.cpp
# src/build_vehicle_gui.cpp
# src/company_gui.cpp
# src/crashlog.cpp
# src/dropdown.cpp
# src/dropdown_type.h
# src/genworld_gui.cpp
# src/gfx.cpp
# src/main_gui.cpp
# src/newgrf_debug_gui.cpp
# src/news_gui.cpp
# src/news_type.h
# src/openttd.cpp
# src/order_gui.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/signs.cpp
# src/smallmap_gui.cpp
# src/spritecache.cpp
# src/spriteloader/grf.cpp
# src/texteff.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/video/opengl.cpp
# src/viewport.cpp
# src/waypoint_cmd.cpp
# src/zoom_type.h
|
4 months ago |
Peter Nelson
|
9854553e10
|
Codechange: ZOOM_LVL_SHIFT/BASE are not actually ZOOM_LVLs.
Rename to ZOOM_BASE_SHIFT and ZOOM_BASE respectively, and derive from ZOOM_LVL instead of numeric value.
|
6 months ago |
|
Peter Nelson
|
7c322ebcf1
|
Codechange: Define a ZOOM_LVL for minimum text effect visibility.
|
6 months ago |
|
Jonathan G Rennison
|
5f7034f23c
|
Fix clang compilation issue with _text_effects
|
8 months ago |
|
Jonathan G Rennison
|
97e6f3062e
|
Adding of _t to (u)int types, and WChar to char32_t
See: eaae0bb5e
|
9 months ago |
|
Jonathan G Rennison
|
2e06374f6f
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/build_vehicle_gui.cpp
# src/company_gui.cpp
# src/gfx_func.h
# src/group_gui.cpp
# src/industry_gui.cpp
# src/misc_gui.cpp
# src/news_gui.cpp
# src/settings_gui.cpp
# src/ship_gui.cpp
# src/smallmap_gui.cpp
# src/station_gui.cpp
# src/subsidy_gui.cpp
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/town_gui.cpp
# src/vehicle_gui.cpp
# src/viewport.cpp
# src/widget.cpp
# src/widgets/dropdown.cpp
# src/window.cpp
|
9 months ago |
|
Jonathan G Rennison
|
b80e2dff19
|
Fix crash which could occur when adding/updating text effects
When DParam 0 or 1 contained a leftover string
See: #612
|
10 months ago |
|
Peter Nelson
|
3c61c642a9
|
Codechange: Don't allocate a text effect with INVALID_TE_ID.
Previously, despite INVALID_TE_ID existing, it was not checked during allocation and there was no limit to the number of text effects.
|
1 year ago |
|
Peter Nelson
|
78b841d14e
|
Codechange: Take reference to text effect instead of pointer when updating.
|
1 year ago |
|
Peter Nelson
|
7519f7ad79
|
Codechange: Use std::find_if to find or assign a text effect slot.
This replaces an index-based loop.
|
1 year ago |
Richard Wheeler
|
96fdfb941a
|
Feature: Transparency option for cost and income indicators (#11001)
|
1 year ago |
Rubidium
|
eaae0bb5e7
|
Codechange: automatic adding of _t to (u)int types, and WChar to char32_t
for i in `find src -type f|grep -v 3rdparty/fmt|grep -v 3rdparty/catch2|grep -v 3rdparty/opengl|grep -v stdafx.h`; do sed 's/uint16& /uint16 \&/g;s/int8\([ >*),;[]\)/int8_t\1/g;s/int16\([ >*),;[]\)/int16_t\1/g;s/int32\([ >*),;[]\)/int32_t\1/g;s/int64\([ >*),;[]\)/int64_t\1/g;s/ uint32(/ uint32_t(/g;s/_uint8_t/_uint8/;s/Uint8_t/Uint8/;s/ft_int64_t/ft_int64/g;s/uint64$/uint64_t/;s/WChar/char32_t/g;s/char32_t char32_t/char32_t WChar/' -i $i; done
|
1 year ago |
|
Rubidium
|
8b7c34d7d4
|
Codechange: use string parameter backps for the text effects
|
1 year ago |
|
Jonathan G Rennison
|
ead18b2af2
|
Merge branch 'master' into jgrpp
# Conflicts:
# CMakeLists.txt
# src/3rdparty/md5/md5.h
# src/3rdparty/squirrel/squirrel/squtils.h
# src/animated_tile.cpp
# src/console_func.h
# src/core/CMakeLists.txt
# src/core/container_func.hpp
# src/core/smallstack_type.hpp
# src/crashlog.cpp
# src/crashlog.h
# src/debug.h
# src/economy.cpp
# src/gamelog.cpp
# src/industry_gui.cpp
# src/lang/catalan.txt
# src/misc_gui.cpp
# src/network/network_content.h
# src/newgrf.cpp
# src/newgrf.h
# src/newgrf_config.cpp
# src/newgrf_config.h
# src/newgrf_gui.cpp
# src/os/unix/font_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/rail_cmd.cpp
# src/saveload/animated_tile_sl.cpp
# src/script/api/script_tilelist.cpp
# src/settings.cpp
# src/settingsgen/settingsgen.cpp
# src/sl/oldloader_sl.cpp
# src/station.cpp
# src/station_cmd.cpp
# src/stdafx.h
# src/strgen/strgen.cpp
# src/strgen/strgen_base.cpp
# src/table/settings/gui_settings.ini
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehicle_cmd.cpp
# src/vehicle_gui_base.h
# src/viewport_sprite_sorter.h
|
1 year ago |
|
Rubidium
|
321f01602a
|
Codechange: reduce passing around parameters, but formatting strings earlier
|
1 year ago |
|
Rubidium
|
3323402aaa
|
Codechange: rename smallvec_type to container_func and use only when needed
|
1 year ago |
Patric Stout
|
1ba4dcc924
|
Codechange: migrate all Window-related timers to the new framework
This means we also say goodbye to GUITimers.
|
1 year ago |
|
Jonathan G Rennison
|
6d4474b84e
|
Merge tag '13.0-beta2' into jgrpp
# Conflicts:
# src/cheat_gui.cpp
# src/company_gui.cpp
# src/console_gui.cpp
# src/depot_gui.cpp
# src/error_gui.cpp
# src/gfx.cpp
# src/graph_gui.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/lang/korean.txt
# src/lang/polish.txt
# src/misc_gui.cpp
# src/network/network_content_gui.h
# src/newgrf_debug_gui.cpp
# src/order_gui.cpp
# src/rail_gui.cpp
# src/road_gui.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/station_gui.cpp
# src/subsidy_gui.cpp
# src/table/settings/gui_settings.ini
# src/timetable_gui.cpp
# src/town_gui.cpp
# src/train_cmd.cpp
# src/vehicle_gui.cpp
# src/viewport.cpp
# src/water_cmd.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
|
2 years ago |
|
Jonathan G Rennison
|
7685c36f35
|
Implement partial parallelisation of non-map mode viewport rendering
|
2 years ago |
|
PeterN
|
b36bfc7ab0
|
Fix #9174: Don't update text effect if it has been reset. (#9183)
(cherry picked from commit 0bc6f32346)
|
3 years ago |
|
PeterN
|
43fe7463ba
|
Fix: Update text effect size when font zoom is changed. (#9174)
(cherry picked from commit 18651dd8b1)
|
3 years ago |
|
PeterN
|
0bc6f32346
|
Fix #9174: Don't update text effect if it has been reset. (#9183)
|
3 years ago |
|
PeterN
|
18651dd8b1
|
Fix: Update text effect size when font zoom is changed. (#9174)
|
3 years ago |
|
Jonathan G Rennison
|
db9e088801
|
Pre-filter signs by Y coordinate in DrawTextEffects
|
5 years ago |
|
Jonathan G Rennison
|
c42ce832ae
|
Fix viewport signs and text effects marking viewports dirty unnecessarily
* When at high zoom levels where the signs are not shown
* Where the sign type is disabled in the display options
|
5 years ago |
|
Jonathan G Rennison
|
cbdd9f84d8
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/console_gui.cpp
# src/lang/korean.txt
# src/video/sdl2_v.cpp
# src/video/sdl2_v.h
# src/window.cpp
# src/window_gui.h
|
5 years ago |
S. D. Cloudt
|
13cc8a0cee
|
Cleanup: Removed SVN headers
|
5 years ago |
|
Jonathan G Rennison
|
ac5139343a
|
Maintain free list for text effect entries
|
5 years ago |
Henry Wilson
|
c01a2e2a81
|
Codechange: Removed SmallVector completely
|
6 years ago |
|
Henry Wilson
|
ab711e6942
|
Codechange: Replaced SmallVector::[Begin|End]() with std alternatives
|
6 years ago |
|
Henry Wilson
|
a0f36a50e6
|
Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back()
|
6 years ago |
|
Henry Wilson
|
aa7ca7fe64
|
Codechange: Replaced SmallVector::Get(n) non-const with std::vector::data() + n
|
6 years ago |
|
Henry Wilson
|
f3938fdb83
|
Codechange: Replaced SmallVector::Reset() with std::vector::clear() + shrink_to_fit()
|
6 years ago |
|
Henry Wilson
|
a690936ed7
|
Codechange: Replace SmallVector::Length() with std::vector::size()
|
6 years ago |
|
Peter Nelson
|
806e7d25dd
|
Change: Use GUITimer class instead of bare int/uints.
|
6 years ago |
|
Peter Nelson
|
59fe4f28c8
|
Change: Animate text effects by real time instead of game ticks.
|
6 years ago |
frosch
|
9fb56ca02e
|
(svn r27248) -Fix [FS#6257]: Town labels on smallmap and zoomed-out viewports were not centered. (_dp_)
|
10 years ago |
|
rubidium
|
0463dbdc9e
|
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
|
11 years ago |
|
rubidium
|
446d50f658
|
(svn r25011) -Codechange: allow vehicle transfer and profit text effects to be shown at the same time (fonsinchen)
|
12 years ago |
|
rubidium
|
113746b3a6
|
(svn r24068) -Change/fix [FS#5103]: significantly reduce the area that is redrawn for text effects (Rhamphoryncus)
|
13 years ago |
|
rubidium
|
6db0753a46
|
(svn r24066) -Change: do not redraw the text effect when nothing changed (Rhamphoryncus)
|
13 years ago |
|
peter1138
|
7337e7ff49
|
(svn r23318) -Change: Make text effects rise at their previous speed.
|
13 years ago |
|
peter1138
|
81598273e9
|
(svn r23316) -Feature: Add ability to zoom in to 2x and 4x level.
|
13 years ago |
smatz
|
c5b34444af
|
(svn r19084) -Codechange: minor coding-style fixups
|
15 years ago |
|
rubidium
|
82fc28f77f
|
(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header
|
15 years ago |
|
smatz
|
9cefcdab82
|
(svn r18636) -Codechange: make TextEffect::duration a value in ticks instead of ticks * 8
|
15 years ago |
|
smatz
|
e6d6704f32
|
(svn r18635) -Codechange: store TextEffects in a SmallVector
|
15 years ago |
|
rubidium
|
b0603f4c2e
|
(svn r18602) -Codechange: unify the viewport sign and text effect drawing
-Fix [FS#3394]: signs could occasionally glitch
|
15 years ago |
|
frosch
|
c24d6d3f4e
|
(svn r18244) -Codechange: Make texteffects big font aware.
|
15 years ago |
|
rubidium
|
d6cded5380
|
(svn r17693) -Cleanup: remove some unneeded includes
|
15 years ago |