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

536 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
Jens Ayton
5675e4a911 Ressurected worms (oops) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2789 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-28 14:03:04 +00:00
Nikos Barkas
101813d321 Fixed an error in shipdata.plist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2788 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-28 11:13:48 +00:00
Jens Ayton
531dcc10bc Cleaned up contours of various models using a mix of smoothing groups and normal tweaking, use materials rather than duplicate models for identical ships with different textures, deleted obsolete models, some like_shippage in shipdata. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2787 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-27 23:52:27 +00:00
Jens Ayton
76e3295f3a Set Asp's likely_cargo to 0, as its max_cargo is 0. While I was at it, cleaned up Asp's contours using smooth groups, and like_shipified its shipdata entry. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2785 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-27 15:18:54 +00:00
Marc
472b08f9af - fix: no more mission.runScreen flight related crashes. 
- more js missions cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2783 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-26 02:32:12 +00:00
Nikos Barkas
c2edf2238f Fixed a typo in whitelist.plist and removed references to methods removed in previous commit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2781 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-24 21:15:40 +00:00
Jens Ayton
9bbc3845c1 Fixed questionable use of release in launchIndependentShip:, and moved some trivial aliases of launchIndependentShip: into whitelist aliasing mechanism. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2780 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-24 18:37:41 +00:00
Marc
bf23119d18 - mission.setInstructionsKey fix (the global prefix implementation would not be able to tell which oxp it was called from) 
- yet another windows DEP fix. There's something inside OOJSScript that windows doesn't like.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2770 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-20 15:27:11 +00:00
Marc
3a92c0f7d1 - minor tweaks to missions, reworded one nova screen. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2762 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-19 02:31:04 +00:00
Marc
116d83f955 missionScreen RFC part III 
* yet more RFC bugfixes, there were quite a few not-quite-right bits, I _think_ I got all of them now...
* added titleKey as a mission.runScreen parameter, for use with missiontext.plist
* updated all internal missions to use the new mission API, some mission keys normalisation.
* fully tested & fixed both nova & trumbles missions.
* proper fix: no save when the sun is going nova!

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2759 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-18 21:58:32 +00:00
Marc
f7affbc01a MissionScreen RFC part II: 
* missionScreenOpportunity now fires up after loading a savegame & at startup, as well as after docking.
* fixed a mission callback related crash.
* fixed clash with fines and mission screens.
* name change for new mission.runScreen parameter shipModel: is now showModel.
* the foreground & background images now display correctly in relation to the spinning demo ship.

- code cleanup
- added missing keys to the shipdata entry schema


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2758 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-17 18:27:11 +00:00
Jens Ayton
31ae47c6f4 Fix for bogus is_template warning in verifier. Changed scanClass to scan_class in shipdata. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2755 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-16 23:53:13 +00:00
Marc
7bb627586f * New mission.setInstructions to go with mission.setInstructionsKey, analogous to the mission.addText / mission.addTextKey pair. 
* mission RFC part I. Initial implementation of the changes proposed in the forum. Will need tweaking.
* added new parameters to mission: title & foregroundImage (identical to backgroundImage atm)
* assorted code tidying up.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2750 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-15 00:24:23 +00:00
Eric Walch
9d963a50b1 - Limited wormhole size in nova systems. 
- Added scoop positions to all ships that can have fuel scoops.
- Raised asteroid and boulder density to 5. (To discourage boulder ramming)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2748 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-14 22:40:43 +00:00
Eric Walch
8119a48c8b - Corrected bug in the 2 second AI delay for station launches 
- Corrected escortAI.plist so it now follows their mother better after a station launch

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2741 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-14 13:19:26 +00:00
Eric Walch
d7c3922fba - Corrected delay in: sendAllShipsAway. 
- Corrected key for hostile messages in dockingClearance.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2740 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-12 21:25:32 +00:00
Jens Ayton
31a5c76622 sunSkimExitAI fixes: ATTACK_SHIP no longer tries to go to non-existent state HEAD_AWAY_FROM_PLANET on victory; it and FLEE instead go to a state that chooses between restarting and exiting based on current energy level. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2739 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-12 18:15:27 +00:00
Jens Ayton
d76d50eb1d minerAI now goes to FLEE rather than non-existing ATTACK_SHIP if attacked in DOCK_WITH_STATION. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2737 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-12 17:18:56 +00:00
Jens Ayton
bd634a4237 Excluded BEHAVIOUR_ATTACK_MINING_TARGET from hasHostileTarget. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2736 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-12 16:23:01 +00:00
Jens Ayton
578a0f351f AI graphing now handles setAITo: and switchAITo:. TODO: handle returns from setAITo: and hyperspace. Also removed some redundant AI states/handers. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2735 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-12 12:09:54 +00:00
Jens Ayton
07902c2b70 Whitelisted setPrimaryRole: for AIs, and made setStateTo: a normal method. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2734 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-11 15:24:34 +00:00
Eric Walch
fd2789fa7a Added two new properties to ship: 
* maxThrust  (read-only)
* thrust (read/write for npc, read-only for player and clamped between 0 and maxThrust)
Fixed bug with ships flying out of range when attacking with rear military laser.
Changed miner and scavenger AI to not get lost when flying out of a station scanner range.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2726 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-07 11:21:04 +00:00
Nikos Barkas
bde26b04df Fixed incorrect display of distance and time on Advanced Navigational Array when unreachable systems were targeted. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2725 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-06 16:32:58 +00:00
Marc
03a1728895 - Applied pv4's patch to trunk, with modifications. 
* ship.target = null now works as expected.
* adding trumbles to a ship has now got variable chance of working, depending on how many trumbles are already on board. Always works with 0 or very few trumbles.
- more cleanup: removed a windows compile warning, added a possible freeBSD bugfix, updated a js comment & autoindented Universe.m

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2720 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-04 20:57:11 +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
Eric Walch
d80f8a1bfd Added a AI command "setThrustFactorTo:" Re-added the group feature for missiles with Thargoid scanclass after having seen some friendly fire going on between a thargoid and a tharglet. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2713 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-27 17:27:33 +00:00
Nikos Barkas
84800c9134 Allow break pattern model to be specified externally. This works similar to the docking clearance: The default is set in the 'universal' section of planetinfo.plist under the 'default_breakpattern_model' key and is used for both hyperspace and docking pattern. Docking pattern can be overriden for each station by setting the key 'docking_pattern_model' in its shipdata. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2684 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-20 20:28:12 +00:00
Marc
228ae5a9f5 - change: hyperspace tunnel colour now scriptable from inside planetinfo.plist 
- comment cleanup inside constrictor hunt.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2681 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-18 19:30:31 +00:00
Nikos Barkas
48416ff810 Committed Svengali's converted-to-OpenStep-format plists. Now all core resources property lists should be in OpenStep format. Added Svengali to contributors list. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2675 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-16 16:05:12 +00:00