Dylan Smith
|
da2be13ec0
|
merge OS X r1091 (v1.60)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@186 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-11-05 13:58:18 +00:00 |
|
Dylan Smith
|
04793e182c
|
all I can say is 'argh'
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@185 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-10-30 22:16:39 +00:00 |
|
Dylan Smith
|
0f60b7c59a
|
fix infinite loop in ResourceManager, bump version to -dev2
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@184 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-10-30 22:00:02 +00:00 |
|
Dylan Smith
|
bf067605d1
|
OS X r1058 changes merged
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@183 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-10-30 10:39:35 +00:00 |
|
Dylan Smith
|
c125a3249c
|
Fix joystick setup in paused mode
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@182 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-10-29 16:28:40 +00:00 |
|
Dylan Smith
|
b4f5331caf
|
Fix problem where no sticks are present, thrust axis assigned, keyboard can't be used for thurst
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@181 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-10-27 19:56:33 +00:00 |
|
Dylan Smith
|
eedcad4da0
|
Keypad arrow keys patch from <nix@esperi.org.uk>
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@180 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-10-27 19:46:47 +00:00 |
|
Dylan Smith
|
0cae338d5e
|
Add ScannerExtension
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@179 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-10-27 19:26:54 +00:00 |
|
Dylan Smith
|
3ca8cdc424
|
Merge to OS X r1046
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@178 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-10-27 19:26:25 +00:00 |
|
Dylan Smith
|
5ddeaf04f3
|
merge fixes for Universe.m
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@177 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-10-26 21:13:35 +00:00 |
|
Dylan Smith
|
2ffadff91b
|
kludge long string printing routine
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@176 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-10-26 20:51:48 +00:00 |
|
Dylan Smith
|
381a82f1a6
|
add WormholeEntity
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@175 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-10-26 20:21:09 +00:00 |
|
Dylan Smith
|
207a37d0bc
|
more merges
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@174 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-10-26 20:20:45 +00:00 |
|
Dylan Smith
|
ee7420e4df
|
Merge in OS X changes to r1036
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@172 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-10-25 20:15:27 +00:00 |
|
Dylan Smith
|
0f340723b9
|
bits that got missed from the merge
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@171 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-10-24 22:14:13 +00:00 |
|
Dylan Smith
|
6f818d4754
|
merge from OS X r1030
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@170 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-10-24 19:18:47 +00:00 |
|
Dylan Smith
|
96d0b83bc2
|
Resizable windows/fullscreen mode proper interaction
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@169 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-10-22 16:08:34 +00:00 |
|
Dylan Smith
|
dbe4e59555
|
Change AXIS_end etc. to MAX_AXES
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@168 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-10-15 11:47:40 +00:00 |
|
Dylan Smith
|
51ead43142
|
Fix crash where the main loop is blocked and the stick is vigorously waggled
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@167 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-10-15 11:38:26 +00:00 |
|
Dylan Smith
|
ae1d501ada
|
Grey out joystick mapper when no sticks are present
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@162 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-10-13 20:46:54 +00:00 |
|
Dylan Smith
|
b16b679121
|
Shift F2 menu items up a bit to prevent overlapping text during paused mode
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@161 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-10-13 20:44:09 +00:00 |
|
Dylan Smith
|
98b10f9e43
|
Merge with OS X rev 964 ready for 1.55-1
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@160 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-10-13 19:59:16 +00:00 |
|
Dylan Smith
|
d82a1feb93
|
Giles's fix for the AI race when ship role changes to police
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@158 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-10-11 19:32:06 +00:00 |
|
Dylan Smith
|
5af1584126
|
fix trumble header file
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@152 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-10-09 16:04:36 +00:00 |
|
Dylan Smith
|
a553a0c0d7
|
Add volume control
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@151 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-10-09 16:01:08 +00:00 |
|
Dylan Smith
|
e4f2b0de0f
|
Manual merge of special sauce for texture blurring from OS X
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@150 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-10-09 14:21:08 +00:00 |
|
Dylan Smith
|
c0f555fc37
|
merge with OS X r953
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@149 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-10-09 13:02:33 +00:00 |
|
Dylan Smith
|
4e82f111c2
|
add isPaused: method to SDLSound to prevent crash when requesting docking sequence
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@148 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-10-02 18:26:02 +00:00 |
|
Dylan Smith
|
653488e27e
|
Nerge missed plist files to OS X revision 932
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@147 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-10-02 14:36:08 +00:00 |
|
Dylan Smith
|
237dd7e2dc
|
Have a go at merging in interim 1.53 OS X changes
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@146 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-10-01 16:32:46 +00:00 |
|
Dylan Smith
|
4c5a76bf4d
|
update the text files
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@145 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-09-29 20:56:56 +00:00 |
|
Dylan Smith
|
57ed378a6f
|
add the roll/pitch precision mode toggle
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@144 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-09-28 21:19:30 +00:00 |
|
Dylan Smith
|
e421f6eb56
|
Allow keyboard arrow keys to override stick
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@143 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-09-28 20:20:46 +00:00 |
|
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 |
|