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

878 Commits

Author SHA1 Message Date
cim
9847b2fc45 Initial commit of priority-based AI library 2013-07-12 19:44: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
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
7832ca073b Integrated targeting system. 
Price, description, whether the equipment exists in the core plist at all ... for now somewhat provisional.
 2013-07-04 20:58:19 +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
6d12aa177e Make navigation buoys rotate again 2013-07-03 17:43:49 +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
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
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
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
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
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
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
Chris Morris
c30778b3b5 Update planetinfo.plist to preserve 1.76 planet descriptions 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5523 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-22 22:42:15 +00:00
Chris Morris
80f2f4f6da New engine flare appearance. (breaks Mac build again) 
Engine flare z size now does something. Values from 0.5-2.0 scale the flare compared with its 'normal' scale. All other values treated as equal to 1.0. shipdata.plist updated with new exhaust z-size parameters for completeness.
Slightly tweak laser turbulence parameter.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5521 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-22 19:55:51 +00:00
Chris Morris
20b59c9a62 Use station name on F8 screen for non-main stations 
Fines only applied at main station


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5517 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-18 20:58:08 +00:00
Chris Morris
f599d0f5f1 Remove testing code which snuck into commit. 
Add condition script to a few items it was missed from.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5516 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-18 18:17:06 +00:00
Chris Morris
d497aebc53 Equipment condition scripts now include context of award. 
NEU, cloak moved to use condition scripts rather than TL:99 hack
Base equipment now uses condition script to allow OXP writers to deny particular items at their own stations. (e.g. no fuel)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5514 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-18 16:33:41 +00:00
Jens Ayton
a4050d5218 Spelling fix. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5507 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-17 12:07:55 +00:00
Nikos Barkas
41267a8aeb Added ZygoUgo to contributors list. Minor clean up on startextures.plist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5506 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-17 10:20:42 +00:00
Nikos Barkas
e693c8f3ae With creator's permission, added ZygoUgo's new star textures in the core resources. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5504 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-16 16:31:50 +00:00
Nikos Barkas
5cb844bb60 Minor cosmetic change in interfaces screen: capitalization on titles. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5502 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-14 21:08:46 +00:00
Chris Morris
603a934fa8 Add interfaces for cargo and passenger contracts. Including: 
- API to allow OXPs to insert contracts
 - New customsounds entries for contract acceptance and rejection
 - New choicesKey parameter to make choice unselectable
 - More than 5 contracts viewable at once


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5466 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-01 20:36:08 +00:00
Chris Morris
0301dd6959 Enable OO_GL_CHECK_HEAVY in debug builds (SDL) 
Fix splash screen GL settings (SDL)
Remove obsolete shipdata.plist line


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5456 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-28 21:29:27 +00:00
Chris Morris
23315623af Explicitly specify hermit scan class rather than relying on populator. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5449 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-28 09:10:02 +00:00
Chris Morris
7ecd1f84bf Fix error in parcels scripts. 
Document "interfaces" entry in screenbackgrounds.plist


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5426 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-12 19:13:39 +00:00
Jens Ayton
99f2065b9b Fully integrated new string expander. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5423 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-12 12:49:55 +00:00
Jens Ayton
6e37e3d15f More fiddling with startup logging. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5417 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-10 18:33:42 +00:00
Jens Ayton
76347c282b Tweaked startup logging. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5415 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-10 16:44:54 +00:00
Jens Ayton
f3df081d5b Aliased scriptActionOnTarget: to safeScriptActionOnTarget:. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5414 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-10 16:27:30 +00:00
Jens Ayton
9951eaba7b Script loading now uses standard search behaviour. Normalized some OOLogs in there while I was at it. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5412 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-08 21:55:51 +00:00
Jens Ayton
b3b2005bc6 Renamed misleading script.trace log message classes, and simplified the legacy script subset. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5410 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-08 17:32:54 +00:00
Jens Ayton
d942817f9b Removed legacy script detailed trace facility. If you're still debugging legacy scripts, you're doing it wrong. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5408 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-08 16:50:46 +00:00
Jens Ayton
00660249a6 Weeded out unused logcontrol.plist entries, and renamed a few. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5407 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-08 16:26:08 +00:00
Chris Morris
a943e125a6 Shader/JS bindings for vector up/right/forward in visual effects 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5404 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-07 11:04:56 +00:00