mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,346 Commits 7 Branches 39 Tags 358 MiB
Commit Graph

1346 Commits

Author SHA1 Message Date
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
Ted John 274c2dc36f Merge pull request #330 from qcz/window-staff-registers 
Clean up most of the inline assembly from windows
 2014-08-19 19:35:06 +01:00
Duncan Frost 3df3ff4d1c Fix #317 crash on viewing news items caused by double pointer de ref and reuse of same pointers. 2014-08-19 19:34:31 +01:00
IntelOrca 94b4ea62d4 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-08-19 19:32:25 +01:00
IntelOrca d16e35303d Merge branch 'adrian17-polish_language' 2014-08-19 19:32:09 +01:00
IntelOrca 37258b4710 add polish language entry, #329 2014-08-19 19:31:51 +01:00
qcz 6473fd2b97 Maybe this will statisfy Travis 2014-08-19 20:22:13 +02:00
qcz 5c22530965 Fix coordinate type to avoid invalid cast 2014-08-19 20:08:09 +02:00
qcz bd06c7caee Clean up most of the inline assembly from windows 2014-08-19 19:47:12 +02:00
adrian17 735b22d8d0 Start translating polish.txt 2014-08-19 18:56:24 +02:00
Duncan 56e6028a56 Rewrote to use map_elements 
not tested
 2014-08-19 12:48:00 +01:00
Duncan b51842078a Merge pull request #4 from IntelOrca/master 
Merge to master
 2014-08-19 12:23:38 +01:00
qcz 2bbba4672b Merge remote-tracking branch 'upstream/master' into hire-staff-command 2014-08-19 09:46:25 +02:00
qcz c88a786399 Fix peep struct member name 2014-08-19 09:46:04 +02:00
Ted John e9665e22df Merge pull request #327 from MaxBareiss/patch-1 
Fix typo
 2014-08-18 22:06:09 +01:00
adrian17 b3e4e0e9c4 Add polish.txt (as a copy of english_us.txt) 2014-08-18 22:54:20 +02:00
MaxBareiss 181c5f6518 Fix typo 
s/haivng/having
 2014-08-18 15:04:00 -04:00
Ted John d2b562a8f5 Merge pull request #326 from fbourigault/language-french-3 
Add 250+ french translated strings.
 2014-08-18 13:10:38 +01:00
Fabien Bourigault acb5afc6c5 Add 250+ french translated strings. 2014-08-18 14:00:57 +02:00
Ted John ba0937b002 Merge pull request #325 from Balletie/master 
Use MacPorts if Homebrew isn't installed
 2014-08-18 12:16:09 +01:00
Balletie 6208aeb57a Untabify the file 2014-08-18 12:51:31 +02:00
Balletie 7563601050 Install wget if it's not found 2014-08-18 12:46:03 +02:00
Balletie 1575488f5a Add fallback to MacPorts if brew isn't installed 2014-08-18 12:45:13 +02:00
Ted John b45995182b Merge pull request #323 from fbourigault/language-french-2 
Add 100+ french translated strings.
 2014-08-17 23:58:28 +01:00
IntelOrca e222b88581 start work on new ride window 2014-08-17 23:57:41 +01:00
Fabien Bourigault e1324f57d3 Add 100+ french translated strings. 2014-08-18 00:46:25 +02:00
Ted John 4d929709f4 Merge pull request #321 from fbourigault/french-translation 
Translated some strings to french.
 2014-08-17 22:24:04 +01:00
Ted John b5d796b48e Merge pull request #322 from hexdec/master 
Fixed resize gripper not showing up on guest and staff windows.
 2014-08-17 22:23:37 +01:00
hexdec 2f5f65d607 Fixed resize gripper not showing up on guest and staff windows. 2014-08-17 22:40:34 +02:00
Fabien Bourigault 3f5a7d2b71 Translated some strings to french. 2014-08-17 22:22:54 +02:00
Ted John 8f58c6a844 Update readme.md 2014-08-17 21:01:05 +01:00
Ted John e36836366d Merge pull request #312 from hexdec/master 
Initial window_staff_peep_open create window
 2014-08-17 20:17:30 +01:00
hexdec ea43709c27 Fixed using wrong class & flag. 2014-08-17 21:11:26 +02:00
IntelOrca 92b74a8deb handle utf8 characters in languages, convert appropriately for #319 2014-08-17 19:20:45 +01:00
hexdec 7071f68670 Merge branch 'window_staff_peep' of https://github.com/duncanspumpkin/OpenRCT2 
Conflicts:
	src/window_peep.c
 2014-08-17 16:30:01 +02:00
Ted John 83c047e632 Merge pull request #315 from duncanspumpkin/fix_303 
Fix crash on right click of flat rides
 2014-08-17 12:46:33 +01:00
Ted John 4262366cf5 Merge pull request #314 from duncanspumpkin/fix_graph 
Fixes upside down graph
 2014-08-17 12:46:24 +01:00
Ted John 9565a3754b Merge pull request #313 from duncanspumpkin/top_toolbar_fix 
Fixed bug in toolbar widget drawing. Added pause and zoom out disable.
 2014-08-17 12:46:16 +01:00
Duncan Frost ca49b7ca09 Fix crash on right click of flat rides 2014-08-17 11:57:50 +01:00
Duncan Frost b0d39bbf0e Added sepearte file for staff_peep_window 2014-08-17 11:45:43 +01:00
Duncan Frost aa0709c439 Fixed clicking on peep causing hybrid 2014-08-17 11:01:34 +01:00
Duncan Frost 6258a76b96 Fixes upside down graph 2014-08-17 10:52:12 +01:00
Duncan Frost 1943682153 Fixed bug in toolbar widget drawing. Added pause and zoom out disable. 2014-08-17 10:11:19 +01:00
hexdec d3a55efd30 Added window_peep_staff_events. 2014-08-17 01:37:28 +02:00