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

4567 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikos Barkas
c3943cc1a4 Slightly better gameoptions grouping. Docking Clearance is now below Autosave, no additional spacer needed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5315 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-11 07:00:11 +00:00
Nikos Barkas
661901f5d6 Made Docking Clearance Protocol a game option (note: one spacer line had to be removed for the SDL builds - werun out of screen space!) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5314 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-10 19:42:30 +00:00
Jens Ayton
548df2800a Support fire_rate shipdata key in verifier. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5313 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-10 00:21:29 +00:00
Jens Ayton
f118568099 Missing space. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5312 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-09 13:03:29 +00:00
Jens Ayton
71aac41069 Updated encoding OXP templates with micro-space character. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5311 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-09 12:56:07 +00:00
Jens Ayton
1d07de7a62 Like r5309, but not broken. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5310 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-09 12:45:38 +00:00
Jens Ayton
e19364dc57 Mapped Unicode HAIR SPACE to 031. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5309 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-09 10:13:19 +00:00
Jens Ayton
64bb8f8bef Fixed a bug where removing items from a mutable probability set and adding others could result in a situation where some objects would never be retrieved. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5307 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-08 22:44:37 +00:00
Chris Morris
bfd41a8920 Check for and handle case where choices dict contains no selectable choices. 
Partially fix bug in calculation of cargo capacity when accepting contracts.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5306 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-08 20:22:21 +00:00
Jens Ayton
fa2cf4c9f5 Added oolite-default-effect-script.js to Xcode project. Removed copy-and-pasted comment about legacy script actions. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5303 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-08 18:46:54 +00:00
Chris Morris
1b3deee3ed More mission screen changes: 
- "choices" param, passed a dictionary, for dynamic equivalent to "choicesKey"
- Values in choices can now either be strings (exactly as before) or dictionaries: parameters so far "text" and "alignment" = ("LEFT"|"RIGHT"|"CENTER")
- Choices keys with blank text values skipped in selection list and just leave blank line
- Unmerge background to background and backgroundSpecial. Both can be set together.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5302 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-08 18:04:21 +00:00
Jens Ayton
51cbe963dc Removed singularily unhelpful temp log message. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5301 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-08 17:28:29 +00:00
Chris Morris
3f091ecbd6 Allow Visual Effects to also be compass beacons. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5300 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-08 15:48:14 +00:00
Chris Morris
5ff5dc09fd Allow scripts and scriptInfo to be attached to visual effects. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5299 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-08 14:51:45 +00:00
Chris Morris
2e13dff46f Remove incorrect check in LRC backdrop display. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5298 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-08 13:13:05 +00:00
Jens Ayton
9a4e6297b0 [Mac] Set line width correctly when starting in HiDPI mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5297 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-08 11:29:23 +00:00
Jens Ayton
b1a3df4657 Cleanup of tests/ and tools/. 
The following particularly unhelpful-looking things were moved to attic/:
 - tools/blurmapgen (tool to generate oolite-particle-blur.png)
 - tools/play-oolite-inflight.applescript (out-of-date template for
   OOMusicController AppleScript generator)
 - tools/plist2Script (tool to convert deprecated plist scripts to obsolete
   oos scripts)
 - tools/randomVectorIllustration (Tool to generate
   http://wiki.alioth.net/index.php/File:Randomvectordistribution.png)
 - tools/ScriptConverter (incomplete tool to convert deprecated plist scripts
   to an old dialect of JS scripts)
 - tools/simpleDebugConsole (C command-line implementation of debug console
   protocol, potentially useful for reference but not actual use)

The following OXP starting points were moved into tools/oxp-templates:
 - tests/encodings
 - tools/translation overrides

The following feature testing OXPs were moved into tests/test-oxps:
 - tests/AI overflow test
 - tests/JSInterfaceTests
 - tests/materialTestSuite
 - tests/PNGTestSuite
 - tests/RetroMissions
 - tests/shaderFallbackTest

The following redundant test was deleted:
 - tests/multiTexture (functionality subsumed by materialTestSuite)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5296 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-07 19:30:28 +00:00
Chris Morris
1a36fa97bc A couple of read-only properties for visual effect scripting 
Entity.isVisualEffect
VisualEffect.dataKey


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5290 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-07 16:07:13 +00:00
Chris Morris
6ec0572bef Fix ramming behaviour. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5289 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-05 17:46:55 +00:00
Jens Ayton
4bfe7f3498 Updated planettool to build in Xcode 4.4. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5288 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-04 19:56:08 +00:00
Marc
3a18e562a4 More on player.ship.targetSystem: allowed when docked, disallowed otherwise. Should still allow plenty of flexibility for scripts, while avoiding js surprises during flight. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5287 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-02 19:11:45 +00:00
Jens Ayton
d157ce4a67 [Mac] Scale lines and points appropriately in HiDPI modes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5286 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-02 18:55:42 +00:00
Marc
c4a6b56dc3 System populator cleanup - part II: changed asteroids population code to a less random one - they're still subject to change position, size, and hermit population, but not as suddenly as before. As a consequence, savegames will now produce consistent results, hermit-wise. See http://aegidian.org/bb/viewtopic.php?p=169526#p169526 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5285 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-02 18:30:42 +00:00
Jens Ayton
d8ee7cd6d9 Naughty stray semicolon. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5284 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-02 17:42:39 +00:00
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