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

1390 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikos Barkas
30122819bd Improved FPS calculation. FPS now displays correctly even with V-sync on. Old method is still used when the clock is adjusting. Oolite now runs by default with V-sync on on the SDL builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1614 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-05 05:30:10 +00:00
Jens Ayton
649a8ca9c3 OOCPUCount() now works under Linux. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1613 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-03 22:21:34 +00:00
Jens Ayton
6e02b1f0f0 Fix for billboard bug - suns are now the right size, but have no coronas. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1612 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-03 15:08:12 +00:00
Jens Ayton
6444b5d5e9 Moved demo2 screen over to OOShipRegistry. No more blank spaces or crashes for empty lists, possibly. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1611 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-03 13:39:56 +00:00
Jens Ayton
b3bace6ba2 Improved -copy and -mutableCopy performance for OOProbabilitySet. I thought I had a clever idea for an O(log n) mutable probability set last night, but can't remember it now. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1610 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-03 13:35:10 +00:00
Jens Ayton
ac894b5309 Moved newShipWithRole: and all ship dict lookups over to OOShipRegistry. Profiling shows that the slow case in newShipWithRole: has a ~20% hit rate with anarchies, dictators and commies installed, indicating optimization of OOMutableProbabilitySet is required, but it's still faster than the old code. OOShipRegistry now blocks inheritance of display_name. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1609 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-03 13:08:20 +00:00
Nikos Barkas
6e6f5d0ff4 Removed redundant broadcastMessage: method. The one in use now is broadcastMessage: withUnpilotedOverride:. Also removed redundant ExpandDescriptionForCurrentSystem call in the commsMessage: withUnpilotedOverride: method. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1608 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-03 10:36:29 +00:00
Jens Ayton
30bce0b115 Great big lump o' stuff to deal with ship types and related things more cleanly. 
OOShipRegistry parses shipdata.plist, shipyard.plist, demoships.plist and new shipdata-overrides.plist and shipyard-overrides.plist, resolves like_ship inheritance, does some sanity checking, filters out various sorts of invalid shipdata and shipyard entries and manages role->ship key mapping with probability weighting.

The latter is managed by OOProbabilitySet, which should probably be used by OORoleSet and OOProbabilisticTextureManager too. OOProbabilitySet is O(log n) for random selection instead of O(n) like the current linear-search code.

The next step is to start using OOShipRegistry everywhere.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1607 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-03 00:58:21 +00:00
Nikos Barkas
edf000ec1d Implemented commsMessageByUnpiloted for legacy scripts and ship AI. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1606 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-02 17:43:40 +00:00
Nikos Barkas
7b546c09e3 Refactored +(NSMutableDictionary*)getNativeSize and made it return screen native size also under Windows. Minor indentation fixes to MyOpenGLView.m. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1605 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-02 05:42:57 +00:00
Jens Ayton
6521c91b02 Added swathes of pointless and annoying type casts to placate buggy gnu-gcc ObjC front end. Also fixed JS player.alertEnergy and player.alertHostiles under GNUstep. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1603 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-01 01:02:57 +00:00
Jens Ayton
1e3aec21f4 Fixed default value in string extractors (broken in last rev). Changed semantics of JS timer constructor to match documentation (negative delay gives paused timer). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1602 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-30 20:54:13 +00:00
Jens Ayton
ff322eafcb Fix for bounty and contract market credits display bugs. Fix for rounding of credits quantities. Added troubleshooting code to scanForNonThargoid. Suppress script.javaScript.context.create messages. Made property list extractors for strings auto-convert numbers. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1601 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-30 19:13:02 +00:00
Nikos Barkas
fc9ba4eb28 Set default multiplier values for star and nebulae to 2 and 1 respectively. Reverted to original star and nebula counts in interstellar space. Star count in system space is now halved if in reduced detail mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1600 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-30 07:39:05 +00:00
Nikos Barkas
fa3c4ed3c3 Attempt to fix bug whereby many ships leave the station with the wrong AI. See also http://www.aegidian.org/bb/viewtopic.php?t=4543 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1598 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-29 17:49:09 +00:00
Nikos Barkas
5a84f7600b Fixed a couple of parts of the HUD that were failing to disappear whenever HUD got switched off. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1596 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-29 13:36:57 +00:00
Jens Ayton
4933fb7796 Fix for ship.sanityCheck.failed messages. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1595 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-28 17:10:36 +00:00
Nikos Barkas
18ee20b861 Added star and nebula count multipliers in planetinfo.plist. Attempt to prettify skies by increasing the number of stars by a factor of 5 and the number of nebulae by a factor of 10. Also bumped version number on Windows/Linux build scripts. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1592 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-28 05:43:26 +00:00
Nikos Barkas
f370e1b502 Fixed [UNIVERSE sun] not returning the correct sun entity when in witchspace. Added the IsSunPredicate funtion. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1590 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-27 12:53:37 +00:00
Jens Ayton
12dc18297b Changed oolite-constrictor mission version to match release version. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1588 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-26 14:21:34 +00:00
Jens Ayton
30ee81765c Fixed script error in cloaking device mission. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1587 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-26 13:52:18 +00:00
Nikos Barkas
206e883362 Fixed crash on entering witchspace. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1585 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-26 11:49:59 +00:00
Nikos Barkas
943c55e1f3 Fixed mouse doubleclicking related problem in the load-save screen. Mouse status is now cleared upon entering a gui screen. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1583 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-25 14:50:50 +00:00
Jens Ayton
8f14df9fb3 Applied Adam Sampson's patch to makefile for Linux. Look forward to reports of it working, or not. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1582 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-23 18:10:07 +00:00
Jens Ayton
fba5cb83b1 Removed redundant [UNIVERSE gui] calls in PlayerEntityControls. Added Spotlight indexing of system name and made ship name visible in Get Info window (OS X only). Added new formatting functions for credit quantities, used throughout. DESC() now returns the key if no string can be found, to avoid exceptions. I18Ned OXP incompatibility message. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1581 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-23 16:56:23 +00:00
Jens Ayton
3046e3072f Fixed subentity flasher on/off code. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1580 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-23 00:39:13 +00:00
Jens Ayton
c2a748ab52 Since flashers now apparently work for subentities, made switchLightsOn and switchLightsOff do so too. Remove player from role set for NPCs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1579 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-23 00:03:41 +00:00
Jens Ayton
07d8d4ae50 I18ned Groolite mode strings. Use typographic multiplication sign for screen resolution strings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1578 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-22 16:13:03 +00:00
Jens Ayton
01c7ccbc10 Bumped version numbers (trunk to 1.72, 1.71-maintenance to 1.71.1). #ifed out redundant like_ship check in ShipEntity, with log message in event of it turning out not to be redundant. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1577 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-22 10:44:26 +00:00
Marc
80dfbf2bb6 Big-endian unsigned long long bugfix part 4! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1576 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-20 23:30:52 +00:00
Jens Ayton
b07b78a42d Fix for formatting mismatches between unsigned long long credit quantities and %d format specifiers. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1575 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-20 21:58:06 +00:00
Marc
431c04b2e5 1573 part 2: same fix applied to shipyard prices. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1574 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-20 21:08:14 +00:00
Marc
513ed2cc96 Possible 0cr bounty fix. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1573 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-20 20:23:01 +00:00
Jens Ayton
a56d0db571 Mac-specific spit and polish: stopped copying unused files in Xcode project, bumped version number of Spotlight indexer. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1570 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-20 16:13:52 +00:00
Nikos Barkas
4b8e36d0f8 Possible fix for the occasional texture corruption issue. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1569 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-20 16:13:16 +00:00
Jens Ayton
edc97898a2 Fix for non-shader material breakage in r1565. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1568 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-20 15:22:51 +00:00
Jens Ayton
a3cd6cf6ca Stuff from r1565-r1566, now with not doing the svn in src/. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1567 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-20 15:02:38 +00:00
Jens Ayton
02bc392335 Implemented music mode UI. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1566 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-20 14:38:09 +00:00
Jens Ayton
36eff7cb26 Fixes for subentity shader bindings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1565 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-20 13:19:25 +00:00
cmdrjames
35d3a61ba2 potential fix for [ Bug #12240 ] Ghost Cargo Pods 
Fixes some cases where cargo is left unscoopable, but there may be others.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1564 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-20 11:39:35 +00:00
cmdrjames
0805b6b6e8 minor change to text of logging 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1563 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-20 11:34:52 +00:00
Marc
17dc35ef1e bugfixed altimeter: now works correctly with the sun, and with n nested planets (as opposed to just 2 nested planets). Improved altimeter behaviour when planets are close to each other. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1562 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-20 01:21:32 +00:00
Marc
aa023b65a5 Materials: undone r1497 changes to OOMaterial.m and hopefully improved texture handling in OOShaderMaterial.m 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1561 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-19 17:46:50 +00:00
Jens Ayton
a09eb90389 Trimming down to four nebula textures, step 3 of 2 (syntax fix, updated Xcode project, updated contributors.txt). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1559 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-18 13:36:01 +00:00
Jens Ayton
92996fd787 Trimming down to four nebula textures, step 2 of 2. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1558 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-18 13:31:05 +00:00
Nikos Barkas
56a8907cb5 Checking in Eric's fix for the Constrictor mission incorrectly resetting mission briefing after the Constrictor has been destroyed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1556 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-18 09:43:22 +00:00
Nikos Barkas
a1d99539d6 Small fix for previous commit. HUD now does not switch off if game is paused and user presses 'n' without having switched it on first. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1555 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-16 13:36:26 +00:00
Nikos Barkas
ef293949bd Added setOverallAlpha HUD method. When in pause, the 'o' key will switch off the hud by making it fully transparent (could be useful for screenshots). The 'n' key (all debug flags off) will make the HUD reappear. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1554 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-16 13:13:01 +00:00
Jens Ayton
11e2d46271 Wrote unit tests for OOCollectionExtractors, as part of making them an independent library, and fixed several semantic bugs. Will port unit tests back to Oolite version. Also silenced an unimportant build warning using gcc 4.2 with -Wstrict-overflow=5. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1553 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-13 17:02:19 +00:00
Erich Ritz
c3f5a1f9bf Revert change to MAX_AXES and MAX_BUTTONS for mac as well. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1552 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-13 10:13:42 +00:00