Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,203 Commits 1 Branch 0 Tags
Commit Graph

157 Commits

Author SHA1 Message Date
Nikos Barkas
03108fa0a8 Use correct override for getting the joystick name from the OOSDLJoystickManager. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3881 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-18 18:58:25 +00:00
Jens Ayton
858d1e2c4a Fixed non-Mac builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3880 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-18 18:25:24 +00:00
Jens Ayton
5bf81d659d Joystick code cleanup 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3877 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-18 18:16:44 +00:00
Nikos Barkas
d4e3c9ae71 Removed confusing comment from previous commit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3876 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-18 16:51:30 +00:00
Nikos Barkas
12c8892bfc Fixed SDL builds breakage. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3875 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-18 16:49:30 +00:00
Jens Ayton
3a463348bb Joystick refactoring. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3870 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-18 14:56:39 +00:00
Jens Ayton
3c4a8b3835 Preparing to merge in contributed Mac OS X joystick support. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3869 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-18 14:14:13 +00:00
Nikos Barkas
e14168201a Enabled ability to take snapshot using joystick button assignment. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3844 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-11 21:44:29 +00:00
Marc
0b5d26459e - hopefully last compile warning correction, for macs this time... 
- for named snapshots, i.e. takeSnapShot('foo'), if the file foo.png already exists, the snapshot will be saved as foo-001.png, etc...
- tiny code cleanup!

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3828 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-11-19 01:32:29 +00:00
Nikos Barkas
c06ef0ba0e Implemented the global JS method takeSnapShot. Takes optional filename as parameter. If filename exists, standard auto-naming snapshot is used to avoid overwrite. The snapshot method now returns boolean. Mac devs, please test. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3823 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-11-18 16:26:30 +00:00
Nikos Barkas
6e07a6d055 Double click for escape pod should now work also on the assigned joystick button. Fixed problem where first escape pod key press would reset all key states. Now only the keystate of the escape pod key is reset. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3808 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-11-13 19:03:05 +00:00
Marc
ec4a512194 * Primable equipment! Use shift-n to select, and n to activate the equipment. 
- New primed equipment key in savegames.
- Equipment scripts only respond to the activate event.
- Equipment scripts have access to this.equipmentKey, which contains the equipment type the script is associated to (e.g. 'EQ_WHATEVER')
* More commsMessage stuff:
- new parameter: ship.commsMessage(message [, toShip]) the second - optional - parameter now allows for narrowcast, as opposed to generic broadcast within scanner range - in crowded systems it's faster to narrowcast to a couple of ships, than to just broadcast the message to all ships in range!
- commsMessageReceived event: the ship sending the message is now passed as a second parameter to the event handler.
* new equipmentInfo property: scriptName
* new ship property: isPiloted
* assorted code cleanup...

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3799 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-11-10 21:49:23 +00:00
Nikos Barkas
8f6c69079f Weapons online/offline toggle control can now be assigned to joystick button too. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3776 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-10-22 22:30:09 +00:00
getafix
638a4f11f3 Fixed joystick BUG #17482 (trunk & maintenance) 
Fixed joystick BUG #17490 (trunk & maintenance)
setFunctionForAxis minor code cleanup (trunk & maintenance)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3751 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-09-13 00:46:36 +00:00
Jens Ayton
8328dd8101 Cleaned up some copyright notices by special request. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3668 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-14 17:01:24 +00:00
Marc
2448a4f38f - OK, now all copyright notices inside the code should be up to date! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3654 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-03 18:45:37 +00:00
Nikos Barkas
33cec98628 Enabled use of keys Insert, End, PageUp and PageDown. Mac testing needed to confirm that I have not destroyed anything. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3641 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-29 19:09:55 +00:00
Jens Ayton
44596f8334 Added pseudo-root exception handler for GNUstep. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3605 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-25 21:40:23 +00:00
Jens Ayton
a82027061c Fixed check for shift key on startup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3363 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-16 21:04:30 +00:00
getafix
8ea9526f24 Fixed Linux build error following to PNG snapshot save update. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3317 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-11 15:36:43 +00:00
Nikos Barkas
d67bc4dbd5 Added capability to save snapshots in PNG format to the SDL builds. The code is based on http://encelo.netsons.org/programming/sdl. Snapshots format can be set at compile time to either BMP or PNG, default is now PNG. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3316 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-10 22:19:49 +00:00
Jens Ayton
ca362e50cb Rewrote screen shot log message in English. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3288 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-05 13:42:37 +00:00
Marc
b4f537f4b5 - mac menu part II, only show Screenshots & OXP directories (& previous log) if we have got anything to show. Reworked the AddOns directory preference, as agreed. 
- 3284 redux: Kilos/grams handled properly when carrying specialCargo, simpler code.
- some minor cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3286 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-05 00:33:16 +00:00
Marc
55055ff04b * NPC ships: 
- new & improved aft plasma cannons.
  - own cloaking device is now affected equally by aft & front weapons.
  - OXP backward compatibility: non-equipment NPC missiles should now work as per 1.65-1.73.4.
* equipment: corrected strict_mode_only / strict_mode_compatible logic muddle.
* windows splash screen: minor code cleanup.
* minor ShipEntity code cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3225 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-26 08:04:11 +00:00
Nikos Barkas
065f29b4ae Remove unused variables warnings from SDL builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3173 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-17 12:28:38 +00:00
Jens Ayton
f1e5e1d19a Moved platform-independent OpenGL setup code into GameController instead of duplicating it. Enabled GL_SEPARATE_SPECULAR_COLOR, making specular highlights reasonably consistent between default shader and non-shader mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3172 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-17 11:06:34 +00:00
Nikos Barkas
2dc0546f2a Fixed broken compile on SDL builds. Added the -dumpGrayAlphaToFileNamed: method for the SDL builds. NOTE: I have no test case to verify that the mask used in SDL_CreateRGBSurfaceFrom is correct. Further testing will be necessary for this. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3135 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-09 20:29:21 +00:00
Nikos Barkas
9268242616 Fixed a bug that would allow only square splash screens to be used on SDL builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3027 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-14 17:48:28 +00:00
Nikos Barkas
8d5ac14ce9 Synchronized sun_position in SDL's MyOpenGLView.m with that of the Cocoa's one. Fixed a probable copy/paste error in the OOSunEntity's -getSpecularComponents: method. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2965 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-12 07:08:46 +00:00
Jens Ayton
ca61fb9709 Hermite interpolation for less awful planet normal maps. All-zero alpha channels are now also ignored by debug dumper. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2897 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-20 19:41:20 +00:00
Jens Ayton
dcec57192f Texture mipmap dump now uses game view dump functions; RGBA dump only dumps alpha channel if it's non-trivial. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2896 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-20 13:46:40 +00:00
Nikos Barkas
c9edd02c97 Added the new dump texture methods to the SDL builds (there is room for improvement, lots of same code used over and over, but I left it as is for compatibility with the Mac equivalents). Removed no newline at end of file warning. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2882 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-13 16:48:39 +00:00
Marc
f2e2654786 - New planets atmosphere I: dump the older generated atmosphere to file. 
- Alpha is converted to black for windows & linux file dumps.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2865 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-09 17:31:13 +00:00
Darren Salt
0e6d6cb806 Recognise the Enter key. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2861 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-08 11:31:00 +00:00
Marc
a0e931da94 -oops 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2851 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-06 18:05:05 +00:00
Marc
27d347ad8d - old and new planet texture dumps now dependent on the same debug flag. 
- defaultManager currentDirectoryPath isn't changed anymore  when writing planet textures to disk, to avoid possible file load failures elsewhere in the code.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2850 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-06 17:42:36 +00:00
Marc
1324ee0765 - code cleanup: referenced external libraries headers using <foo.h> instead of "foo.h" (part of BerliOS Feature Request #1305 - SDL code tidyup. 
- all texture genning temp logs start with ;planetTex.temp' now, and added log entry when saving generated textures.
- SDL builds now save generated texture files next to the snapshots (SDL default: ./oolite-saves/snapshots)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2849 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-06 14:42:23 +00:00
Nikos Barkas
0182572e90 Implemented -dumpRGBAToFileNamed: for the SDL builds. Saves a .bmp planet texture file at the directory where Oolite is run from. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2847 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-05 22:47:02 +00:00
Marc
8731d87464 - fix: refactored thargoids were using various 'EQ_MISSILES' instead of thargons - now they use thargons again! - 'thargon' is now a thargoid-only piece of equipment. Equipment name kept the same as pre-exisiting thargon role for backward compatibility. 
- fix: no more occasional 'ident system locked onto(null)' on game restart.
- code cleanup: replaced all (deprecated) cStrings inside the GNUStep code with UTF8String.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2835 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-03 19:46:42 +00:00
Marc
06e888c5a0 - fixed inconsistency between system.sun.goneNova & system.info.sun_gone_nova 
- corrected one more planet related GNUStep compile warning.
- added player.ship.compassTarget (read-only) and the event  compassTargetChanged (entity: target, compassMode:string).
- added some checks before various autoreleases.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2829 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-03 04:57:08 +00:00
Jens Ayton
363e33d209 Synthesized planet textures now exactly match old style (sans colourful atmospheres). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2822 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-01 22:01:20 +00:00
Gary Wong
7784ba69fe Fixed silly arithmetic error (causing incorrect x_offset on wide 
aspect ratios) in rev 2719.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2722 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-05 03:35:09 +00:00
Gary Wong
b5315d49e8 Added "x_origin" and "y_origin" keys to HUD dictionaries, to allow 
HUDs to specify dial and legend positions with respect to arbitrary
parts of the screen.

Modified the default HUD to use "y_origin" so that the appropriate
parts of the display are aligned with the screen bottom, for any
aspect ratio.

(Co-ordinate #defines in HeadUpDisplay.h have NOT yet been updated, for
compatibility with any custom HUDs which might rely on them.)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2719 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-03 17:36:18 +00:00
Darren Salt
1293ecf3d2 Allow use of # (UK keyboards). Keycode is 126. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2714 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-27 23:27:03 +00:00
Nikos Barkas
c056dd64b4 SDL builds: Fixed incorrect behaviour of '[' and ']' keys. Added support for the semicolon and quote keys. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2712 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-26 18:17:01 +00:00
Nikos Barkas
294957bb35 Cleared an unused variable warning under Windows. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2711 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-26 17:25:53 +00:00
Darren Salt
1028ece70c Fix a logic error in full-screen mode enumeration. 
The mode should only not be listed when its dimensions exactly match those of
the previous mode.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2709 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-26 16:15:11 +00:00
Darren Salt
86804635ec [SDL] Force the full-screen option to "no" if we couldn't get a suitable mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2703 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-25 12:23:50 +00:00
Darren Salt
9fa8558eb4 Cope with failure to set a full-screen mode. 
libsdl1.2debian 1.2.13-5 has a patch which enables xrandr.
However, this patch causes oolite to segfault on selecting full-screen mode.
This can be worked around by setting SDL_VIDEO_X11_XRANDR=0.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2699 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-24 23:29:38 +00:00
Nikos Barkas
49e2fe394e A couple of small fixes with game window set up on Windows. A 800x600 setting will actually generate a 800x600 game window (was creating 792x573 previously). This is consistent with previous Oolite versions. As a byproduct of this, oolite.gameSettings.gameWindow.width/height returns correct values also when used in the this.startUp event handler. Test on Linux may be required. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2696 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-24 21:04:49 +00:00