5154 Commits

Author SHA1 Message Date
cim
c19476ac8e Various adjustments and bugfixes to assassination, parcel contracts 2013-09-15 16:00:26 +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
b3a94e97de Add risk level to passenger/parcel contracts 2013-09-14 18:26:53 +01:00
cim
d7b187db22 Merge branch 'master' of github.com:OoliteProject/oolite into steady-state-ecosystem 2013-09-14 17:43:52 +01:00
cim
8ef26f614b Adjust reputation scale to +/-70 2013-09-14 17:40:03 +01:00
cim
661af5d9ef Basic comms message for assassins 2013-09-14 17:39:37 +01:00
cim
86505d4356 Initial implementation of assassin NPCs 2013-09-14 13:50:49 +01:00
cim
5b22e2f1cf A bit more safety on rarely-positioned wormhole exits 2013-09-13 20:53:06 +01:00
cim
3360843aae While there's still time, put the new AIs into the right nameprefix 2013-09-13 20:45:48 +01:00
cim
4c6f352736 Allow autospread for missiles (but not the default missiles) 2013-09-13 18:54:14 +01:00
cim
94178d5bbd Fix bug in disallowedDockingCollides (SVN5698) 2013-09-12 22:44:34 +01:00
cim
218253d7b0 Some more friendly fire considerations 2013-09-11 18:29:08 +01:00
cim
daa0e54b70 Merge branch 'master' of github.com:OoliteProject/oolite 2013-09-10 19:18:00 +01:00
cim
17b2d21de8 Fix bug where subents of stations might themselves be stations 2013-09-10 19:17:12 +01:00
Jens Ayton
5ad46ca935 Merge remote branch 'origin/maintenance/1.77'
52b6c2b Updated terrastorage network name to terrastorage.dyndns.info
9c35146 [Mac] Remove display.fullScreen.temp logging
58175cc Exclude windows build products (closes #53)
4db315d Update changelog
7138dcf Update .gitignore file
1ff3616 Fix shipEnergyBecameFull event to fire at times other than launching
1ea1cc1 Merge branch 'svn-integration' into maintenance/1.77
a7c0305 Reverted the oops of the previous commit and applied correct fix to sub...
8a73443 Re-applied rotation to subentities, which was taken away on r5639, Not...
98ef76b Fix regression in rotational_velocity key for subentities
8b339d4 Display correct pause key in paused message. (issue #41)
659b572 Expose keyconfig.plist contents to script in oolite.gameSettings.keyConfig
055c480 Fix scanner display bug introduced in 50895952

Conflicts:
	src/Core/Entities/PlayerEntity.m
2013-09-10 09:29:30 +02:00
cim
f51d9a0dac Fix bugs in trader[-smuggler] player role assignment, and tidy up a bit 2013-09-09 20:55:48 +01:00
AnotherCommander
5609afe57b Git hash does not play well with version numbering as expected by the installer (X.X.X.X). Added git revision count to versioning of installer. The revision count is equivalent to the incremental SVN revision number and it should be a good way to track commits. 2013-09-09 13:10:38 +02:00
AnotherCommander
00d0612808 Added the first ten digits of the git revision hash to the version number stored in the installer files - note: git must be in the command path. 2013-09-09 11:00:39 +02:00
cim
a3acea0ab3 Now roles are working, pirates can just check if ship can carry cargo, not if it does. 2013-09-08 21:23:00 +01:00
cim
f97bdb7667 Use roles for pirate victims, pirate enemies, friendly fire checks 2013-09-08 17:20:28 +01:00
cim
34e6675693 Allow more flexible role grouping than before
pirate-victim-roles.plist deprecated but still read for OXPs; functionality now in role-categories.plist
Ship.roleIsInCategory(role,category) to determine if a role is in a category
2013-09-08 12:42:12 +01:00
cim
1fe4ade539 player.setPlayerRole(role [,index]) and clear out roles over time 2013-09-07 22:10:37 +01:00
cim
79c744f3c1 Grant player role entries 2013-09-07 20:25:36 +01:00
getafix@oolite.org
52b6c2b8ab Updated terrastorage network name to terrastorage.dyndns.info
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5695 127b21dd-08f5-0310-b4b7-95ae10353056
2013-09-07 18:34:50 +02:00
Jens Ayton
9c35146b59 [Mac] Remove display.fullScreen.temp logging 2013-09-07 18:07:26 +02: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
683c8876e4 Add role list (readable as player.roleWeights) to PlayerEntity 2013-09-06 21:57:47 +01:00
Jens Ayton
6076fae075 Cleanup 2013-09-06 00:53:03 +02:00
cim
1bcee4b7b7 Police ships anti-theft mechanism; traders have slightly better combat response 2013-09-05 20:12:41 +01:00
cim
35da08ae64 ship.damageAssessment() to check damage levels (will do more when NPCs can be damaged)
Also: adjust independent pirate role odds to be more towards small ships, and adjust missile loads of ships to reflect prior action or high value
2013-09-04 22:25:54 +01:00
cim
09c85be7bd Make interceptors need a higher tech level, make cargo ejection faster 2013-09-03 18:22:49 +01:00
cim
59a906b992 Improve trader response to piracy. 2013-09-02 22:23:06 +01:00
cim
eef920f9d3 Give Vipers escape pods; give low energy ships some practical chance to use pods; adjust default pilots 2013-09-02 20:30:47 +01:00
AnotherCommander
59c4c5fa6e Fix warnings on GCC on Windows. Also, free of charge optimization: -mtune=generic for the Windows builds. 2013-09-02 18:03:55 +02:00
cim
a2334ba5f4 Add basic aegis raiders, some bug fixes in station/defense ship AI 2013-09-01 19:25:45 +01:00
Jens Ayton
7c48e4e4db Eliminate a nasty global 2013-09-01 14:58:22 +02:00
cim
fa7673722e Reduce frequency of trader variants, logging in _addShips 2013-08-31 22:52:53 +01:00
cim
ce8c9b5b10 Remove debug lines 2013-08-31 21:16:25 +01:00
cim
a710d2f746 End patrols when supplies are low. Pirate interceptors will avoid fights then. 2013-08-31 19:33:56 +01:00
cim
062c3ee1c7 Fix bug in sun_color parameter, set Lave sun to white for ship parade 2013-08-31 18:48:11 +01:00
cim
1d750d8432 Fix error with interstellar space 2013-08-31 18:16:30 +01:00
cim
fd5fcfeeb3 Search for wormholes if insufficient fuel to leave a bad system 2013-08-31 18:07:17 +01:00
cim
90cab901ee As suggested, give AI object a more accurate name 2013-08-31 16:21:07 +01:00
cim
0152e7ef8c system.wormholes property 2013-08-31 11:09:24 +01:00
cim
58175cc2e5 Exclude windows build products (closes #53) 2013-08-30 21:20:11 +01:00
cim
813b5c9449 Merge branch 'master' of github.com:OoliteProject/oolite 2013-08-30 21:19:28 +01:00
cim
bbbb02ddcd Exclude windows build products (closes #53) 2013-08-30 21:18:53 +01:00
cim
c7e7e2f75f Improve distress message handling 2013-08-30 21:14:55 +01:00
Jens Ayton
053097bb7b Remove unused temporary log class 2013-08-30 16:48:07 +02:00
cim
8cf615c168 Adjust populator settings and related AI a bit.
Main changes: more independent pirates in Feudal/Anarchy; repopulator has a cap on the number of ships it can accumulate in-system; certain ships have tendency towards awful or non-awful accuracy settings; independent pirate packs are slightly bigger; tharglets share accuracy of controller. Overall effect should be to make the difficulty slope between Corp and Anarchy larger, but Corp safer.
2013-08-27 22:08:35 +01:00