cim
91cc1f2806
Re-enable shaders for sufficiently recent versions of this driver
...
Closes #54
2013-10-03 18:45:17 +01:00
cim
5fb3ab2826
Update ReadMe file and regenerate PDF
...
Cherry-pick of 43a24cf, dcee585
2013-09-29 19:03:31 +02:00
Jens Ayton
5bed341460
Merge remote branch 'origin/maintenance/1.77'
2013-09-29 18:54:45 +02:00
Jens Ayton
de74b960cc
Ignore submodules not used on this branch
2013-09-29 18:48:02 +02:00
Jens Ayton
7a5c16c500
Fix Xcode 5 issues
2013-09-29 18:05:38 +02:00
Jens Ayton
3eb888d5ba
Cleanup
2013-09-29 14:24:07 +02:00
Jens Ayton
7006913eb2
Disallow system.mainStation.explode() before game starts
2013-09-29 14:23:12 +02:00
Jens Ayton
d3d7e623a6
Make PlayerEntity's dockedStation a weakref
...
Dangling dockedStation could cause a crash if, e.g., the main station
was blown up during the demo screen.
2013-09-29 14:21:44 +02:00
Jens Ayton
f247f519f6
Add OOExplosionCloudEntity to Xcode project
2013-09-29 13:55:28 +02:00
Jens Ayton
beda9cd824
Fix various integer type issues
2013-09-29 13:49:47 +02:00
cim
0c21ed7e10
Fix code to avoid overusing injectors.
2013-09-28 21:00:20 +01:00
cim
de91fd50e4
Fix code to avoid overusing injectors.
2013-09-28 20:57:47 +01:00
cim
01104d2f3a
Fix bug in ship.forwardWeapon
...
In entities with a subentity with a forward weapon, and currently no forward weapon of their own, the getter would get the subent weapon, but the setter would set the main weapon.
2013-09-28 12:36:53 +01:00
cim
8c91b6db3f
Fix bug in bulk role clearing
2013-09-28 11:33:10 +01:00
cim
57944ba4a3
Merge pull request #52 from OoliteProject/steady-state-ecosystem
...
Steady state ecosystem
Still plenty of testing and balancing to do, and I've left the test comms messages in for now, but the remaining work can be done on master as and when.
2013-09-28 01:21:19 -07:00
cim
1f0345f8d2
Fix viewpoint calculations on demo screen ( closes #50 )
2013-09-27 20:53:17 +01:00
cim
606667229c
Adjust explosions a little more
...
Put old explosions back for tiny objects (cargo, missile and mines being destroyed before detonation)
Add explosion effect to dealEnergyDamage
2013-09-25 23:22:07 +01:00
cim
834080805f
No Viper patrols in Feudal/Anarchy - weaker bounty hunters instead.
2013-09-24 21:29:20 +01:00
cim
dcee585773
More documentation updates
2013-09-22 22:25:40 +01:00
cim
43a24cfa97
Update ReadMe file and regenerate PDF
2013-09-22 20:27:24 +01:00
cim
fb5734dba5
New explosion effect
2013-09-22 19:55:42 +01:00
cim
ba09d5ad96
Clean up logging settings
2013-09-22 14:35:16 +01:00
cim
84d6e28541
Police reactions to suspicious characters
...
Fix a few bugs
2013-09-19 18:45:25 +01:00
cim
dfa291781f
More chance of at least a couple of cargo pods in explosion
...
Especially for player ship to give a bit more scenery on the death screen
2013-09-18 21:15:29 +01:00
cim
37a0644d1c
Make assassins clean (so they can hang around stations)
...
...but make the behaviour of police when they spot a clean vs clean fight be a little more dependent on the reputation of the combatants.
2013-09-18 21:14:16 +01:00
cim
eb7c006230
Risk levels for passenger contracts
2013-09-17 21:24:23 +01:00
cim
f155222ee2
Add assassin-player role.
...
Adjust cargo demands for player pirate and NPC pirates a little.
A few other minor adjustments.
2013-09-16 21:27:13 +01:00
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
dfc8e1f108
Fix bug in disallowedDockingCollides (SVN:5698)
...
This is not the same as 94178d5bbd in master, as that commit uses the new HPvectors.
2013-09-12 22:50:35 +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
6469d8ae7b
Fix bug where subents of stations might themselves be stations
2013-09-10 19:18:47 +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
