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

2256 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jens Ayton
ae974039d2 Eliminated deprecated -cString method (again). Mac JS console now works in 64-bit mode. Unfortunately, this requires using different versions of RBSplitView for different architectures, since the 64-bit-compatible version doesn't work with Tiger. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2795 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-28 23:59:00 +00:00
Jens Ayton
9c076a03ab Basic-debug.oxp can now be built with a makefile in DebugOXP/, instead of being build in tools/simpleDebugConsole by the Xcode project. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2794 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-28 14:41:50 +00:00
Jens Ayton
b3f7f8508a Tidying up in project directory. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2793 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-28 14:25:17 +00:00
Jens Ayton
878f382106 Split suns out into a separate SunEntity class. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2792 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-28 14:17:57 +00:00
Jens Ayton
6edfa48452 Xcode project updates for removed models. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2790 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-28 14:07:27 +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
b346df7716 Fixed debug flags in master copy of oolite-debug-console.js. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2786 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-27 15:21:14 +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
35ac82cd5d - mission screens now work in flight (they don't show model: while in flight yet) keys 1 to 4 will leave the mission screen, as before. 
- better handling of unexpected runScreen values.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2784 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-26 16:02:59 +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
Marc
7d870400f1 - mission screen fixes for game restart/reload after game over. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2782 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-25 18:51:59 +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
Eric Walch
e19ffb204e The JS command launchShipWithRole() now returns the entity that will launch. (or nil) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2778 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-23 22:29:45 +00:00
Nikos Barkas
68f9495131 Added the JS station method launchShipWithRole('shipRole'). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2777 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-23 09:08:25 +00:00
Jens Ayton
766258664e Expanding descriptions containing [credits_number] now yeilds a precise value with exactly one decimal point. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2776 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-22 16:13:34 +00:00
Jens Ayton
1df30db2aa Fixed bug where name key in dictionary-form texture specifiers was ignored. Planet geometry thing can now generated DATs in an unwrapped mode to help verify texture mapping - wish I'd thought of that eariler. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2775 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-21 17:41:35 +00:00
Jens Ayton
c468eddf24 Planet mesh generator: now correctly wraps textures on all seam triangles. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2774 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-21 16:50:16 +00:00
Marc
9de6d2a726 - aargh fix! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2773 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-21 02:37:00 +00:00
Marc
84c6ee6694 The last mission fun before the weekend! 
- fix: mission.runScreen is now disabled before game starts (i.e. during demo screens).
- change: mission.runScreen({message'blah'}) is now shorthand for mission.runScreen({message'blah'},null). Similarly, mission.runScreen() is now shorthand for the admittedly not very useful mission.runScreen({},null)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2772 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-20 20:52:12 +00:00
Nikos Barkas
9f90463e66 Eliminated a 'control reaches end of non-void function' warning. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2771 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-20 17:23:09 +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
Jens Ayton
f8cba46d16 Removed obsolete files and test data accidentally included in r2767. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2768 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-20 15:22:50 +00:00
Jens Ayton
c8445aeb9e Work on offline generation of data arrays for new planets. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2767 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-20 14:49:24 +00:00
getafix
ba30324d99 Corrected erroneous SVGDumpAppendBaseContour macro definition. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2766 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-20 13:37:41 +00:00
Marc
195d285eec - fix: mission screens without either title or titleKey are displayed again, including mission.runScreen({}, null); 
- fix: enabled running new mission screens from inside mission screen callbacks.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2765 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-20 02:51:53 +00:00
Marc
1f7f3c654c - slightly better handling of case insensitive manifest properties (less indiscriminate, anyway) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2764 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-19 11:17:40 +00:00
Marc
1731365c11 Yet some more mission fixes 
- ensure the callback function is called just the once.
- mission.choice is now wiped quietly before running the callback function. the callback argument still reflects the pre-wipe mission.choice


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2763 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-19 05:56:49 +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
9ee6b481c4 - manifest['foo'] is now case insensitive:manifest['food'] = manifest['Food'] = manifest['FOOD'] 
- corrected a last-minute snafu with mission screen callbacks & status screen. Should stop doing this when sleepy!

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2761 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-19 00:53:07 +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
388c3bff90 Moved some documentation hidden in the depths of src/ into a Doc/, to increase the chance of someone noticing them. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2756 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-17 00:05:49 +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
Jens Ayton
08747ab817 Added scan_class to shipdataEntrySchema.plist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2754 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-16 21:25:20 +00:00
Nikos Barkas
5bc4a8c647 Mouse control can now be enabled also in a window by setting the super secret key 'mouse-control-in-windowed-mode' to YES in the preferences file. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2752 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-15 12:07:59 +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
Nikos Barkas
59baa235ce HUD hiding is no more a debug flag, but a proper feature. While in pause, 'o' toggles it on/off. Added visibility of HUD hidenness to scripts via the player.ship.hudHidden read/write boolean property. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2749 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-15 00:12:09 +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
Nikos Barkas
e1c1924e9e Build configuration changes to align the SDL builds with the Mac equivalents. Added the pkg-win-deployment configuration for stable releases. The deployment settings are forced, while the test release ones are adjustable. Tested successfully on Windows for the test releae, deployment, snapshot and debug configurations. Linux testing still needed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2746 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-14 16:18:23 +00:00