1329 Commits

Author SHA1 Message Date
Dylan Smith
a0bfcbef72 add analog thrust control + unset function
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@142 127b21dd-08f5-0310-b4b7-95ae10353056
2005-09-27 21:13:03 +00:00
Dylan Smith
1d9967e87a oops, gameView not self
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@141 127b21dd-08f5-0310-b4b7-95ae10353056
2005-09-26 22:00:00 +00:00
Dylan Smith
bdd6f5854a joystick button functions do something
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@140 127b21dd-08f5-0310-b4b7-95ae10353056
2005-09-26 21:06:17 +00:00
Dylan Smith
32d5f46737 Joystick function selection
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@139 127b21dd-08f5-0310-b4b7-95ae10353056
2005-09-25 19:44:52 +00:00
Dylan Smith
707017501c Make a start on the joystick mapper GUI
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@136 127b21dd-08f5-0310-b4b7-95ae10353056
2005-09-24 18:17:02 +00:00
Dylan Smith
7a7b1248ae Joystick basics (roll, pitch, fire)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@135 127b21dd-08f5-0310-b4b7-95ae10353056
2005-09-23 19:04:10 +00:00
Dylan Smith
8ba42b39f1 Tinker with the sound some more (prevent in use channels from getting stomped on)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@134 127b21dd-08f5-0310-b4b7-95ae10353056
2005-09-19 21:15:49 +00:00
Dylan Smith
e56f6feb87 Change main game loop back to NSRunLoop rather than big while(1) in pollControls to fix miscellaneous issues with things being done with performSelector:
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@133 127b21dd-08f5-0310-b4b7-95ae10353056
2005-09-18 17:24:19 +00:00
Dylan Smith
4ec398cbea Improve sound quality and switch to ogg to sync with OS X
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@131 127b21dd-08f5-0310-b4b7-95ae10353056
2005-09-17 16:22:48 +00:00
Dylan Smith
4621c0c4b3 Fix mixer (SDL_mixer doesn't automatically pick the channel - round robin channel allocation now added)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@130 127b21dd-08f5-0310-b4b7-95ae10353056
2005-09-17 13:47:12 +00:00
Dylan Smith
b782c2d7b3 F11 now cycles through entire screen resolution array
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@129 127b21dd-08f5-0310-b4b7-95ae10353056
2005-09-17 11:27:34 +00:00
Dylan Smith
47eca03ddf Fix number keys in the save GUI
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@127 127b21dd-08f5-0310-b4b7-95ae10353056
2005-09-15 20:16:14 +00:00
Dylan Smith
fe0e20a852 Fix hang when a player buys a ship with fewer missile pylons and the missiles on the old ship aren't loaded on contiguous pylons starting at pylon 0
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@125 127b21dd-08f5-0310-b4b7-95ae10353056
2005-09-13 20:50:31 +00:00
Dylan Smith
133ad4f938 oops, forgot to remove debugmsg
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@124 127b21dd-08f5-0310-b4b7-95ae10353056
2005-09-13 19:34:39 +00:00
Dylan Smith
9e599cbcfd Fix crash where textures are not found in an OXP (now throws a meaningful exception that tells the player which texture is missing)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@123 127b21dd-08f5-0310-b4b7-95ae10353056
2005-09-13 19:06:27 +00:00
Dylan Smith
e8f868482f remove debug messages from LoadSave
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@122 127b21dd-08f5-0310-b4b7-95ae10353056
2005-09-12 22:27:39 +00:00
Dylan Smith
bb80edfcfd SDL display mode enumeration
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@121 127b21dd-08f5-0310-b4b7-95ae10353056
2005-09-12 19:44:43 +00:00
Dylan Smith
acd281ae83 Only use NSLog for exceptions
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@119 127b21dd-08f5-0310-b4b7-95ae10353056
2005-09-10 15:01:55 +00:00
Dylan Smith
fd1bec7ff2 Improved load/save GUI
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@118 127b21dd-08f5-0310-b4b7-95ae10353056
2005-09-10 14:09:24 +00:00
Dylan Smith
0300bb9fd2 Continue to rehabilitate fullscreen mode
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@116 127b21dd-08f5-0310-b4b7-95ae10353056
2005-09-08 20:46:27 +00:00
Dylan Smith
5d9fff6f2f First stage of rehabilitating full screen mode selection
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@115 127b21dd-08f5-0310-b4b7-95ae10353056
2005-09-06 21:05:03 +00:00
Dylan Smith
50981407d8 Add LOADSAVEGUI ifdef to switch between AppKit load/save dialog and Oolite GUI dialog at compile time
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@114 127b21dd-08f5-0310-b4b7-95ae10353056
2005-09-05 19:57:39 +00:00
Dylan Smith
e64335c12b fix crash when no commanders are in ~/oolite-saves
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@113 127b21dd-08f5-0310-b4b7-95ae10353056
2005-09-05 19:20:45 +00:00
Giles Williams
700462d49b fixes to scaling using im_bytesPerRow
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@111 127b21dd-08f5-0310-b4b7-95ae10353056
2005-09-04 11:01:05 +00:00
Dylan Smith
e5ce9dda98 default full screen mode = native resolution
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@110 127b21dd-08f5-0310-b4b7-95ae10353056
2005-08-28 21:07:33 +00:00
Dylan Smith
f33bf945d0 save commander string editor fixes
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@109 127b21dd-08f5-0310-b4b7-95ae10353056
2005-08-28 19:16:57 +00:00
Dylan Smith
c51ae31537 remove unintended changes from ResourceManager.m
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@108 127b21dd-08f5-0310-b4b7-95ae10353056
2005-08-28 18:30:48 +00:00
Dylan Smith
3862ae61c1 load/save GUI basics integrated. needs more work though
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@107 127b21dd-08f5-0310-b4b7-95ae10353056
2005-08-28 17:48:39 +00:00
Dylan Smith
2b2f4dc0f7 fix weird texture scaling problem, getTextureNameFor now identical to OS X version
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@106 127b21dd-08f5-0310-b4b7-95ae10353056
2005-08-28 10:01:04 +00:00
Dylan Smith
bd453f9084 define textureRect
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@105 127b21dd-08f5-0310-b4b7-95ae10353056
2005-08-25 18:11:30 +00:00
Giles Williams
7ef006c3f1 OS independent bilinear image scaling
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@104 127b21dd-08f5-0310-b4b7-95ae10353056
2005-08-25 15:41:06 +00:00
Dylan Smith
7a9ed3d2d7 Prevent crash where a texture is resized to a size that's not a power of two
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@103 127b21dd-08f5-0310-b4b7-95ae10353056
2005-08-23 20:54:03 +00:00
Dylan Smith
9cb54bb8af Fix quit row to work with changes from Mac oolite
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@102 127b21dd-08f5-0310-b4b7-95ae10353056
2005-08-19 21:37:35 +00:00
Dylan Smith
af1fbb4dce Fix build break in MyOpenGLView
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@101 127b21dd-08f5-0310-b4b7-95ae10353056
2005-08-19 20:44:38 +00:00
Giles Williams
bac60cf62b big merge of latest Mac OSX work - may need some cleaning up
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@100 127b21dd-08f5-0310-b4b7-95ae10353056
2005-08-07 17:48:53 +00:00
Giles Williams
1514b67cc5 fix to problems with economies in intersystem space
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@99 127b21dd-08f5-0310-b4b7-95ae10353056
2005-07-16 20:13:48 +00:00
Giles Williams
329be0afc3 bumped version number so weeviloid2.oxp should work
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@98 127b21dd-08f5-0310-b4b7-95ae10353056
2005-07-12 14:11:10 +00:00
Giles Williams
45e086a0b0 loads player saved-game using fall-back XML loading of dictionary if necessary
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@97 127b21dd-08f5-0310-b4b7-95ae10353056
2005-07-09 23:20:30 +00:00
Giles Williams
6164cb8292 checks OXP requirements using fall-back XML loading of dictionary if necessary
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@96 127b21dd-08f5-0310-b4b7-95ae10353056
2005-07-09 23:13:23 +00:00
Giles Williams
32b0482738 oops #3, <false/> now not interpreted as being <true/> (Giles is red-faced)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@95 127b21dd-08f5-0310-b4b7-95ae10353056
2005-07-09 23:05:37 +00:00
Giles Williams
0700c2ff8a oops, forgot to include typedef struct for OOXMLElement
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@94 127b21dd-08f5-0310-b4b7-95ae10353056
2005-07-09 22:42:39 +00:00
Giles Williams
601d0a6359 fixed parsing of XML plists with empty array, dict or string tags (<array/>, <dict/>, <string/>)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@93 127b21dd-08f5-0310-b4b7-95ae10353056
2005-07-09 22:38:15 +00:00
Giles Williams
0693af0d5f Giles's attempt to break the XML parsing deadlock for Oolite-windows
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@92 127b21dd-08f5-0310-b4b7-95ae10353056
2005-07-09 22:00:55 +00:00
Giles Williams
451232e5f2 various changes from Mac OS X r862
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@91 127b21dd-08f5-0310-b4b7-95ae10353056
2005-07-09 21:51:47 +00:00
Giles Williams
b0be11f219 making stations non-frangible
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@90 127b21dd-08f5-0310-b4b7-95ae10353056
2005-07-06 08:50:56 +00:00
Giles Williams
31234b596f checks for zero vectors
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@89 127b21dd-08f5-0310-b4b7-95ae10353056
2005-07-06 08:42:38 +00:00
Giles Williams
2e1749658a music changes reducing differences with OSX
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@88 127b21dd-08f5-0310-b4b7-95ae10353056
2005-07-05 13:13:46 +00:00
Giles Williams
f04c6b8985 changes from OSX r850 **WARNING** Please check PlayerEntity.m is okay
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@87 127b21dd-08f5-0310-b4b7-95ae10353056
2005-07-05 11:59:46 +00:00
Dylan Smith
93f913a920 First fix on the string handling, second fix on the SDL load/save commander
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@86 127b21dd-08f5-0310-b4b7-95ae10353056
2005-07-02 21:07:10 +00:00
Dylan Smith
8ddac50605 Start on save commander gui
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@84 127b21dd-08f5-0310-b4b7-95ae10353056
2005-06-22 22:06:23 +00:00