3516 Commits

Author SHA1 Message Date
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
Jens Ayton
6347c98045 Removed pointless dependency.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4206 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-31 21:02:58 +00:00
Jens Ayton
ec8d9eb6f4 Deleted pointless declaration.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4205 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-31 21:01:39 +00:00
Jens Ayton
a07e74113e Save half a meg per planet (and atmosphere) instance by hard-coding base geometry instead of subclassing OOSelfDrawingEntity.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4204 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-31 20:59:44 +00:00
Jens Ayton
8245bce0ba Blanked currently-unused OOPlanetData files (see bug #5254).
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4203 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-31 07:37:51 +00:00
getafix
535c6b90c1 Removed OO_NEW_JS definition from GNUmakefile for Linux builds.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4202 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-30 19:33:35 +00:00
getafix
3dda3bce94 Fixed PlayerEntity.m Linux build warnings.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4201 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-30 19:19:15 +00:00
Nikos Barkas
62579128ca Removal of old JavaScript from the Windows port.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4200 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-30 18:58:14 +00:00
getafix
747fb4ae53 Fixed OOStringParsing.m Linux build warning.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4199 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-30 18:37:05 +00:00
getafix
773b6ef889 Fixed OODebugTCPConsoleClient.m Linux build warning.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4198 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-30 17:55:45 +00:00
Jens Ayton
5e4d3e5695 Purged OO_NEW_JS. Now would be a good time for comprehensive test builds.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4197 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-30 17:27:40 +00:00
Jens Ayton
c997498109 Found the random combination of documentation and source code comments that makes it clear that DOUBLE_TO_JSVAL is invalid when value may be an integer, and switched everything to JS_NewNumberValue() (which is like JS_NewDoubleValue() only different, since JS_NewDoubleValue() was also invalid for potentially-integer values).
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4196 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-30 16:30:06 +00:00
Jens Ayton
177ffb9baf Took a detour to improve printing of values in error messages and debug things.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4195 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-30 15:33:06 +00:00
Jens Ayton
69444e6943 Oldjs removal: various thin wrappers and stuff.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4194 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-30 14:49:46 +00:00
Jens Ayton
45de8ac142 Oldjs removal: started on replacing JS_NewDoubleValue() with DOUBLE_TO_JSVAL(), ended up reforming accessor error handling. Lots more to come.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4193 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-30 14:33:39 +00:00
getafix
05087b9427 Fixed MOZ_TRACE_JSCALLS warning on Linux builds.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4192 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-30 13:04:28 +00:00
getafix
ecc939e70d Updated Linux ports (i.e. 32bit & 64bit) to build with JavaScript engine 4.0b10.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4190 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-30 12:23:39 +00:00
Jens Ayton
e45e247a69 Beacon code memory management fix.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4189 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-29 22:18:51 +00:00
Eric Walch
75fd718d9d - Corrected a C&P error
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4188 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-29 21:51:05 +00:00
Jens Ayton
11df41547a [Mac] Hopefully fixed horrible-loud-noise bug (bug #17214), and definitely fixed quieter popping noises at the end of sounds.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4187 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-29 21:40:03 +00:00
Jens Ayton
bce687613f Disabled TAF in deployment builds (and also shader debug hotkey, and extra info on FPSometer).
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4184 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-29 20:45:17 +00:00
Jens Ayton
10dce944f1 Removed some dead code.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4183 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-29 19:21:34 +00:00
Jens Ayton
0c57476192 Moar less UniversalIDs.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4182 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-29 18:51:26 +00:00
getafix
4ae2559403 Detach Linux <make clean> from deps/Cross-platform-deps/SpiderMonkey too.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4181 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-29 18:32:29 +00:00