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

855 Commits

Author SHA1 Message Date
cim
9d37b1ca14 Add tutorial lesson 6: combat practice. 
Also tweak a few earlier stages very slightly, and add optional 'delay' parameter to priority setting in AIs.
 2013-12-18 12:42:04 +00:00
cim
d5093e2412 Tutorial lessons 4 and 5 2013-12-17 13:05:18 +00:00
cim
86de5faa16 Fix typos in tutorial briefing text 2013-12-16 18:09:29 +00:00
cim
2f248c3186 Adjust messages, check distance from buoy more frequently 2013-12-14 17:05:51 +00:00
cim
51ee5f94cb Add first challenge - dodge some asteroids 2013-12-14 15:55:31 +00:00
cim
d1617b92b0 Complete first draft of second lesson 2013-12-07 16:27:02 +00:00
cim
8c2836f157 Set up resetting between lessons and death protection, start lesson 2 2013-12-07 15:02:31 +00:00
cim
a29ee99447 Allow scenarios to be ended 
A scenario key may optionally be specified in scenarios.plist, then player.endScenario(key) may be called to exit the scenario and return to the start screen. Calling it with the wrong key or when there was no scenario key set has no effect.
 2013-12-07 13:00:02 +00:00
cim
d10327a675 Finish (first draft of) lesson 1 of the tutorial 2013-12-06 21:47:24 +00:00
cim
44799d8b70 Add more dials to tutorial lesson 1 2013-12-06 18:20:55 +00:00
cim
9d8850d4d8 Adjust HUD dial positioning slightly 
Scanner zoom is now closer to the scanner than to the compass
 2013-12-06 18:20:32 +00:00
cim
e27338050c Adjust ordering slightly, add another dial 2013-12-05 22:12:06 +00:00
cim
7e83f253a6 Start introducing the HUD in the tutorial 
New features: player.ship.{show,hide}HUDSelector(selector) to selectively disable HUD entries.
with_dial entry for legends to tie legends to the visibility of particular HUD selectors.
 2013-12-04 22:57:39 +00:00
cim
067dd3a222 Add "return" option from load commander screen if entered from start menu 2013-12-04 20:28:38 +00:00
cim
2be33a0eef Start on tutorial set up 
Add third parameter to PS.setMultiFunctionText (bool reflow). If true, automatically reflows text to keep within width limits. (Should we default this to on? That's probably the more common case.)
 2013-12-03 23:28:16 +00:00
cim
d27d211575 Improve mouse support on new game page, add return to menu option 2013-12-03 18:01:01 +00:00
cim
774f421455 Add starting save file and some initial framework for the tutorial 2013-12-03 13:33:17 +00:00
cim
0c8259f804 Mouse support on start screen 2013-12-03 12:00:02 +00:00
cim
0621052bd0 Sounds for selection, fix enter-persistence bug 2013-12-02 22:57:35 +00:00
cim
e041b5e349 Use correct constants for number keys 2013-12-02 21:15:31 +00:00
cim
8b9bb60a21 Make start options selectable with arrow keys 2013-12-02 20:50:56 +00:00
cim
328a261696 Reword options, add exit option 2013-12-02 20:09:03 +00:00
cim
59fc255fb5 Fix some more bugs around strict mode and reloading 
Cleanup some in-game menus now strict mode accessed through scenarios
 2013-12-01 22:21:11 +00:00
cim
6fbcf75363 Scenario loading screen 
(unfinished: scenarios not yet present)
 2013-12-01 18:29:08 +00:00
cim
4dc16316af Adjust start screen to allow for more options than load y/n 2013-12-01 14:32:06 +00:00
cim
60ef4c54ad Merge pull request #66 from OoliteProject/zipped-oxp-support 
Zipped oxp support / OpenAL
 2013-11-17 03:13:51 -08:00
cim
b8a0ec94d5 Add CaptSolo's textures for Griff's asteroids 2013-11-13 21:40:34 +00:00
Jens Ayton
721385aeb6 Merge remote branch 'origin/master' into zipped-oxp-support 
Conflicts:
	Mac-specific
	Oolite.xcodeproj/project.pbxproj
 2013-11-08 19:09:03 +01:00
cim
bf4f6aa689 Basic dependency conflict/requires management for OXPs 2013-11-07 23:47:25 +00:00
cim
9b04c93edb Require a manifest.plist in OXZ files 
identifier, version, required_oolite_version are required
title and maximum_oolite_version are processed
some others are defined but not yet used
 2013-11-06 21:32:47 +00:00
Jens Ayton
1ea963b3ba Remove unused file script-patches.plist 2013-11-05 14:47:11 +01:00
Jens Ayton
086e8ea724 Merge branch 'master' into zipped-oxp-support 
Conflicts:
	Oolite.xcodeproj/project.pbxproj
 2013-11-05 13:33:16 +01:00
cim
9e32bec94b Better way of managing pause message. 2013-11-04 21:17:16 +00:00
cim
bbf8fdcb93 Merge branch 'nafigator-fix-numpadkeys' 
Fix conflicts accumulated from other changes to master.
Conflicts:
	GNUmakefile
	src/Core/Entities/PlayerEntity.h
	src/Core/Entities/PlayerEntity.m
	src/Core/Entities/PlayerEntityControls.m
 2013-11-03 16:51:43 +00:00
cim
dbf2e46978 Remove ferdelance-player thrust difference 2013-11-03 16:00:54 +00:00
cim
1ac5406f07 Set allegiance for stations rather than relying on automatic calc. 
Rock hermits allegiance varies (consistently per hermit) per system.
 2013-11-03 13:36:23 +00:00
cim
04fcf560a8 Make weapons-offline notice much more noticeable 2013-11-03 12:29:23 +00:00
Jens Ayton
939f5a2806 Disable sound.buffer logging by default 2013-11-02 19:40:22 +01:00
cim
26fd084f4c Extra special string expansions 
For keyconfig entry "key_FOO", "[oolite_key_FOO]" will describe it.
 2013-11-02 17:24:43 +00:00
Jens Ayton
ed55d08251 Merge remote branch 'origin/master' into zipped-oxp-support 2013-11-02 14:44:16 +01:00
cim
450f7358ce Remove bad weapon position override. 2013-11-01 23:06:32 +00:00
cim
5c4c257ed8 Set main station roll rates 2013-11-01 20:22:25 +00:00
cim
d67bfb6c94 Merge branch 'master' of github.com:OoliteProject/oolite into zipped-oxp-support 
Conflicts:
	GNUmakefile

Merge upstream now or this will be messy later with the windows deps
 2013-10-31 14:02:45 +00:00
cim
f00d3bd2fe Start work on OpenAL support 
(Really doesn't work as of this commit...)
 2013-10-31 14:00:18 +00:00
cim
3a232d5cf6 Slow rotation on rock hermit 2013-10-30 20:23:31 +00:00
cim
8f3591b509 Fix typo in shipdata 2013-10-29 22:18:20 +00:00
cim
e71ae6983f Add Griff Stations with CaptSolo's textures 2013-10-29 21:50:56 +00:00
cim
c7cbcc898b commit for Griff: update to shipdata.plist for updated models/textures 2013-10-29 20:16:58 +00:00
cim
30375999c2 Fix typos in Mamba shipdata 2013-10-27 12:51:32 +00:00
cim
a6193991b9 Adjust Cobra III aft view 2013-10-24 21:36:51 +01:00