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

1982 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc
b62fd002fe * tentatively added new shipRemoved(Bool removeDeathActions) event. 
* refactored initWithGameView and reinitAndShowDemo

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2341 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-30 22:20:46 +00:00
Darren Salt
9a25bab0d2 Bump .deb version number. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2340 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-30 20:01:47 +00:00
Nikos Barkas
d16df89a18 Separated the code for abandoning ship in a stand alone method, namely abandonShip. Took opportunity to create the abandonShip() JavaScript method, which launches all escape pods of a vessel, if this is achievable. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2339 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-30 16:17:41 +00:00
Nikos Barkas
d32100d617 Restored changelog that was accidentally overwritten by a wrong version. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2338 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-30 15:18:32 +00:00
Nikos Barkas
6bb49554d3 Fixed incorrect counting of cargo when docked, which partially resulted in misbehaviour of -availableCargoSpace. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2336 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-30 14:53:29 +00:00
Jens Ayton
3c10a9b2be Bumped version number. Changed Mac system requirement to 10.4, and cleaned up target configuration in preparation for 64-bit support. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2335 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-30 14:49:03 +00:00
Marc
6f4b6a87d9 * ported command-H bugfix to maintenance 
* extension to Ship.remove() method: remove() (& remove(false)) still performs a ship's death actions, but now remove(true) makes the ship vanish without triggering any of its death actions.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2334 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-30 12:32:56 +00:00
Marc
5c24faf64c fix for bug #16188 - command-H breaks menu screens. Breakage fixed, plus added a check to stop Oolite from reacting to command-H. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2333 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-30 11:25:02 +00:00
Jens Ayton
6aaf7a1e75 Committed unspeakable necromancy on the graveyard of the repository. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2331 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-29 23:09:22 +00:00
Jens Ayton
999fe7e969 Trying to convince svn that this deleted directory is really deleted. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2330 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-29 22:50:59 +00:00
Jens Ayton
50e19e1a68 Attempted fix for aegis-tracking crash. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2329 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-29 22:20:06 +00:00
Jens Ayton
a4823f6ef7 Update log tweaking fun time: added some of Marc's suggestions, moved OXP stuff that isn't scripting to its own section, removed note about questionable throw_sparks feature. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2324 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-29 19:14:48 +00:00
Nikos Barkas
1375026ef6 Recomitting changelog, with Jens' additional corrections. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2323 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-29 17:43:59 +00:00
Nikos Barkas
1cfb23f45b Updated changelog file with changes between 1.72.2 and 1.73, as written by Eric. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2322 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-29 17:38:29 +00:00
Jens Ayton
efca253270 Last-minute change: changing misspelled event handler playerTargettedMissile() to playerTargetedMissile(), and related spelling fixes in code. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2321 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-29 17:05:36 +00:00
Marc
ce6b8d3c21 * Better audio feedback for equipment purchases. Corrected a regression bug. 
* Whitespaces cleanup

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2320 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-29 14:35:22 +00:00
Nikos Barkas
8daffbadfb Added the general changelog file in the documentation folder (changes for 1.73 need to be inserted). Modified the Windows installer script so that the changelog gets installed in the root Oolite folder for official builds. The changelog does not get installed for the snapshots. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2319 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-29 11:53:00 +00:00
Marc
fe6582aebe * load/save game screens - some interface bugfixes 
* corrected out of date comment

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2318 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-28 23:08:25 +00:00
Jens Ayton
383c8e944e Whitespace cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2317 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-27 11:20:37 +00:00
Jens Ayton
7a51d3a779 Fixed crash when reporting errors in JavaScript timers. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2316 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-27 11:18:22 +00:00
Marc
33ec698a6b fix: js timers should now stop automatically if the object they're attached to goes out of scope. This should stop some types of CTDs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2315 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-26 23:55:39 +00:00
Marc
08ce4d17ca equipment screen fixes: 
* better handling of playerBoughtEquipment 
  - it was firing even when purchase failed due to lack of credits
  - any equipment market change inside the event is now displayed immediately
* eliminated spurious description when going back to the first page

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2314 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-26 20:28:59 +00:00
Marc
dd0b05dca4 * the system override texture_hsb_color is now applied more consistently, and applied immediately to texturised main planets. 
* setTexture() & system.info.texture = 'blah' fully enabled when procedural textures are on, restricted otherwise (details on wiki). Improved setTexture() error logging.
* tentative fix for rare bug: NPC ships dying while processing player events

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2313 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-25 14:51:18 +00:00
Marc
1bc7ec5968 * fixed textures mismatch when restarting in strict mode. 
* fix: if no external views are defined, the cobra3 ones are used instead.
* fix: vertically re-centred game menus.
* reworded 'abs' warnings, minor tweaks.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2312 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-25 08:38:52 +00:00
Nikos Barkas
49d99b39db Minor corrections in the OoliteReadMe, as noted by Kaks. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2311 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-25 07:47:41 +00:00
Jens Ayton
28a62c0c9b Enabled TARGET_INCOMING_MISSILES for OS X. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2310 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-24 19:17:26 +00:00
Darren Salt
bece33affc Remove some pointless executable flags & correct/add some MIME types. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2309 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-23 20:54:04 +00:00
Jens Ayton
9781d2b9d1 Fixed possible but unlikely cause of crashes in JavaScript error handling, and improved log message classes for JS errors (symbolic names instead of magic numbers). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2308 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-23 20:49:25 +00:00
Jens Ayton
e6cc186157 Fixed sporadic crash when people disobeyed my explicit instructions and called runLegacyShipActions() *even though I told them it would cause their extremities to fall off and their blood to run hot with lead*. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2307 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-23 20:40:17 +00:00
Jens Ayton
0dc704c26d Removed (optional) installation of Smart Crash Reports in Mac test release builds - it's just too evil. SCR will still be used if it's installed (usage is passive). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2306 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-23 16:51:42 +00:00
Jens Ayton
99e5466907 Disabled textured planets for Mac OS X due to crashosity. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2305 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-23 16:27:57 +00:00
Jens Ayton
6a9c1ff4e8 Updated whitelisting mechanism to allow both world script actions and AI actions in the following script types: ship actions (called through JS ship.runLegacyShipActions), rescued character scripts, scriptActionOnTarget:/safeScriptActionOnTarget:. System script_actions are restricted to world script actions. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2304 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-23 16:16:54 +00:00
cmdrjames
ecbf080229 Non-functional: Fix a spelling mistake 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2303 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-23 14:59:08 +00:00
Nikos Barkas
e878f37f69 Added the Acrobat PDF and MSWord versions of the proposed common OoliteReadMe in the documentation. Modified Windows installer script to create shortcut for the PDF instead of the txt version of the OoliteReadMe and to create a shortcut for Advice for New Commanders in the Start menu Oolite group. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2302 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-23 13:45:33 +00:00
Eric Walch
bb9c6f3039 Corrected error escorts in "launchIndependentShip" when escorts were selected by key instead of role. This time on the right place so also ships with escort-role are launched as escort. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2301 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-22 21:05:12 +00:00
Eric Walch
7c75b3ab34 Corrected error escorts in "launchIndependentShip" when escorts were selected by key instead of role. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2300 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-22 20:55:25 +00:00
Eric Walch
dbc1389fc8 AI command setCourseToPlanet no longer sets course to moons, only to the closest planet. Added 2 checks for pending escortcount with cockpit_display. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2299 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-22 09:07:23 +00:00
Jens Ayton
8f31c44b21 Changeged various option macros to use 0/1 convention instead of undefined/defined convention. Moved definition of these macros into an xcconfig file when building for OS X, so that their definition is shared with the debug OXP and is the same across configurations. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2298 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-21 19:46:53 +00:00
Eric Walch
87a4359592 Added setStateMachine: to the whitelist as alias of setAITo: 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2296 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-20 09:23:41 +00:00
Eric Walch
cf0b71c3f9 When the advanced_space_compass is damaged or is removed by script, basic compass mode starts now immediately and not only after a system jump. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2295 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-18 20:32:53 +00:00
Marc
12a7e5f822 * more systemInfo changes for the current system are now validated and are effective immediately, including most sun settings, main planet texture, and derivative ones (ie commodity market / economy, ships & equipment markets / techlevel). Properties not yet effective immediately produce a warning. 
* corrected a GNUstep compile warning and fixed a logged exception in the setup/equipment screen.



git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2293 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-17 23:13:38 +00:00
Marc
99906da187 * the last 'nil' fixes? Also fixed one more instance inside the not-yet implemented system.addShips() function. 
* mac temporary fix - player inspector doesn't try to display the missing player_name export anymore - it would lead to crashes on some systems. TODO: export the player_name properly.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2291 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-17 07:27:30 +00:00
Nikos Barkas
d2eb33aee8 Hopefully resolved bug that caused ships with subentities exploding inside closed structures. Test will be required to confirm that I have not broken anything else. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2290 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-16 17:45:20 +00:00
Michael Werle
0a97d1b193 * Fix crash bug with Wormholes when loading a saved-game containing ships from removed OXPs 
* Fixed bug in [OORoleSet anyRole] not returning a role if _roles had not been initialised yet.
* Fixed potential problem in OORoleSet when reinitialising an existing OORoleSet object

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2289 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-15 19:24:11 +00:00
Nikos Barkas
b1ecf44f55 Removed escorts=4 declaration from boa-mk2-player. This should stop some ship.escortSetup.wtf errors popping up in the shipyard screen. Thanks to Svengali for spotting it. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2287 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-14 21:24:41 +00:00
Nikos Barkas
8365fc6642 Removed comment that became inaccurate after latest commit, to avoid confusion. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2286 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-14 12:59:40 +00:00
Nikos Barkas
8d78dc284a Fixed traders launching from station and immediately returning to dock. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2285 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-14 10:09:58 +00:00
Eric Walch
fdc84b87aa Completely separated the behaviour_formation_forming_up and behaviour_fly_to_destination. behaviour_formation_forming_up can now accumulate frustration. Restored speed reduction when npc injectors are shut of to the pre SVN 1981 way of behaviour. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2284 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-14 09:32:26 +00:00
Marc
8a5fdceed2 * JS ship property setters - improved warnings. 
* removed GNUstep compiler warning.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2283 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-13 07:55:35 +00:00
Marc
021e398a64 * procedural texturing for planets reset to OFF by default. 
* bugfix: JS system.info.xx & system.infoForSystem([present galaxy],[system number]).xx are readable, as originally intended. infoForSystem now returns null - and a warning - if trying to access any info outside the present galaxy.
* bugfixed the 'nil' javascript delayed crash described in http://aegidian.org/bb/viewtopic.php?p=8271182711 - required extensive code replace.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2282 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-12 23:51:16 +00:00