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

1213 Commits

Author SHA1 Message Date
cim
1dd51a6adf Correctly unset wormhole record in ship AIs 2013-11-28 21:00:51 +00:00
cim
fbd6173ef5 Fix misnamed behaviour in escort AI 2013-11-20 17:53:37 +00:00
cim
2fe4c4318c Fix some interstellar space bugs in AI 2013-11-18 18:04:12 +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
0fa9c82b68 Bring submodule dependencies up to date 2013-11-17 09:50:17 +00:00
cim
4bc2c88604 Add player.*ReputationPrecise 
Integer behaviour of *Reputation needed for compatibility
 2013-11-15 21:36:35 +00:00
cim
b8a0ec94d5 Add CaptSolo's textures for Griff's asteroids 2013-11-13 21:40:34 +00:00
cim
0b296b47a0 Advance Binary resources to the version with mono sounds 2013-11-12 21:26:54 +00:00
cim
45289bb4a7 Fix populator for missing roles 
Temporarily increase level of logging of missing roles
 2013-11-11 23:07:53 +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
259fbeb87d Remove debug statement. 2013-11-06 21:34:58 +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
cim
42128d6ff2 Police lights now used in combat again 2013-10-24 21:09:57 +01:00
cim
3357c24644 New ship models and textures as provided by Griff and CaptSolo 
(Don't forget to git submodule update to get the texture files themselves)
 2013-10-24 21:04:41 +01:00
cim
08932b0e60 Remove the Multi-Targeting System from equipment of Asp, Adder, Cobra I 
It's utterly useless with only one missile pylon, so no point in allowing it to be fitted. The Asp had it as built-in equipment, so give that Target Memory as standard instead.
 2013-10-22 20:29:37 +01:00
cim
b446a71828 Cleanup a few un-needed energy bomb functions 2013-10-20 17:53:38 +01:00
cim
3bda2fd0b6 Fix cloaking device mission for new AIs 
(pirate AI won't attack if it doesn't have any free cargo hold, so a pack of three Asp pirates needs a bit of encouragement)
 2013-10-20 17:53:08 +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
74ffe7d8ae Increase console message size a bit for readability 2013-10-20 16:53:46 +01:00
cim
db8f3edea4 Make cloaking device into primable equipment (closes #33) 
'tab' and '0' now used as "fast-activate" controls for primable equipment.

Energy bomb OXPs will need a little bit of work to be compatible with this change.
 2013-10-19 18:46:05 +01:00
cim
90a2b906aa Correct speed test for carriers slow enough to take shuttles. 2013-10-14 21:08:55 +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
d6844ad64c Merge pull request #56 from OoliteProject/hud-improvements 
Hud improvements
 2013-10-12 05:29:35 -07:00
cim
656e213beb Prevent impossibly-high skill requirements for contracts. 2013-10-11 22:08:18 +01:00
cim
786a136bd0 Assassin AI needs an odds assessment before engaging 2013-10-11 22:01:55 +01:00
cim
880c7294b2 Adjust MFD sizes for better font scaling, force MFD lines to be right length. 2013-10-09 18:11:29 +01:00
cim
d817df2576 Add MFD to small HUD, make MFDs work after loading game 2013-10-09 17:53:19 +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
ff60370d3f Make a start on the MFDs 2013-10-07 22:30:29 +01:00