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

2398 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc
46896e81ed Oops! Added the missing TARGET_FOUND. & I should really stop tweaking this thing now! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2845 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-05 20:04:10 +00:00
Marc
cd8e1ac956 - tweaked thargoids a bit more! If they're too tough, we can tweak their AI yet again! 
- minor equipment.plist tidy-up.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2844 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-05 19:54:05 +00:00
Marc
0556a1e091 - attempted to get a slightly more challenging thargoid AI 
- added js function clock.addSeconds(time offset)
- code cleanup: another tweak to coastlines, some ship functions now return more meaningful values.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2843 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-05 18:18:25 +00:00
Nikos Barkas
8f8605804c Fixed detail level of miniature new planets to 0.8 to avoid small planets edginess in the F7 screen. Removed unused variable in OOJSShip.m. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2842 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-05 15:18:00 +00:00
Marc
f30120118b - finished cleaning up useless autorelease checks from rev2829 
- some tweaks to the sea/land boundary in the NEW_PLANETS code - more 'realistic' shallows colour, wider shallows.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2841 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-05 14:23:31 +00:00
Marc
f0f4ba65b5 Missiles bonanza (aka missiles part III): 
- some more refactoring done, some more to do.
- more accurate trade in value when buying a new ship.
- added the js function ship.fireMissile( [ missileRole:string ]). NPCs only. It either fires a (random) missile, or tries to fire the missile 'missileRole' if set. Returns the fired missile if successful, null otherwise.
- possible fix for berliOS Bug #16221 : Targeting enhancement regression.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2840 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-05 11:33:05 +00:00
Eric Walch
3cbb74bd7b Added a ship key: "missile_load_time". When defined it sets the minimum time it takes to load a new missile after one is fired. This prevents npc ships with many missiles to release them in one big wave. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2839 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-04 15:27:28 +00:00
Nikos Barkas
45605ef050 Added key_target_incoming_missile default ('T') in keyconfig.plist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2838 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-04 14:39:56 +00:00
Marc
ed4d1ee34b - added player.ship.compassMode read-only property 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2837 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-04 13:00:28 +00:00
Jens Ayton
5edeb4413e Let the Word go out unto the nations of the world: thou shalt not use default: cases in OOConstToString, lest -Wswitch-enum be stripped of its power. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2836 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-03 22:04:28 +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
44e20b85f0 - let's be nice to the old energy units. (They're there to import really old savegames without problems) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2834 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-03 14:59:42 +00:00
Marc
debff2da08 - more OOConstToString tidying up. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2833 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-03 13:59:13 +00:00
Nikos Barkas
514f6cb1f4 Fixed implicit function declaration warning. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2832 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-03 08:31:16 +00:00
Marc
1ed6d37364 - oops! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2831 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-03 07:21:16 +00:00
Marc
5e67cebe0d - removed JSStation compile warning in windows. 
- new function ship.selectNewMissile() returns a valid string ( missile identifier ).

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2830 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-03 07:16:31 +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
Eric Walch
b3467a8264 Added JS methods to stations: 
launchPolice, launchPatrol, launchMiner, launchScavenger, LaunchDefenseShip, launchShuttle
Added properties to stations:
dockedContractors, dockedPolice, dockedDefenders.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2828 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-02 20:32:54 +00:00
Marc
751d8c15e9 - tagged all GNUStep temporary compile fixes in rev2826 with '// NEW_PLANETS temp compile fix' 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2827 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-02 16:39:15 +00:00
Marc
2005eadc69 - fixed windows compiler warnings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2826 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-02 03:42:44 +00:00
Jens Ayton
60c27d03d2 Simplifications in planet texturificator. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2825 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-01 23:16:46 +00:00
Jens Ayton
9f47382e5d Polishing the beaches a bit more. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2824 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-01 23:05:54 +00:00
Jens Ayton
89424c71d4 Smoother coastlines, and a specular map for future e shader use. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2823 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-01 22:59:53 +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
Jens Ayton
c17d4a389e Replaced horrible oolite-unknown-ship with more conceptually boring but non-horrible version. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2821 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-01 21:27:31 +00:00
Marc
27c0709235 - refactored setUpShipFromDictionary in preparation for the new player missile code: a few bugfixes, plus a more robust implementation. 
- 20% of NPC missile types are now selected randomly, up from 10% beforehand. 
- regression fix: long range map now displays the right 'found planet' after save screen / computer restart.
- some code clean up.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2820 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-01 05:18:35 +00:00
Nikos Barkas
f5b4de349a Fixed new planets not rotating. Made cloak indicator on status light default to YES. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2819 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-30 21:03:16 +00:00
Jens Ayton
323c25b8ca New-planet miniatures don't mass lock, and do have the same texture noise seed as the full-sized planet. Colour parameters now match old model. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2818 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-30 20:48:38 +00:00
Jens Ayton
b7e0c8f7e5 Fixed build with old textured planets. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2817 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-30 20:02:16 +00:00
Jens Ayton
3730758ffd Improved description for subentities. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2816 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-30 19:57:52 +00:00
Jens Ayton
0f7507c0b3 New planets are now used for miniatures (but texture seed is wrong). NEW_PLANETS macro moved to PlanetEntity.h. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2815 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-30 19:56:42 +00:00
Darren Salt
f7cdd77ca8 More cleanup fallout. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2814 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-30 19:49:34 +00:00
Jens Ayton
0aaa11f0e0 Fixed build breakages. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2813 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-30 19:10:55 +00:00
Jens Ayton
1a870d3464 Fixed stray keystroke. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2812 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-30 19:09:17 +00:00
Jens Ayton
7fd8e9cdd6 JS properties now work for new planets, including setting texture (at any time). However, hasAtmosphere is always false. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2811 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-30 19:08:10 +00:00
Jens Ayton
2e936d6971 New console feature: last non-null, non-undefined result is stored in varaible $. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2810 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-30 14:37:52 +00:00
Nikos Barkas
d4ecb1f3e3 Removed reduntant entry in GNUmakefile. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2809 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-29 22:58:06 +00:00
Jens Ayton
02f35e944f Pay no attention to the sleepy man behind the curtain. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2808 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-29 22:09:23 +00:00
Jens Ayton
5ddbe997b1 New planets now have procedural diffuse maps. Unfortunately, the generator seems to hang from time to time. Incidentally, the log entries saying Dequeued generator <OOPlanetTextureGenerator 0x133d7bcf0>{{(null) -- failed}} are not an actual failure. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2807 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-29 21:57:57 +00:00
Nikos Barkas
b092420e51 Added default values for hud alpha, target sensitive reticle and cloak indicator on status light in hud-small.plist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2806 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-29 20:47:23 +00:00
Nikos Barkas
cba7d4f041 Enabled building with NEW_PLANETS defined on SDL builds. Fixed a warning in OOPlanetEntity.m. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2805 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-29 18:12:33 +00:00
Jens Ayton
b2724f7d40 LOD management and default texture for new planets. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2804 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-29 17:38:14 +00:00
Jens Ayton
7754f83cb7 Oops! That last commit wasn't really ready. Here's the rest of the fix, along with some half-baked new planet stuff (disabled with NEW_PLANETS in Universe.m). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2803 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-29 16:48:14 +00:00
Jens Ayton
8c15df6dbb Renamed SunEntity to OOSunEntity. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2802 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-29 16:44:23 +00:00
Nikos Barkas
8f9c581505 Fixed SDL build for the new planet drawables system. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2801 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-29 15:43:13 +00:00
Jens Ayton
b565b4bd67 Tweaks to Mac debug OXP stuff to deal with new HUD hiding mechanism and do more stuff through JS. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2800 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-29 14:57:16 +00:00
Jens Ayton
7dcf2df39c Basic but working new planet drawable. Can be tested on ships by enabling BALL_WORLD in ShipEntity.m. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2799 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-29 14:36:22 +00:00
Marc
fd7cd71011 - no more equipment breakages! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2798 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-29 08:10:26 +00:00
Marc
da4b70efa5 * missiles part II: no more quantum NPC missiles - they still use the same criteria as before, but they're created with the ship, instead of immediately before launch. 
* max_missile now applies to NPC ships too.
* fix: corrected a mistake affecting setEquipmentStatus.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2797 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-29 07:17:00 +00:00
Marc
eeabb77a87 - awardEquipment, removeEquipment, equipmentStatus, setEquipmentStatus now work on NPC ships too. 
- awardEquipment and removeEquipment now return true when successful.
- missileCapacity now works for NPCs, missiles capped at 32 for NPCs (player's cap unchanged at 16).
- code cleanup: potential crash & awardEquipment fixes.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2796 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-29 02:25:42 +00:00