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

231 Commits

Author SHA1 Message Date
AnotherCommander
3b95ebbd34 Updated year visible on screen to 2014 on title screen and Windows installer. 2014-01-20 17:21:16 +01:00
cim
678abb6569 Display "restarting" notice when OXZ manager is applying changes 2014-01-18 16:45:38 +00:00
cim
ed7a8db979 Merge branch 'master' into oxz-installer 
Conflicts:
	src/Core/Entities/PlayerEntityControls.m
	src/Core/ResourceManager.m
	src/Core/Universe.m
 2014-01-17 21:59:26 +00:00
cim
e53dff467a Fix left/right keys in install/remove settings 2014-01-16 20:46:37 +00:00
cim
c626a955e1 A bit more in-manager documentation 2014-01-15 20:57:36 +00:00
cim
fe4192029e Finish off basic interface, a bit of cleanup 2014-01-13 18:27:43 +00:00
cim
5483a170cc Colour-code install menu by installability 2014-01-12 22:52:40 +00:00
cim
a7b8f83c68 OXZ removal, make install-reported version accurate 2014-01-12 13:19:02 +00:00
cim
262384bfe9 Some work on installer interface. 2014-01-09 23:09:17 +00:00
cim
d11b61bde1 Add GUI for downloading manifests file 2014-01-07 21:58:56 +00:00
cim
656b58beae Adjust detail settings on Game Options screen 
0 = no shaders, reduced detail
1 = full shaders, high detail
2 = full shaders, various expensive post-1.78 graphics extras

The old "simple shaders" setting is gone
 2014-01-01 17:15:14 +00:00
cim
47d3f92bb1 Add equipment mode key to stick mapper, re-add Tab and 0 equivalents 
Untested, of course.
 2013-12-24 16:24:04 +00:00
cim
1975783f24 Merge branch 'tutorial-scenario': lesson 7 and some other adjustments 2013-12-19 18:56:10 +00:00
cim
de9283b93a Lesson 7: docking 2013-12-19 17:35:50 +00:00
cim
b17b39afde Merge branch 'tutorial-scenario' 
I'll carry on working on the tutorial mainly in the branch, but I'd rather be able to get it tested via nightlies a bit at a time to spread out the feedback. The scenario support and new start menu are also needing testing. So further merges from this branch will happen in future.
 2013-12-08 19:10:19 +00:00
Jens Ayton
8e870d772c Clean up OOCharacter 
Mostly style changes, and hiding of internal methods. Also removed
longDescription property; it was never used and the setup code was
broken.
 2013-12-08 01:14:36 +01: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
d27d211575 Improve mouse support on new game page, add return to menu option 2013-12-03 18:01:01 +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
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
cim
9e32bec94b Better way of managing pause message. 2013-11-04 21:17:16 +00: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
cim
b446a71828 Cleanup a few un-needed energy bomb functions 2013-10-20 17:53:38 +01:00
cim
b37cb50804 Primable equipment work - add affinity parameters for equipment.plist 
fast_affinity_defensive, fast_affinity_offensive, both boolean. If set and that fast activation slot (defensive = 0, offensive = tab) has nothing in it (or what it had in it is no longer installed), assign that slot. As suggested in comments on db8f3ed

More cleanup of old energy bomb code.
 2013-10-20 16:54:01 +01:00
cim
27bc2fe620 Parcel contract tweaks 
- add text properly to descriptions.plist as pointed out by Poovga
- ensure a couple of contracts always available at Lave for new commanders
 2013-10-13 22:10:07 +01:00
cim
3cea6eb1d4 Keys for player to change MFDs 
';' to change MFD content, ':' to select the next MFD if HUD has >1
':' now allowed as an SDL key, though more accurately shift-; now allowed
 2013-10-08 21:43:14 +01:00
cim
eb7c006230 Risk levels for passenger contracts 2013-09-17 21:24:23 +01:00
cim
4c733916f2 Variable risk parcel contracts; fix a few bugs elsewhere 
Pricing, assassin effects, availability, etc. will need rebalancing
 2013-09-14 22:41:27 +01:00
cim
661af5d9ef Basic comms message for assassins 2013-09-14 17:39:37 +01:00
cim
ea8c9c7b8e Make it possible to translate the Moray Med's name without breaking cargo 2013-09-07 11:09:31 +01:00
cim
3fa10abb5c Adjust comms messages, avoid over-filling pirates with cargo 2013-08-26 16:17:59 +01:00
cim
172f66c4c5 Merge branch 'master' into javascript-ai 
Conflicts:
	src/Core/Entities/PlayerEntityLoadSave.m
 2013-08-26 13:41:16 +01:00
cim
ce9af0c389 Allow text entry on mission screens, tidy up some related code 2013-08-25 19:16:17 +01:00
cim
fe5cef097f Initial draft of odds calculations, fix fleeing bugs 2013-08-05 14:14:50 +01:00
cim
9a497c4f3e Fix bug causing thargoid response routines to be rather slow 2013-08-04 14:20:20 +01:00
cim
c92a70fd0a JSAI: Responses to thargoids 
ship.checkScanner now has optional parameter to restrict scan to powered entities
Restore thanks-for-help messages
 2013-08-04 12:29:44 +01:00
cim
cda41d73eb Redo JSAI comms methodology 
Now much more possible for OXPs to add more comms messages.
Priority system to allow occasional messages on particular topics without overwhelming the comms with constant updates.

Also, fix my text editor using 2 tabs as the indent level for JS...
 2013-08-01 22:40:23 +01: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
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
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
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