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

3589 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Walch
91ae72cab1 - cleaned up the already disabled code in fireMissile that sometimes could crash missiles. Added replacement code. Still disabled, but for use when 1.75.0 gives problems with missile launches. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4264 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-08 09:16:06 +00:00
Nikos Barkas
03bb60f16e Updated the Reference Sheet with the up to now missing Shift+Ctrl+M key combo. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4263 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-07 22:16:46 +00:00
Nikos Barkas
b40b4eb196 Updated the external libraries source code modifications document to better reflect present status. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4262 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-07 20:47:29 +00:00
Jens Ayton
6115b03682 Ship.prototype.exitSystem()/AI performHyperSpaceExit family now work in interstellar space. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4260 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-07 18:35:42 +00:00
Jens Ayton
8f0c79d910 Explosion particles look better at close range and from external views. Explosion effects now inherit velocity. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4258 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-07 17:33:14 +00:00
Jens Ayton
b346c2d28a [Mac] Dock tile plug-in now follows screen shots directory around. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4255 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-07 15:25:51 +00:00
Jens Ayton
26cc800c6e Removed non-optional feature macros. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4252 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-06 16:13:29 +00:00
Jens Ayton
e96d11a9af Cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4251 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-06 14:17:16 +00:00
Jens Ayton
aea5f8b880 JS console is once again available after resetting into strict mode (as long as you started in unrestricted mode). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4249 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-06 09:38:55 +00:00
Jens Ayton
b0eb0f1676 * OOParticleSystem now uses the "new" particle blur texture for better 
blending. blur256.png is no longer used for anything.
* The particle effect textures are now preloaded to avoid stutter.
* The sound preloader is now actually invoked. (This appears to have been an
  oversight; I couldn't find a reference to it being deliberately disabled.)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4248 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-06 09:23:16 +00:00
Jens Ayton
619902f53e Cascades show up properly on scanner. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4247 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-05 23:05:41 +00:00
Jens Ayton
c329b465c8 Fixed a type mismatch. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4246 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-05 22:08:15 +00:00
Jens Ayton
7fa6c4934a Explosion particle effects no longer rotate the wrong way when the camera rolls, and they are now fully volumetric (except in reduced detail mode). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4245 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-05 21:45:59 +00:00
Jens Ayton
a61d8db295 Turned remaining ParticleEntity flavours into OOParticleSystem, no longer based on OOSelfDrawingEntity. Only remaining OOSelfDrawingEntity is now OOBreakPatternEntity. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4244 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-05 21:03:10 +00:00
Nikos Barkas
f0aa3b9b71 Fixed 'conflicting types / previous declaration here' warning. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4243 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-05 19:26:29 +00:00
Jens Ayton
733d78c7ed Fixed potential exception if -[ShipEntity rescaleBy:] is ever called on a ship with non-ship subentities (wreckage with flashers?) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4242 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-05 19:13:01 +00:00
Jens Ayton
342fbcae27 More ParticleEntity breakupage. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4241 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-05 18:58:34 +00:00
Jens Ayton
8d4b1fc562 Cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4240 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-05 17:44:38 +00:00
Jens Ayton
badd140260 Gave quirium cascades an entity class of their very own. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4239 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-05 17:35:50 +00:00
Jens Ayton
964fa0d6c3 Fixed laser entity-related leak. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4238 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-05 16:36:23 +00:00
Jens Ayton
2ad5277d7b Renamed confusingly-named RingEntity to OOBreakPatternEntity. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4237 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-05 15:38:02 +00:00
Jens Ayton
b2239ed327 Use fast enumeration if building with clang on any platform (requires libobcj2 runtime or compatibility shim). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4236 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-05 15:03:46 +00:00
Jens Ayton
ee0dbc2afd * Ship damage is reported to scripts with event shipTakingDamage(amount, 
fromEntity, damageType). This is sent after decrementing energy and before
  responding to death, so it can be used to resurrect if ship.energy <= 0.
  Damage may be zero (for player with intact shields). (Feature request #5077)
* Player now correctly uses damage type "cascade weapon" instead of "energy
  damage" when appropriate.
* Player now cascades when hit by a q-mine.
* Player now reports shipEnergyIsLow as appropriate when taking scrape damage.
* Dead ships once again have status STATUS_DEAD during shipDied()/
  shipKilledOther() message pairs.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4235 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-05 13:42:36 +00:00
Eric Walch
cdea79b71c - Excluded the kZeroVector as missile_launch_position because it hangs Oolite. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4234 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-05 12:13:05 +00:00
Jens Ayton
e96ec4fd08 Player death is no longer reported twice to scripts. Player properties are not invalidated until after shipDied() event. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4233 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-05 12:08:26 +00:00
Jens Ayton
2bf52f375d Fixed some methods called init with non-init semantics. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4232 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-04 23:40:52 +00:00
Jens Ayton
72c8e5aeac Adopted fast-enumeration-if-possible stuff in a few hotspots. Rate of enumerator allocation now about 50/s on 64-bit OS X, as opposed to 20000/s yesterday. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4231 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-04 21:38:51 +00:00
Jens Ayton
33f7df0976 Cleaned up fast enumeration stuff. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4230 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-04 21:05:22 +00:00
Jens Ayton
7da10a764a Cleanup, coupled with complete failure to fix leaks. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4229 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-04 20:13:56 +00:00
Nikos Barkas
6415676c0e Reverted previous bad fix and enabled build in the proper way, as per r4224 instructions. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4228 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-04 16:25:11 +00:00
Nikos Barkas
f306796e7f Fixed build error on Windows (probably Linux, too). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4227 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-04 15:59:40 +00:00
Jens Ayton
1fc94ba8b9 Reverted libpng. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4226 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-04 15:45:03 +00:00
Jens Ayton
66abd54342 Fix so that r4224 doesn't break everything, durr. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4225 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-04 14:43:35 +00:00
Jens Ayton
e3548464a8 Added fast-case short-circuit to -[ShipEntity hasEquipmentItem:includeWeapons:]. Also experimenting with adaptively using fast enumeration when available. If this commit breaks a build, ensure you're building with -std=g99. If it still doesn't work, tell me. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4224 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-04 13:53:02 +00:00
Jens Ayton
b6b00ab89a Cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4223 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-04 12:53:25 +00:00
Jens Ayton
bf4ff7b3a6 Fix for deployment build. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4222 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-04 12:24:47 +00:00
Jens Ayton
8be644228d Fixed potential random crash after installing more than 16 frame callbacks at once. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4221 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-04 12:04:25 +00:00
Marc
a42e42cde9 Last 'thargon' > 'EQ_THARGON' udate? 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4220 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-03 11:21:45 +00:00
Eric Walch
687f4be4d0 _ Corrected the missile_launch_position for thargoids and added an error message for other oxp ships with similar wrong positions, while ignoring the faulty positions. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4219 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-03 11:19:49 +00:00
Marc
c1930937d9 Fixed another uninitialized value! :) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4218 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-03 09:42:55 +00:00
Jens Ayton
ced5292dd7 Fixed uninitialized value warning. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4217 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-03 07:25:17 +00:00
Jens Ayton
fa28e05d98 Fix for BGS-A1.0 timer crasher. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4216 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-02 22:44:45 +00:00
Jens Ayton
a11ef65cd3 Reduced redundant memory management in OOPriorityQueue. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4215 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-02 22:38:56 +00:00
Jens Ayton
7ba3cce23a Turned EquipmentInfo.toString() into EquipmentInfo.prototype.toString() (fallout from the prototype chain fixage). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4214 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-02 14:46:54 +00:00
Marc
424580621e Thargons backward compatibility: all 'thargon' only ships/missiles are now updated to 'EQ_THARGON', with a warning. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4213 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-02 12:02:23 +00:00
getafix
0c126dc0d3 Fixed Linux packaging (autopackage) breakage following PLAYING.TXT removal (r4209). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4212 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-02 10:16:17 +00:00
Marc
40184ebb0c Duplicate strings part II: restored the previous translation strings. Distance and estimated travel time strings can now be overridden globally, or assume separate values depending on which chart is displayed! :) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4211 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-02 09:53:03 +00:00
Jens Ayton
150dd2b9a5 JavaScript console and global object are now rebuilt when resetting the game, to make it impossible to smuggle information across sections. There seem to be minor JS-related leaks as a result. Be on the lookout for exciting new crashers! As an arguably unfortunate side-effect, the console currently doesn't work when resetting into strict mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4210 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-01 21:12:38 +00:00
Marc
62fb7e8aa0 Removed duplicate strings in descriptions.plist (change in translation string name) 
Some txt updates (porting & readme_linux in particular might well need to be further updated)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4208 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-01 20:15:52 +00:00
Jens Ayton
4ade099cec Reduced laser memory usage by a factor of 850. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4207 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-31 22:26:06 +00:00