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

26 Commits

Author SHA1 Message Date
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
266294005b - Add "interfaces" mechanism to stations (F4) to allow "pull" rather than "push" access to mission screens. 
- Add parcel deliveries to interfaces so that there's something there.
- Tweak mission screen options to add colour to choices, for parcel consistency with r5320.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5327 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-14 19:49:53 +00:00
Nikos Barkas
d833c9fb31 Small typo fix. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4998 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-06-08 17:20:13 +00:00
Eric Walch
bb50cc8433 - takeSnapShot() is excluded from the timelimiter. 
- scooping constrictor pilot without killing the ship no longer gives a success message.
- activating a "becomeEnergyBlast" or "becomeExplosion" within a shipDied event, no longer triggers a new shipDied event.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4794 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-03-04 16:04:45 +00:00
Nikos Barkas
031848917f Fixed some spelling in mission texts. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4426 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-03 09:23:25 +00:00
Marc
fb228765e3 Corrected mission text typo. (trunk & maintenance) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3579 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-19 19:56:05 +00:00
Jens Ayton
f2f31e79fe Started on a testing checklist. Noted several nova mission bugs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3541 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-15 13:28:11 +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
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
Nikos Barkas
b278fc15f3 Fixed missing planet name in Constrictor mission. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2571 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-21 22:34:51 +00:00
Marc
3cb2045315 - many nova bugfixes, should now be more difficult to break the nova mission. Sun flares up at random intervals inside the nova system. 
More testing required.
- systemInfo float values are now properly treated as numbers.
- minor code cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2491 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-13 01:25:18 +00:00
Eric Walch
47cbf22071 patrol-ships no longer patrol the mainStation area but the area around the launching station. Re-added Xeer as hard coded text at two places were it refers to Xeer from G2. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2270 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-31 09:34:51 +00:00
Eric Walch
758a6d0b1c Added a checkOwnLegalStatus command and used it for a career selection for escorts. Added a playerBoughtNewShip eventhandler. Hardcoded Xeer back in missiontext were it revers to the previous galaxy. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2266 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-26 11:20:42 +00:00
Eric Walch
2dfc1fbe2a Added frustration counter to attack_target_twelve. Changed frustration message for dockingAI.plist. Made trackDestination target area 5% smaller. Replaced fixed system names in mission.plist by Kaks replacement code. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2253 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-18 17:57:40 +00:00
Nikos Barkas
e1cf86812a Commited Eric's updated nova mission script and added the nova_coward mission text. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2136 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-21 06:51:50 +00:00
Jens Ayton
8a940f724c Mission choices are now sorted. Converted missiontext.plist to OpenStep syntax, and hotted it up with proper quotation marks and apostrophes. Changed magic numbers in -checkForAegis from integer to float literals. Hid entity.linkedList.verify.error message by default. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1402 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-22 15:26:40 +00:00
Nikos Barkas
d5a8ef0b56 Added the commander_shipdisplayname string substitution, updated trumbles mission accordingly. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1363 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-11 13:00:02 +00:00
Jens Ayton
ed757081ba Added missing file. Removed some commented out junk code. Fixed invalid XML comment. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1188 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-09-30 10:21:49 +00:00
Jens Ayton
3c16a7cdaf Added clearMissionScreen scripting method (legacy and JS). Scripting tweaks. Ported trumble mission to JavaScript. Attempted to address JS Ship.escorts bug but couldn't reproduce it. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1187 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-09-29 12:27:31 +00:00
Giles Williams
a410209c79 adding a character to the constrictor hunt mission 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@547 127b21dd-08f5-0310-b4b7-95ae10353056
 2006-05-10 18:19:13 +00:00
Dylan Smith
1264b83cf0 Move cocoa-merge (GUSTO) to trunk 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@289 127b21dd-08f5-0310-b4b7-95ae10353056
 2006-03-05 16:26:25 +00:00
Dylan Smith
653488e27e Nerge missed plist files to OS X revision 932 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@147 127b21dd-08f5-0310-b4b7-95ae10353056
 2005-10-02 14:36:08 +00:00
dajt
bd201d29ff Putting XML plists back in place. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@77 127b21dd-08f5-0310-b4b7-95ae10353056
 2005-06-08 10:22:59 +00:00
dajt
2a3ece755c Win32 changes, TextureStore uses SDL. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@76 127b21dd-08f5-0310-b4b7-95ae10353056
 2005-06-08 10:14:52 +00:00
Dylan Smith
3274cb3ea6 organize the source tree somewhat better 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@30 127b21dd-08f5-0310-b4b7-95ae10353056
 2005-04-28 21:47:22 +00:00