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

4443 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc
f8e05ac26f Update to PS.targetSystem - completed check for input values, and ensured it's writable from the mission screen - where it is possibly useful - rather than from anywhere else, where it might well not be. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5283 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-02 16:40:55 +00:00
Chris Morris
9fea652a2e Make \037 in the Oolite font (obsolete "unit separator" control character) usable as a very narrow spacing character, to make up for the absence of tab and formatting support in mission screens. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5282 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-02 16:13:28 +00:00
Marc
5f11a3c192 System populator cleanup - part I: still functionally identical to before the cleanup, eliminated some code duplication, and put all asteroid fields / rock hermit code in just one place, ready for part II! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5281 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-02 15:00:28 +00:00
Jens Ayton
2552a0df58 Turned off OO_LOCALIZATION_TOOLS in Mac deployment builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5280 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-02 10:22:28 +00:00
Chris Morris
b61c402a1a More mission screen features 
- Add LONG_RANGE_CHART_SHORTEST and LONG_RANGE_CHART_QUICKEST special mission screen backgrounds.
 - Make player.ship.targetSystem writable to make these more useful.
 - Extend space for mission screen by 6 rows if HUD hidden so that the backgrounds can be used on complex screens.
 - Reorganise layout of text on long range chart to get a bit more space, especially in advanced modes, to help mission screen display.



git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5279 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-01 20:10:12 +00:00
Chris Morris
ed6280e866 Fix aft laser display 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5278 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-01 15:11:36 +00:00
Chris Morris
05f1406618 Fix for !NEW_PLANETS build path 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5277 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-31 19:32:09 +00:00
Nikos Barkas
e6e0180986 Fixed basic mode compass planet/station indicator hardcoded size. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5276 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-31 13:56:43 +00:00
Jens Ayton
0cd087020f Fixed SDL files missed in r5273. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5275 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-29 20:11:07 +00:00
Jens Ayton
08ec406861 Simplified OOCocoa.h macros. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5274 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-29 17:45:13 +00:00
Jens Ayton
d217eee59d Eliminated OOInteger and OOUInteger. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5273 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-29 17:28:01 +00:00
Jens Ayton
b475941ffe Eliminated OOCGFloat, and cleaned up OOColor a bit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5272 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-29 17:00:53 +00:00
Jens Ayton
8a760f99dd Modernized exception handling. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5271 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-29 16:08:10 +00:00
Jens Ayton
369b410ac4 Support foreach() on NSEnumerators across compilers. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5270 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-28 13:46:08 +00:00
Jens Ayton
97f90a4609 Removed pre-GNUstep-1.20 compatibility cruft. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5269 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-28 13:40:40 +00:00
Jens Ayton
04ec7c3730 GNUstep compatibility fix. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5268 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-28 06:49:31 +00:00
Jens Ayton
e0244b3857 Last batch of truncation fixes. It's all over except for the bugs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5267 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-27 21:52:52 +00:00
Jens Ayton
66a830f9f0 Removed compiler-version-specific attribute hackery that should no longer be needed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5266 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-27 18:58:26 +00:00
Jens Ayton
d7850617d5 Estranged nephew of more truncation fixes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5265 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-27 18:57:41 +00:00
Chris Morris
a2a5b0f8b8 Re-enable VisualEffect.scale() but reallocate the mesh vertex lists properly this time. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5264 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-27 17:30:30 +00:00
Marc
c217d53c8a fixed compile warning under gcc, plus minor comment & whitespaces cleanup 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5263 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-26 21:44:54 +00:00
Jens Ayton
1b794459d3 Fixed a bad declaration and a GCC syntax incompatibility. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5262 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-26 20:27:42 +00:00
Jens Ayton
160092066d Yet more truncations. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5261 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-26 20:25:57 +00:00
Jens Ayton
5dad43ac93 More idiomatic name for frustum culling method. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5260 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-26 17:37:00 +00:00
Jens Ayton
c68cb9d6da More truncations. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5259 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-26 17:33:07 +00:00
Jens Ayton
fd44f97b5b Deleted a bunch of #ifed-out and commented-out code that doesn't look likely to be reinstated. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5257 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-26 16:51:31 +00:00
Jens Ayton
83c9df2ed4 More integer truncation hunting. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5256 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-26 16:13:26 +00:00
Jens Ayton
22fde47d46 Made -[ShipEntity currentWeaponFacing] an OOWeaponFacing instead of an OOViewID, with significant knock-on effects. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5255 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-26 15:07:59 +00:00
Jens Ayton
3b96d8fe8c Cleanup: made weapon facings an enum type. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5254 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-26 13:53:25 +00:00
Jens Ayton
0fdb767038 Fixed equipment list rendering. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5253 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-26 13:37:09 +00:00
Jens Ayton
ef4e576de0 Downgraded ObjC syntax in OOMacSystemStandardFullScreenController.m 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5252 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-26 13:13:32 +00:00
Jens Ayton
cff48e01aa More truncation fixes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5251 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-25 22:04:20 +00:00
Jens Ayton
73fd78b2e7 Added -Wshorten-64-to-32 (excluded from -Werror; you'd think it would be in -Wextra, but no) to Mac build flags, and started cracking down on truncations. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5250 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-25 20:43:51 +00:00
Jens Ayton
b510c6eb9b Added squawker for pre-1.20 GNUstep versions in preparation for cleaning up compatibility cruft. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5249 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-25 20:05:55 +00:00
Jens Ayton
97a14b7630 Undid an accidental nonsense edit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5248 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-25 19:51:51 +00:00
Jens Ayton
1adf94353d Converted OOIsNumberLiteral ad-hoc test to unit tests. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5247 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-25 19:41:11 +00:00
Marc
40e52ff9d2 added PS.removeContract('cargo type', system ID) to complement .awardContract() returns true if a matching contract was found & removed, false otherwise. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5246 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-25 16:32:35 +00:00
Jens Ayton
156541e543 Updated Mac build-clean script. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5245 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-25 16:28:12 +00:00
Chris Morris
d9e2ce7368 Revert r5243, since that needs OOMesh rewriting first 
Update verifyOXP config


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5244 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-25 14:10:01 +00:00
Chris Morris
85fded2ae8 VisualEffect.scale() method 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5243 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-25 12:14:42 +00:00
Marc
68d9e53285 * fixed overzealus removal of non-ton items from hacked savegames. Oolite now leaves its paws off the contents of the safe! 
* fixed display formatting bugs on the market screen: all traded goods quantities including nil quantities and >999 quantities now align precisely.
* refactored pods & safe calculations dealing with non-ton goods to use defined constants rather than magic numbers dotted all over the place.
- some code cleanuppery...

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5242 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-25 09:07:00 +00:00
Jens Ayton
ac48c08e45 Fixed a build issue using 10.6 SDK. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5240 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-24 20:24:39 +00:00
Chris Morris
5899fdf2b2 AI targets should be read-only for player 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5239 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-24 20:23:45 +00:00
Chris Morris
5ac25bb344 Provide some shader-bindable properties for visual effects 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5238 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-24 20:20:43 +00:00
Marc
753b7f6213 - fixed a compile warning under SDL 
- removed obsolete & unused drawCompass method.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5237 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-24 20:03:24 +00:00
Jens Ayton
875e793930 [Mac] Fixed keyboard focus problem when starting in full screen in Lion mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5236 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-24 19:23:20 +00:00
Chris Morris
3596d54396 Remove obsolete pre-multidock code 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5235 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-24 19:12:35 +00:00
Jens Ayton
995c5f714d Cleaned out unused full screen refactoring stuff from 2007. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5234 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-24 18:05:50 +00:00
Jens Ayton
508e4ae9b4 Removed my half-baked OOLight and OOCamera classes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5233 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-24 17:49:30 +00:00
Jens Ayton
b02b53afe1 Removed aegidian's incomplete OOBrain/OOInstinct AI redesign project. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5232 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-24 17:41:53 +00:00