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

1007 Commits

Author SHA1 Message Date
cim
8a88c95162 Add a docking behaviour for the priority AI 2013-07-12 23:00:39 +01:00
cim
9847b2fc45 Initial commit of priority-based AI library 2013-07-12 19:44:14 +01:00
cim
43f2efdcfb Merge branch 'master' into javascript-ai 
Pull in coordinate precision
Fix Conflicts:
	src/Core/Entities/ShipEntity.m
 2013-07-11 21:22:14 +01:00
cim
e102fbd55c Merge pull request #38 from OoliteProject/javascript-populator 
Javascript populator and high-precision coordinate system

Closes #22, implements partially #36 but some tuning of populator and especially repopulator will be needed later
 2013-07-11 13:10:09 -07:00
cim
e9eae059c6 Allow ships to have JS-script-based AIs 
AI will receive Javascript events shortly after main ship script does. JS AI shi
ps use nullAI.plist as their state-machine AI for simplicity. Likewise there is a nullAI.js which does nothing for ships with plist AIs.
 2013-07-10 21:29:08 +01:00
cim
955cca855a Adjust nova sun settings a little 2013-07-10 20:09:16 +01:00
cim
eaadf2eb01 Detach sun colour randomisation from star colour randomisation 
Also randomises (slightly) flare and hues settings for the corona.
 2013-07-09 20:11:18 +01:00
AnotherCommander
17c27818c7 Merge pull request #42 from OoliteProject/new-sun 
Pull request for new sun accepted to master.
 2013-07-08 16:51:05 -07:00
cim
779eb9bfc8 Display correct pause key in paused message. (issue #41) 
Needs fixing in maintenance branch too, but this fix won't work there, because that branch doesn't have c0c4f6d227
 2013-07-08 22:20:17 +01:00
cim
8ca8e8a46f Merge branch 'master' of github.com:OoliteProject/oolite into javascript-populator 
Conflicts:
	src/Core/Entities/ShipEntityAI.m
 2013-07-08 21:53:03 +01:00
cim
380c9f8f4a Nova and related adjustments 
- increase default corona flare
- increase nova corona flare ranges to match
- make nova stars in expansion phase keep high corona flare
- make flare changes in nova mission use frame callback for smooth changes
 2013-07-08 19:01:38 +01:00
cim
b74e9712db Add primed equipment notice to small HUD 2013-07-06 14:33:58 +01:00
cim
83e0f31316 Primable equipment dial for HUD 
Hidden while docked (primable equipment unusuable) or if no primable equipment is installed
 2013-07-05 20:30:09 +01:00
cim
be589dbc47 Correct variable name in script 2013-07-04 17:02:24 +01:00
cim
377733eff9 Merge branch 'maintenance/1.77' 
Conflicts:
	src/Core/Entities/ShipEntityAI.m
 2013-07-04 14:59:15 +01:00
cim
a27d5da974 Remove performBroadside AI command. 
(Only really useful for testing anyway, never been in a stable release)
 2013-07-04 14:50:26 +01:00
cim
e444ba7f52 Reorganise shipdata.plist to make future interactions with shipsets easier. (Closes #37) 2013-07-04 09:25:09 +01:00
cim
d04eba66de Make system.populatorSettings work, cleanup and document 2013-07-03 18:30:57 +01:00
cim
6d12aa177e Make navigation buoys rotate again 2013-07-03 17:43:49 +01:00
cim
2b224685f3 Nova system population 
Changes default populator for system, for easiest compatibility with old save games, OXPs with novas, etc.
 2013-07-03 17:11:47 +01:00
cim
242002cf1a Add system repopulator 
Runs every 20 seconds to keep number of ships in system up
 2013-07-03 15:48:25 +01:00
cim
4205ba932c Finish populator named locations (issue #36) 2013-07-03 12:26:08 +01:00
cim
217c618a09 Make sure new populator runs on all branches, replicate (ish) old populator behaviour. 2013-07-01 18:15:57 +01:00
cim
68cbeed17b Start system populator framework. 
Adds buoys, nothing else
 2013-07-01 13:46:13 +01:00
cim
b702e280e9 Remove strict_mode settings from equipment.plist 
(Comment out rather than strict_mode_only out energy bomb; this doesn't affect the Energy Bomb OXP at all)
 2013-06-29 10:43:45 +01:00
cim
848e59ce19 Remove Strict Mode 
Replace strict mode control with OXP enable/disable control
Display OXP setting on new game ship parade to make it clearer to users why their OXPs aren't loading
Adjust descriptions
Remove all gameplay differences other than OXP loading in strict mode
 2013-06-29 10:21:35 +01:00
AnotherCommander
48b9acc664 Added missing fuel scoop icon to small hud. 2013-06-17 18:18:07 +01:00
AnotherCommander
e63213621d Added missing fuel scoop icon to small hud. 2013-06-16 19:57:48 +02:00
Chris Morris
b2070c46d4 Padding on parcel contracts still wasn't quite sufficient for really short trips, which could expire before you got to the station. Add four hours to deadlines. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5678 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-06-11 23:36:12 +02:00
Chris Morris
6bb8e901f4 Padding on parcel contracts still wasn't quite sufficient for really short trips, which could expire before you got to the station. Add four hours to deadlines. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5678 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-05-12 00:23:15 +02:00
Jens Ayton
dd53a44b82 Set up submodules 2013-05-11 21:32:45 +02:00
Marc
d6d9568341 - regression fix: OXPs can show commander 'kills' once again - syntax fits current string expander, though. - fix: language OXPs can now translate thargoid character name & short description, as originally intended. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5674 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-05-04 13:05:59 +02:00
Chris Morris
c01af88cab Fix crash on failed mesh load, plus other bugs exposed at same time 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5662 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-03-29 13:56:43 +00:00
Eric Walch
9e2ffb6ab2 Make sure ships don't stay locked on dead ships as primary target. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5624 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-01-24 20:05:28 +00:00
Nikos Barkas
50895952b2 Version bump to 1.77.1. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5623 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-01-21 10:15:06 +00:00
Chris Morris
fa6c66235c Bug fixes: 
- use lighting for cloud layer to avoid oddities at low ambient levels
 - include cargo premium and passenger advance in new contracts data
 - check case where escorts could end up scan CLASS_NOT_SET


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5614 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-01-12 15:01:27 +00:00
Nikos Barkas
0078af5183 Removed stale references to oolite-missile.js from shipdata. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5610 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-01-07 11:14:56 +00:00
Chris Morris
3d6ceaf44e Adjust missile detonation for better compatibility with 1.76 code 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5604 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-01-05 16:28:11 +00:00
Nikos Barkas
afb09f9a7e Here goes another year. Happy 2013. The Reference Sheet and the Readme still need to have year references bumped. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5596 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-12-31 09:00:28 +00:00
Chris Morris
2126f420bf Fix bugs found by Eric in contracts APIs 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5595 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-12-30 12:53:17 +00:00
Eric Walch
731a74d62e Fixed some oddities with scooped and than released escapepods. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5594 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-12-29 10:19:33 +00:00
Chris Morris
6437f2211a Move virtual dock warning to $oxpDevelopment category. Should consider making this enabled in test builds by default later, but for now OXP developers can adjust it themselves if they want. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5590 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-12-27 17:10:56 +00:00
Chris Morris
e64f74399d Fix crash bug in trackCloseContacts functionality 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5576 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-12-14 18:24:19 +00:00
Chris Morris
a894b4dd63 Add some high level profiling log statements, since gprof seems to miss some of the time spent in various routines. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5575 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-12-13 20:59:22 +00:00
Chris Morris
bef181932f Add property clock.adjustedSeconds, use to give better calculation of contract deadlines. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5549 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-29 10:47:11 +00:00
Chris Morris
8a1a34a492 Avoid parcel contracts which are likely to expire before the player even enters the system. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5547 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-27 20:08:44 +00:00
Chris Morris
2208333f70 Revert r5523 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5536 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-25 11:50:54 +00:00
Chris Morris
f8e0f48cc8 Increase size of deposit required for contracts to remove defaulting exploit 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5535 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-25 10:30:08 +00:00
Jens Ayton
07b05f6839 [Mac] Fixed some state management problems in legacy full screen controller. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5530 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-24 15:50:50 +00:00
Nikos Barkas
23de81392f Nitcpick: More 'professionally' sounding message when a distant hyperspace destination is selected. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5525 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-23 09:35:07 +00:00