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

3180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jens Ayton
010578a64f Proper header comments for Leopard support bundle; added Leopard support bundle to newjs project. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3873 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-18 15:41:07 +00:00
Jens Ayton
60a4feaeef Updated hall of fame. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3872 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-18 15:19:27 +00:00
Jens Ayton
6d3b505d77 Landed Mac OS X joystick support. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3871 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-18 15:17:51 +00:00
Jens Ayton
3a463348bb Joystick refactoring. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3870 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-18 14:56:39 +00:00
Jens Ayton
3c4a8b3835 Preparing to merge in contributed Mac OS X joystick support. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3869 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-18 14:14:13 +00:00
Jens Ayton
daa8f64ddf More minor stuff. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3868 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-18 13:37:18 +00:00
Jens Ayton
0234095de2 Minor stuff. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3867 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-18 13:36:19 +00:00
Jens Ayton
ad56d954d4 Added Xcode project for new JS. Currently only builds x86_64 debug. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3862 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-17 15:08:35 +00:00
Jens Ayton
cf81db538f Work on JavaScript API update: began work on meeting thread-safe API requirements. Game now loads and runs with trunk libjs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3861 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-17 14:45:55 +00:00
Jens Ayton
e83e9a42db Work on JavaScript API update. Milestone: compiles with new JS, but won't link due to dependency issues. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3860 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-17 13:02:45 +00:00
Jens Ayton
10639d6f52 Work on JavaScript API update. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3859 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-17 12:47:53 +00:00
Jens Ayton
776b504220 Fixed an unused variable warning in optimized builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3858 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-17 11:47:45 +00:00
Jens Ayton
e7048059c8 Restricted JS takeSnapShot() to debug/test release builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3857 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-17 11:46:59 +00:00
Jens Ayton
9edf4e9f5e Work on JavaScript API update. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3856 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-17 11:28:03 +00:00
Eric Walch
d50a639d76 The file 'oolite-constrictor-pilot.js' was missing in the builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3855 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-17 10:36:20 +00:00
Jens Ayton
233a0c76c1 Work on JavaScript API update. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3854 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-15 23:33:21 +00:00
Jens Ayton
295c921403 Work on JavaScript API update. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3853 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-15 23:21:25 +00:00
Nikos Barkas
ec9b9f10f5 Fixed Windows build breakage. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3852 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-12 23:44:54 +00:00
Jens Ayton
0bd278bdcd Work on JavaScript API update. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3851 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-12 20:19:15 +00:00
Jens Ayton
a655c81d87 Work on JavaScript API update: updated all property callbacks. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3850 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-12 20:13:39 +00:00
Jens Ayton
75381a4f59 Work on JavaScript API update; all use of JSExtendedClass/JSEqualityOp removed. ==/!= no longer works for distinct Oolite-defined objects. This primarily affects Vector3D and Quaternion. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3849 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-12 19:10:23 +00:00
Jens Ayton
07c6aa06c9 Work on JavaScript API update. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3848 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-12 18:58:07 +00:00
Jens Ayton
39b753ffad Bugfix: JS Vector3D.randomDirectionAndLength() now has correct distribution. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3847 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-12 18:30:23 +00:00
Eric Walch
08b25acda7 - Fixed my recently added bug with multiple page report screens 
- change in canAcceptEscort(), so that any non-escort ship with police scan class can have escorts/wingman and not only those with police role.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3846 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-12 17:42:01 +00:00
Jens Ayton
1242dfdd67 Work on JavaScript API update. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3845 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-12 16:22:26 +00:00
Nikos Barkas
e14168201a Enabled ability to take snapshot using joystick button assignment. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3844 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-11 21:44:29 +00:00
Eric Walch
a201f2460a - escape pods are now orientated away from the ship on launch and ejected at 3 times the normal cargo eject speed. This to raise the chance of surviving the launch without crashing into the hulk. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3843 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-02 22:25:32 +00:00
Nikos Barkas
536cc0d2db Minor documentation fixes on external libraries' source code information file. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3842 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-01 09:25:51 +00:00
Eric Walch
b8359a110b - Added a JS script to pilots. On unloading at a station, the event "unloadCharacter()" is send to the pilot-script. 
- Characters in character.plist now always do a basic setup. That way there is always a valid pilot when not using all character keys. This allows for partial randomisation of pilots for the unused keys.
- Added a JS script for the constrictor-pilot.
- Added default pilots to be used by oxps.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3841 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-11-30 20:11:45 +00:00
Eric Walch
4fe9f0227e Added a "dockingCorridorIsBusy" flag to the station dumpstate. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3840 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-11-29 21:32:34 +00:00
Eric Walch
2d498a07ca - Fixed the sign bug with the w-component in the vector method "rotateBy". 
- Added vectorUp, vectorForward and vectorRight as JS property of ship.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3839 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-11-28 12:08:00 +00:00
Eric Walch
029f2860fe Added a "distresMessageReceived(agressor, sender)" event handler. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3838 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-11-27 12:20:18 +00:00
Nikos Barkas
0898cfc152 - Fix for view direction not being updated at the time of guiScreenChange. The JS event handler viewDirectionChanged(to, from) now handles 
view screen and custom view changes.
- Renamed the JS property viewID to viewDirection, as the ID suffix usually denotes integer type rather than string.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3837 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-11-27 10:42:23 +00:00
Nikos Barkas
fbc4ceb0a1 Switching from GUI screens to flight screens is now recognized by the guiScreenChanged event handler. Added the JS player.ship attribute viewID, which is read-only and returns a string corresponding to the current view. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3836 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-11-26 22:18:51 +00:00
Eric Walch
63ea7e6288 Fixed problem of not showing report screen after a character script had created a mission screen. Report screen check now happens as part of the missionscreen opportunity. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3835 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-11-25 20:32:03 +00:00
cmdrjames
3dec932e3f Add support for variable ranged turrets 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3834 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-11-22 23:28:59 +00:00
Eric Walch
bb7c5495a1 Added a second scriptedMisjump check after the shipWillEnterWitchspace handler. That was lost after my last code switch. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3833 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-11-22 17:06:04 +00:00
Michael Werle
6b405350cd * Add player-wormholes (new AI function: enterPlayerWormhole). 
* Refactored jump-code.
* Add minimum 0.1LY fuel consumption
* Fix cannot-jump-to-origin-system-from-interstellar-space bug


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3832 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-11-21 11:35:28 +00:00
Nikos Barkas
50ff0077bd When an NPC dies by another ship's actions, the script event 'shipKilledOther' is executed, with arguments the ship entity that killed the ship and the context. The handler is executed immediately after the 'shipDied' one, just before the victim ship becomes an explosion. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3831 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-11-20 23:06:58 +00:00
Eric Walch
b7a140cd79 - added a shipWillExitWitchspace and shipExitedWitchspace handler for launches from interstellar stations when the station appears in normal space after launch. 
- made that such interstellar carriers/stations appear near the witchspaceEntryPoint

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3830 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-11-20 12:58:23 +00:00
Marc
41bbfed293 - stop following the snapshots folder on a mac if it's in the trash! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3829 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-11-19 11:40:47 +00:00
Marc
0b5d26459e - hopefully last compile warning correction, for macs this time... 
- for named snapshots, i.e. takeSnapShot('foo'), if the file foo.png already exists, the snapshot will be saved as foo-001.png, etc...
- tiny code cleanup!

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3828 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-11-19 01:32:29 +00:00
Nikos Barkas
8d66d15818 Fixed crash in Windows. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3827 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-11-18 23:58:01 +00:00
Marc
224044b0e4 - some checks added to takeSnapShot(). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3826 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-11-18 23:24:57 +00:00
Nikos Barkas
c83f2f1643 Made entity collision radius accessible by scripts and read-only. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3825 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-11-18 22:18:52 +00:00
Eric Walch
2890ff2d33 - witchspace jump abortion because of damage now takes place before the shipWillEnterWitchspace handler fires. 
- takeInternalDamage now also takes the ship_trade_in_factor into account.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3824 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-11-18 20:30:28 +00:00
Nikos Barkas
c06ef0ba0e Implemented the global JS method takeSnapShot. Takes optional filename as parameter. If filename exists, standard auto-naming snapshot is used to avoid overwrite. The snapshot method now returns boolean. Mac devs, please test. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3823 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-11-18 16:26:30 +00:00
Nikos Barkas
c7b54ece76 Fixed Berlios bug #17721: Contracts: Able to purchase more than cargo hold limit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3821 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-11-17 21:42:31 +00:00
Marc
29b03a7454 - NEARBY_SYSTEM destinations from interstellar space made less unrealistic... 
- minor tidy up to hopefully remove some linux nightly build warnings...

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3820 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-11-17 09:13:16 +00:00
Eric Walch
506770ba27 - better role checking for ships starting to escort. No check for role, but for primaryRole. Should prevent ships being escorted by wrong ships. (It use to be this way in older Oolite versions before 1.72?) 
- translated some flashers to the new subentitie definition, allowing the viper flashers to be initially off.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3819 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-11-16 16:34:32 +00:00