mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 03:53:07 +01:00
Code Issues Releases Wiki Activity
1,339 Commits 8 Branches 59 Tags
e9fab52db221235fa3d371da3ac7331f5a7fec7f
Commit Graph

1339 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
IntelOrca
e9fab52db2 Merge branch 'new-ride-window' 
Conflicts:
	src/language.c
 2014-08-21 22:51:47 +01:00
IntelOrca
76ca655b0e finish window_new_ride 2014-08-21 22:50:06 +01:00
IntelOrca
25a31b9875 clear up window_new_ride a bit 2014-08-21 22:33:36 +01:00
IntelOrca
b4e72cf960 add window_new_ride_paint_ride_information 2014-08-21 21:48:23 +01:00
Ted John
6f912b213b Merge pull request #343 from Balletie/master 
Fix build on OSX by adding missing include (fixes #342)
 2014-08-21 12:43:52 +01:00
Balletie
afaec0557b Merge branch 'master' of https://github.com/Balletie/OpenRCT2 2014-08-21 11:58:12 +02:00
Balletie
8d75552cf4 Fix build on OSX (missing include) 2014-08-21 11:57:54 +02:00
Balletie
9612eb6876 Fix build on OSX (missing include) 2014-08-21 11:56:45 +02:00
Ted John
0969c0bcff Merge pull request #341 from qcz/hire-staff-command 
Decompile the hire staff game command
 2014-08-20 23:44:40 +01:00
qcz
3a55af7403 Fix new file encodings 2014-08-20 23:53:51 +02:00
qcz
fa6caa856a Move staff related stuff to its own file 2014-08-20 23:48:36 +02:00
IntelOrca
8644ed5b57 implement scroll mouse events for new ride window 2014-08-20 22:06:47 +01:00
IntelOrca
941b6ccb99 Merge branch 'mdtrooper-spanish_translation' 2014-08-20 20:33:16 +01:00
IntelOrca
6ab6c5d9a6 add spanish language entry, #338 2014-08-20 20:32:25 +01:00
IntelOrca
d02d6224d3 Merge branch 'spanish_translation' of https://github.com/mdtrooper/OpenRCT2 into mdtrooper-spanish_translation 2014-08-20 20:31:44 +01:00
IntelOrca
8e4cc238cc fix window_new_ride_populate_list and add window_new_ride_scroll_to_focused_ride 2014-08-20 20:18:17 +01:00
qcz
250acea957 Rename tabIndex to staff_type, move staff max count constant to #define 2014-08-20 17:48:47 +02:00
qcz
12f6d57876 Fix pointer type 2014-08-20 17:39:41 +02:00
qcz
f142cddbd6 Add return type to remove Travis warnings 2014-08-20 16:04:10 +02:00
qcz
1007e79baa Fix Travis error 2014-08-20 16:00:47 +02:00
qcz
92f0139b5a Move typedef to header file 2014-08-20 15:48:53 +02:00
qcz
cb169952ac Remove unused variable, add indices to new_game_command_table 2014-08-20 15:38:21 +02:00
qcz
1b3f98362f Finalize hire-staff-command 2014-08-20 15:32:39 +02:00
qcz
6112668bcc Merge remote-tracking branch 'upstream/master' into hire-staff-command 2014-08-20 14:30:46 +02:00
Ted John
931c91e211 Merge pull request #339 from qcz/fix-missing-comma 
Fix missing comma
 2014-08-20 08:46:25 +01:00
qcz
be1505c007 Fix missing comma 2014-08-20 09:37:28 +02:00
IntelOrca
01e32c301d improve new ride window populate docs 2014-08-20 07:50:01 +01:00
qcz
0e48e92949 Entertainers don't crash the game anymore 2014-08-20 07:23:02 +02:00
mdtrooper
864a989ba8 Starting the translation into spanish. 2014-08-20 02:58:08 +02:00
mdtrooper
b25d3626a5 Copy the file english_uk.txt to spanish_sp.txt. At the moment the file has not any string in spanish (spain). 2014-08-20 02:45:43 +02:00
IntelOrca
9b08db7020 add window_new_ride_populate_list 2014-08-20 00:05:40 +01:00
qcz
4959bdd55d Merge remote-tracking branch 'upstream/master' into hire-staff-command 2014-08-19 23:52:23 +02:00
Ted John
e94c84f861 Merge pull request #336 from hexdec/master 
Shortcut toggles
 2014-08-19 21:52:12 +01:00
IntelOrca
16106c7569 Merge branch 'master' into new-ride-window 
Conflicts:
	src/window_new_ride.c
	src/window_research.c
 2014-08-19 21:43:25 +01:00
hexdec
540c8efd23 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-08-19 22:41:13 +02:00
hexdec
de01827de9 Decompiled game shortcuts for viewport flags. 2014-08-19 22:39:22 +02:00
IntelOrca
c7986d140c add widgets, sizing and basic events for new ride window 2014-08-19 21:33:05 +01:00
Ted John
654e40aaa5 Merge pull request #333 from qcz/hulang 
Add Hungarian language
 2014-08-19 21:31:57 +01:00
Ted John
9065837c9b Merge pull request #334 from qcz/316-fix 
Fix #316
 2014-08-19 21:31:18 +01:00
Ted John
c7edafc627 Merge pull request #332 from duncanspumpkin/update_viewport_left 
Update viewport left and fix #318
 2014-08-19 21:30:32 +01:00
qcz
9a4fd48d97 Add hungarian and polish language files to the solution 2014-08-19 22:23:54 +02:00
qcz
8f33388d37 Typo in variable name 2014-08-19 22:19:32 +02:00
qcz
06114c2116 Fix #316 2014-08-19 22:16:05 +02:00
Duncan Frost
71b6389ec7 Fix 1 pixel width ride_window 2014-08-19 20:54:58 +01:00
qcz
2dd4a987d5 Translations vol. 2 2014-08-19 21:49:58 +02:00
Duncan Frost
5f68d4b2a0 Fix #318. Issue caused by checking progressivly more incorrect coordinates for connection 2014-08-19 20:41:46 +01:00
Ted John
2a09b03c43 Merge pull request #331 from duncanspumpkin/fix_317 
Fix #317 crash on viewing news items
 2014-08-19 20:31:06 +01:00
qcz
9a87440859 Start of translating to Hungarian 2014-08-19 21:24:05 +02:00
qcz
a4bab7cd0d Add Hungarian language 2014-08-19 21:17:20 +02:00
Duncan Frost
3307560a74 Merge branch 'upadate_viewport_left' of https://github.com/duncanspumpkin/OpenRCT2 into update_viewport_left 2014-08-19 19:56:41 +01:00