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

5271 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
cim
73d6fb162a New ships should start with weapons online 2013-11-03 12:16:19 +00:00
cim
07212c7183 Stop player found target changing during escape sequence 
Closes #57
 2013-11-02 20:33:04 +00:00
cim
2a1ca5aca6 As suggested change priorities for efficiency 2013-11-02 20:16:45 +00:00
cim
1e4b64f60e Rearrange escape pod sequence code - most of issue #57 2013-11-02 20:13:18 +00:00
Jens Ayton
5b97b33024 [Mac] Add role-categories.plist to Xcode project 2013-11-02 20:10:47 +01:00
cim
e641390dda Merge branch 'master' of github.com:OoliteProject/oolite 2013-11-02 18:46:40 +00:00
Jens Ayton
3ebd74e6a5 [Mac] Use fancy Clang modules in Xcode 5 2013-11-02 19:45:29 +01:00
cim
f8bf4bf5f6 systemInformationChanged(gal,sys,key,newValue) world event 2013-11-02 18:40:50 +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
Jens Ayton
95d891f9b7 Fix missing symbolic identifier in OOLogHeader 2013-11-02 14:43:24 +01:00
Jens Ayton
71b8b1f6d5 Fix various warnings in Xcode 5 2013-11-02 14:40:46 +01:00
Jens Ayton
d66798f670 Fix more Xcode 5 project issues 
I thought I'd done these, but apparently not.
 2013-11-02 14:27:09 +01:00
Jens Ayton
c58062947c Add missing resources to Xcode project 2013-11-02 14:26: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
977190d82e Merge branch 'master' of github.com:OoliteProject/oolite 2013-10-31 14:01:21 +00:00
AnotherCommander
b723e25130 Attempt to fix problem when checking out Windows deps (tries to do ssh connection to pull the dependency). 2013-10-31 14:20:28 +01:00
AnotherCommander
fade2ff2ad Windows dependencies update to correct revision reference on oolite master. 2013-10-31 10:38:31 +01:00
AnotherCommander
79aa542728 Update Windows dependencies step 2: Renaming Windows-x86-deps to Windows-deps. 2013-10-31 09:21:59 +01:00
AnotherCommander
6d0616a102 Merge branch 'master' of github.com:OoliteProject/oolite 2013-10-31 09:09:12 +01:00
AnotherCommander
45b67a0d3b Update of Windows dependencies for x64 support step 1: Removal of old dependencies. 2013-10-31 09:06:57 +01:00
cim
3a232d5cf6 Slow rotation on rock hermit 2013-10-30 20:23:31 +00:00
cim
86accd2a7b Fix bug with docking calculations where dock.y > dock.x 2013-10-30 19:34:50 +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
d8fc208457 Fix lighting position bug introduced with high-precision coordinates 2013-10-27 16:00:39 +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
23e46a284f Adjust explosion colour transition rates 2013-10-20 17:08:20 +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
48d48c6192 Cosmetic adjustment to size of displayed explosions 2013-10-19 22:28:50 +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
395b5c5395 Load/Save markets for all deterministic secondary stations 2013-10-18 22:51:25 +01:00
cim
d2498d54df Adjust main Makefile now DebugOXP Makefile is gone 2013-10-17 22:16:26 +01:00
Jens Ayton
7c00f7bdb9 Refine Mac log header 2013-10-16 01:26:48 +02:00
Jens Ayton
94a2808855 Remove an unused import 2013-10-16 01:26:39 +02:00
cim
2e6beea06b Reassure compiler that variables will be set before use 2013-10-15 18:02:17 +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
48982e6177 Game over message position should not depend on the HUD settings 2013-10-13 21:55:13 +01:00
Jens Ayton
3006fb4eba Removed Basic-debug.oxp makefile 
Since Debug.oxp no longer contains code, a hand-maintained OXP seems
a simpler approach.
 2013-10-13 15:20:08 +02:00