1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 19:43:06 +01:00
Commit Graph

761 Commits

Author SHA1 Message Date
IntelOrca
21ff16e804 Merge branch 'master' into gfx_unstable 2014-05-31 16:57:17 +01:00
IntelOrca
7ae52df001 fix format_string currency 2dp 2014-05-31 16:57:00 +01:00
IntelOrca
35c8f64fff Merge branch 'master' into gfx_unstable 2014-05-31 16:48:16 +01:00
IntelOrca
b5575d31eb fix more format string bugs 2014-05-31 16:47:30 +01:00
Ted John
416be95811 Merge pull request #162 from ZedThree/gfx_strings
Gfx strings
2014-05-31 16:28:30 +01:00
ZedThree
8b1c76b1b6 Replace pad_0E with zoom_level 2014-05-31 16:43:39 +02:00
ZedThree
a06f6ade8b String functions for wrapped text 2014-05-31 16:40:44 +02:00
ZedThree
583fbaa2a4 Fix some pointer issues 2014-05-31 16:40:43 +02:00
ZedThree
5b41528e2e Rename variables in get_width to align with clip_string 2014-05-31 16:40:43 +02:00
ZedThree
1dc794b038 Finish clip string 2014-05-31 16:40:43 +02:00
ZedThree
9c9ece2d7b clip text mostly working 2014-05-31 16:40:42 +02:00
ZedThree
9fecf42e51 Tidy up loop on pointer 2014-05-31 16:40:42 +02:00
ZedThree
b5d11159b3 Start of clip_text 2014-05-31 16:40:41 +02:00
ZedThree
130796052f More string functions 2014-05-31 16:40:41 +02:00
ZedThree
4fdba86b01 Add address for common string format buffer 2014-05-31 16:40:40 +02:00
ZedThree
55183d0589 draw_string_centred 2014-05-31 16:40:40 +02:00
ZedThree
504ce150ea Fix bug in gfx_get_string_width 2014-05-31 16:40:40 +02:00
ZedThree
67b7ca8d1e Fix use of g1_elements and tidy comments 2014-05-31 16:40:39 +02:00
ZedThree
c3ea45062b gfx_draw_string complete. Needs tidying 2014-05-31 16:40:39 +02:00
ZedThree
702a97b185 Fix some bugs, tidy up
Still buggy...
2014-05-31 16:40:38 +02:00
ZedThree
99c7b23452 Second pass of gfx_draw_string. Still buggy 2014-05-31 16:40:38 +02:00
ZedThree
6e778006a5 First pass for gfx_draw_string() 2014-05-31 16:40:37 +02:00
ZedThree
34a9f94ac1 Add gfx_get_string_width() 2014-05-31 16:40:37 +02:00
IntelOrca
883ca8939d Merge branch 'master' into gfx_unstable 2014-05-31 14:47:42 +01:00
IntelOrca
b1e9c5c786 fix format string bugs 2014-05-31 14:43:29 +01:00
IntelOrca
6a1c5fa6eb add initial start to peep update 2014-05-30 23:27:11 +01:00
IntelOrca
ccc9843633 Merge branch 'master' into gfx_unstable 2014-05-30 08:24:44 +01:00
IntelOrca
c0704734ff Merge branch 'lnz-scenario_stuff' 2014-05-29 23:28:02 +01:00
lnz
d5f374d38c Fix station_heights bug and use FOR_ALL_RIDES in ride_check_all_reachable 2014-05-30 00:24:44 +02:00
lnz
35b38f3c16 Remove debug statements and add string_ids for ride connected functions. 2014-05-30 00:12:29 +02:00
lnz
a4d4e55541 Merge remote-tracking branch 'upstream/master' into scenario_stuff 2014-05-30 00:07:21 +02:00
IntelOrca
bad9e8b7bd fix bug in format string 2014-05-29 23:05:55 +01:00
lnz
0d29d395b6 Merge branch 'scenario_stuff' of github.com:lnz/OpenRCT2 into scenario_stuff 2014-05-29 23:47:05 +02:00
lnz
978bc39d25 Name various ride variables, clear a warning in map.c, add a note in
scenario
2014-05-29 23:42:24 +02:00
lnz
6e32406e7b Cleanup and documentatin of ride connected functions 2014-05-29 23:07:20 +02:00
lnz
3a3694a480 More critical bugfixes for the reachability code. 2014-05-29 23:07:20 +02:00
lnz
ce270dbe19 Fix lots of disgusting bugs 2014-05-29 23:07:19 +02:00
lnz
5e104477d3 Cleanup and refactoring of ride reachability stuff 2014-05-29 23:07:19 +02:00
lnz
64bece0246 Initial implementation of ride reachability checks 2014-05-29 23:07:19 +02:00
Ted John
0687758e0a Merge pull request #160 from duncanspumpkin/master
Fixed small issue with mouse down code
2014-05-29 18:09:46 +01:00
Duncan Frost
a691216044 Fixed small issue with mouse down code 2014-05-29 17:22:32 +01:00
IntelOrca
7de050b7f3 Merge branch 'anyc-testing' 2014-05-29 15:13:32 +01:00
anyc
2a27ea0689 fix ASM for MinGW 2014-05-29 15:35:51 +02:00
IntelOrca
149d058535 Merge branch 'duncanspumpkin-c_based_mouse_down' 2014-05-28 22:59:33 +01:00
IntelOrca
d1c0ab28f2 Merge branch 'c_based_mouse_down' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-c_based_mouse_down 2014-05-28 22:58:16 +01:00
IntelOrca
423db67148 add climate_update_sound 2014-05-28 22:53:28 +01:00
Duncan Frost
7dc750bd55 Switched to cdecl for mouse down. 2014-05-28 22:22:09 +01:00
IntelOrca
e489b999f3 fix picked-up staff and rain drawing 2014-05-28 18:11:33 +01:00
IntelOrca
32cfe28081 Merge branch 'atmaxinger-config-save-ini' 2014-05-28 16:06:13 +01:00
IntelOrca
dee0c6c730 fix warnings 2014-05-28 16:06:04 +01:00