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

2359 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Walch
b14dae24b3 - Defining a null value for EquipmentInfo.effectiveTechLevel will now delete the corresponding missionVariable 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2907 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-24 09:28:37 +00:00
Marc
c010a69056 - Pause now works when docked. If paused when docked, no options are available. Added new translation string "game-paused-docked". 
- Added 3 javascript properties to ships: isCargo, isDerelict and isRock (the last one identifies both asteroids and rock hermits)
- Tidying up!

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2906 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-23 23:00:53 +00:00
Marc
f158db818f - Apart from the main stations, which are still spawned with STATUS_ACTIVE, all other stations are now spawned with STATUS_IN_FLIGHT. Should fix some breakages. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2905 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-23 03:40:49 +00:00
Marc
994d1d55be - fix for shipSpawned not firing for carriers. 
- some code cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2904 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-22 18:50:45 +00:00
Eric Walch
85d744bb52 The eventhandler: "stationLaunchedShip" now also fires for a player launch and not only for NPC launches. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2903 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-21 16:50:43 +00:00
Marc
280b4841ef - re-fixed a major texture cache bug. Please do not un-fix. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2902 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-21 09:51:38 +00:00
Marc
0d7b80a16e - fix to the number of patrol ships, and to witchspace exit behaviour, some code cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2901 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-21 09:24:10 +00:00
Marc
6120ef9a47 - js timer cleanup: timers are now stopped and removed if the first ('this') parameter in the constructor goes out of scope: 
new Timer(this, this.testTimer, 10, 10);


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2900 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-21 08:36:01 +00:00
Marc
12f80f1a09 - fix for 'this' related bug inside system.filteredEntities() this bug is (erroneously!) referred to on BerliOS as bug #16439: FilteredSystems() and this. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2899 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-21 07:42:00 +00:00
Jens Ayton
6242315548 Planet textures are now cached properly. Planet generators are now run speculatively when a planet is selected on the chart and twice during hyperjumps (at the beginning and end of the countdown), with rate limiting. The redundancy is OK because the cache will catch it. Also, new planets seem to be stable now so I'm leaving them turned on. Merry Christmas, nightly users. ;-) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2898 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-20 20:08:43 +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
Jens Ayton
8cbe7cde2b Tweak to make profiling stopwatch more reusable. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2895 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-19 22:22:51 +00:00
Eric Walch
e596e6ae90 Corrected ship status for ships entering from witchspace to STATUS_EXITING_WITCHSPACE / STATUS_IN_FLIGHT 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2894 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-19 17:17:16 +00:00
Jens Ayton
bf5ee3b2ce Reintroduced all models removed in r2787 (except exhaust.dat) based on the cleaned-up base ships. These models are now unused in Oolite, but some are referenced by OXPs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2893 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-17 22:10:12 +00:00
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
7c2a544db2 - oops! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2889 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-17 06:31:40 +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
44df4a0f56 - oops! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2868 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-10 00:38:24 +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