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

1944 Commits

Author SHA1 Message Date
Marc
45f1c6dfd0 AddShips Part II: 
* fix: withinRadius now works properly
* fix: traders & pirate ships witchspacing in are now set according to system populator defaults ( cargo, routes, and bounty overrides ).
* fix/change: traders and pirates now deploy a different number of escorts depending on the system government type.

- fix: create the right type of flotsam when a ship explodes.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2892 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-17 21:36:25 +00:00
Jens Ayton
c2f3758b2b Added extra paranoid code to avoid ships targetting temselves. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2891 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-17 15:05:10 +00:00
Jens Ayton
ca8bdfa70e Return values and semicolons for all! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2890 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-17 07:33:10 +00:00
Marc
b6826f47bc AddShips Part I: 
* new js methods added system.addShips(), system.addGroup(), system.addShipsToRoute(), system.addGroupToRoute() if a ship is created near the witchpoint, it gets the witchspace rings, and its status is STATUS_LAUNCHING, otherwise it's STATUS_IN_FLIGHT, and no witchspace effect.
* tentatively fixed berlios bug #14626: 'AI is initialised twice since 1.71'
when entities are added to the universe, the AI state is set to GLOBAL only once after their ID is set. Seems to work.

- reworked witchpoint buoy to use multiple colour flashers.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2888 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-17 06:25:41 +00:00
Jens Ayton
0acbfc4d64 Planet generator cleanup, disabled size.dump messages. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2887 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-16 16:33:25 +00:00
Marc
4d9f8efb44 - Planet textures: corrected wrapping method for latitude, minor code cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2886 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-16 15:05:36 +00:00
Nikos Barkas
d417f6390b Fix for planet textures generation. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2885 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-16 01:21:27 +00:00
Jens Ayton
c4cad73d63 Made planet texture generator several times faster. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2884 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-16 00:10:27 +00:00
Jens Ayton
044ae93959 Planet normal mapping is now disabled as intended in simple shader mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2883 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-15 21:45:46 +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
Jens Ayton
1c0251db3a Normal mapping for generated planets (full shader mode only). Normal/baked shadow intensity is now consistent when changing planet texture size. Switched to 1024x1024 except for reduced detail mode. NB: texture debug dump requires new methods which aren't implemented for SDL, but is switched off. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2881 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-13 12:35:42 +00:00
Eric Walch
cb41cf425d - Changed the default "defense_ship_role" of rock-stations from "police" to "hermit-ship". 
- Added a boolean parameter to the JS command: launchShipWithRole(role : String [, abortAllDockings : boolean]) : shipEntity

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2880 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-12 21:31:32 +00:00
Jens Ayton
f3fb4e8c34 Planet shader now handles lighting and specular mapping (and light mapping, but no light maps are generated yet). Known issue: terminator is distorted near poles. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2879 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-12 19:10:55 +00:00
Eric Walch
79a6b2f2ab Exposed equivalentTechLevel as JS property of station. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2878 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-12 13:08:23 +00:00
Nikos Barkas
327604ec27 Fixed a copy-paste/typo from previous commit that resulted in weird graphics. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2877 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-11 22:17:11 +00:00
Jens Ayton
a117d690f3 Remove missing texture warning for texture we never wanted to exist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2876 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-11 20:58:54 +00:00
Jens Ayton
94d2abe004 Fixed atmosphere z-fighting. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2875 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-11 20:32:12 +00:00
Jens Ayton
4ce853942b Cleaned up aspect ratio definition. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2874 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-11 19:02:07 +00:00
Marc
4938c910b9 - noise generator can now be used for different aspect ratios! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2873 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-11 12:40:53 +00:00
Marc
29eabd4bad - property name change: manifest.list[n].commodityName changed to manifest.list[n].displayName, to make it more consistent with other js properties. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2872 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-10 23:25:28 +00:00
Jens Ayton
8a4c33aff7 Fixed bug where ambient light level was multiplied with itself in default shader. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2871 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-10 17:45:54 +00:00
Nikos Barkas
34a539f0e9 Made the read-only station property equipmentPriceFactor accessible from JS. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2870 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-10 10:30:06 +00:00
Marc
1948975216 - minor code tidying. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2869 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-10 00:54:48 +00:00
Marc
8550e01317 - OOCloudTextureGenerator, first draft 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2867 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-10 00:35:09 +00:00
Marc
ec727b5ded - fix: awardContract quantities now checked properly 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2866 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-09 19:55:13 +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
Marc
40db3dbfb3 - remove damaged equipment when awarding undamaged - even in legacy scripts. 
- make sure multicolour flashers switch at the right time.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2864 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-08 21:23:54 +00:00
Marc
a180c2356c - tweak to rev 2859, and removed a windows compile warning. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2863 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-08 16:36:00 +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
Jens Ayton
41f5d03697 Rudimentary planet shader (disabled with SHADY_PLANETS macro in OOPlanetEntity.m; texture mapping only, no lighting, but with per-pixel calculation of longitude component to completely eliminate distortion. Interacts badly with mip-mapping, though.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2860 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-07 22:42:23 +00:00
Eric Walch
8afb80c43c - Ship put in the launch queue now have the correct status: STATUS_DOCKED. 
- Lowered the aft_eject_position of the boa_mk2 by 3 meters to avoid collision with escape pod.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2859 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-07 21:41:44 +00:00
Marc
6ed5aae5c9 Code tweaks: 
* refactored patrol spawning code!
- marginally faster implementation of multicoloured flashers.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2858 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-07 20:15:05 +00:00
Jens Ayton
1e2e56b4b1 NEW_PLANETS now applies to scripted planets. If NEW_PLANETS, the old PlanetEntity and TextureStore are now completely excluded. Most of the kludges for dealing with both types of planet are gone. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2857 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-07 18:43:48 +00:00
Marc
8ed106d12f - implemented multicolour flashers: see Feature Request #4469 - Flasher colour changes 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2856 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-07 16:09:42 +00:00
Marc
cd8eeb454b - fix: berlios Bug #16404 : turrets give error with shipBeingAttacked. 
Now 'whom' is set correctly when a ship is hit by turrets' plasma fire.
- fix: shipBeingAttacked should only fire once now.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2855 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-07 13:14:04 +00:00
Jens Ayton
447a1f87ef shipSpawned() event is now echoed to world scripts as shipSpawned(ship). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2852 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-06 18:47:46 +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
Jens Ayton
9e69f069ac Added missile_load_time to shipdataEntrySchema. Cleaned up planet miniature LOD stuff. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2846 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-05 20:39:24 +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
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