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

1468 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jens Ayton
bbd9c0ef23 Ye bigge version number bumpe. Also removed deprecated JS stuff that's been around for two versions, and added :logOn and :logOff console macros. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1828 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-03 17:55:32 +00:00
Jens Ayton
d117dca7c6 Removed some debug code accidentally left in supposed 1.72. Nothing to see here, move along... 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1827 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-02 14:35:54 +00:00
Jens Ayton
9a99a28cdf Added user-contributed BBC-style keyboard config in tools/ 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1825 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-02 14:06:02 +00:00
Jens Ayton
72e048bb72 Real fix for bug #14618 (mass lock from leaked planet miniatures): call [UNIVERSE removeDemoShips] on player launch to clean up any GUI planets or ships. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1824 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-02 14:00:32 +00:00
Jens Ayton
2ec9fb8a21 Use native exception syntax for final and test release builds under OS X, to avoid the bugs the old macros can cause. Can't switch fully because there's no support in stable GCC for Windows. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1822 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-01 14:27:31 +00:00
Jens Ayton
9ad01ddc33 Fix for octree generation bug. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1821 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-01 13:40:56 +00:00
Nikos Barkas
81adc45368 Upgrading the Windows port to GNUstep version 1.15.3, with significant performance boost results. Adjusted install scripts accordingly. Removed redundant NSApplication import from main.m. Deleted non used libraries from the Windows dependencies. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1820 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-31 20:45:09 +00:00
Nikos Barkas
30d8d1f3ac Halve star sizes. It looks a bit better (or at least that's what most people think). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1819 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-31 17:08:35 +00:00
Jens Ayton
5468ad980f Added CARGO_CARRIED to shipdataEntrySchema.plist. Rearranged IsPlanetPredicate() for better branch prediction. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1818 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-31 15:54:40 +00:00
Michael Werle
6e5ec9ecf1 Fix for 'setlocale()'compiler warning when compiling under Windows and 
GNUstep 1.15



git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1817 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-31 13:00:48 +00:00
Nikos Barkas
5fda775689 Corrected comment describing type of P.dockingClearanceStatus property. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1814 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-26 13:39:27 +00:00
Nikos Barkas
2d110bd521 Made the JS method player.dockingClearanceStatus return a string describing the docking clearance status instead of an integer. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1813 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-26 13:31:05 +00:00
Nikos Barkas
2c1c60f6e1 Made the player's docking clearance status visible from JavaScript. For now, read-only. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1812 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-26 12:34:23 +00:00
Nikos Barkas
9d28a5f72e Fixed a bug where station would send a clearance granted message to player when player docked after ignoring request to wait in line. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1811 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-25 15:42:26 +00:00
Jens Ayton
2158de017c Made JS missionVariables (and script converter) stricter about what they consider to be numbers. Stuff like 2HRS_TO_ZERO are no longer converted to numbers when they shouldn't be. Deleted toos/ScriptCompiler since we no longer support .oos scripts. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1810 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-25 14:50:30 +00:00
Jens Ayton
e58f903a79 Random Unicode quotation mark extraction, yay. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1807 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-22 18:37:45 +00:00
Nikos Barkas
83a5b7f2af Changed some platform specific references to OOLITE_WINDOWS / OOLITE_LINUX for consistency. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1806 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-22 13:39:53 +00:00
Jens Ayton
39d9547f2a Supress generation of escorts for ships shown with showShipModel:. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1804 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-21 22:32:28 +00:00
Jens Ayton
0df8ba731c Copy & paste error. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1801 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-17 23:10:30 +00:00
Jens Ayton
53e8c39d94 Eating own dogfood. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1800 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-17 23:09:12 +00:00
Jens Ayton
3c106c962d Added effectiveTechLevel property to JS EquipmentInfo - like techLevel, but takes TL 99 and mission_TL_FOR_EQ_FOO into account, and can be written (which just sets mission_TL_FOR_EQ_FOO). Also renamed EquipmentInfo.identifier to EquipmentInfo.equipmentKey for consistency. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1799 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-17 22:33:39 +00:00
Jens Ayton
5b57e1251f JS ship.remove() now silently fails for the player ship. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1798 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-17 21:40:49 +00:00
Nikos Barkas
77ec994a4f Added OOJSEquipmentInfo.m to GNUmakefile. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1797 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-17 06:26:12 +00:00
Jens Ayton
f575d75530 Added JS EquipmentInfo, wrapper around OOEquipementType. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1796 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-16 22:04:29 +00:00
Jens Ayton
20f02191c8 New JS player.ship properties: forwardShield, aftShield, maxForward/AftShield, forward/aftShieldRechargeRate. New JS event hooks: equipmentDamaged(), equipmentDestroyed(). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1795 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-16 20:19:47 +00:00
Jens Ayton
c3217ad744 Workaround for yaw/roll conflict for BBC key config: if roll and yaw are both assigned to ./,, disable yaw controls. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1794 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-15 23:11:04 +00:00
Jens Ayton
16053d711c Abortive attempt to make planet rendering use new texture system resulted in some generalization and bug fixing in materials. Removed vec3 as alias for vector in uniform specs, since they're actually vec4s. Removed some dead code from not-quite-dead-yet OOSelfDrawingEntity, which had a never-used dependency on old texture system. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1793 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-15 22:58:10 +00:00
Nikos Barkas
d30e46fb02 Fix a little issue where docking clearance cancellation messages would appear on screen even if no clearance had been given, every second time player pressed 'L'. Reverted AI code fix from previous commit, as it was resulting in idle ships being launched from stations. Set default rock hermit docking clearance requirement to no. Adjusted a little the docking clearance messages to make sense also in the case the issuing station is not a main one. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1792 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-11 08:30:12 +00:00
Jens Ayton
579e97ef82 Fixed double AI init bug #14626. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1791 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-09 17:51:38 +00:00
Michael Werle
addc42eb68 Changes to Docking Clearance functionality (Feature Request #4327): 
* Now works at all stations, not just main stations
* Player ships get placed into a 'docking queue' when requesting clearance
  * Station notifies player when queue-slot expires and gives chance to extend
  * Player can cancel docking-request
* Stations not requiring docking clearance now respond with an appropriate message



git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1790 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-08 06:58:32 +00:00
cmdrjames
18dd2b810e Remove a nasty infinite loop which was caused by qr = 0 which lead to co_amount being set to -1, which then caused [self getRandomAmountOfCommodity:co_type] to return 0. As we were adding 0 on each iteration, the loop was never exited: 
while (co_amount < 30) {
					co_amount += ((1 + (Ranrot() & 31)) *  (1 + (Ranrot() & 15)) * [self getRandomAmountOfCommodity:co_type]);
				}

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1789 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-06 23:22:00 +00:00
Nikos Barkas
4d974808e8 Got uninstaller to remove the Logs folder during game uninstall under Windows. Removed some text from the Readme file that was valid at the time of v1.65, but not anymore. Added Micha to the contributors list. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1788 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-06 18:19:23 +00:00
Michael Werle
1cf2d3b12d Fixes for bugs #014568, #014618, and #014643. 
For #014618, left the original distance calculation instead of the one suggested in the bug report as that seems to work for people.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1787 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-06 16:54:03 +00:00
Michael Werle
5cee623847 Fixed Screen-Window toggle not restoring Window size bug (#014642). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1786 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-05 19:30:55 +00:00
Nikos Barkas
bcca7e0997 Fix for Bug#014633: Non-main station always generates docking penalties. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1785 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-04 09:59:03 +00:00
Jens Ayton
ea02aac931 Line ending conversion for log files. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1784 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-03 23:44:48 +00:00
Jens Ayton
fa182670a7 Mac build now has docking clearance enabled. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1783 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-03 18:41:50 +00:00
Nikos Barkas
ca028eaad7 Small omission: Added the docking clearance feature also to the Linux build. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1782 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-03 17:00:38 +00:00
Nikos Barkas
f19493afbc Sanity for the Windows buid: OOLITE_LINUX is no longer defined. Oolite now compiles with the docking clearance feature set, however the related guards remain in the code. A couple minor tweaks. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1781 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-03 16:55:36 +00:00
Nikos Barkas
44ed33afe2 Minor correction to make logs under Windows go under their intended folder. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1780 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-01 05:38:45 +00:00
Jens Ayton
1b37882d42 Corrected -description of some OOShaderUniform types. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1779 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-01 00:14:04 +00:00
Jens Ayton
6c0d0cc761 Upgraded to Smart Crash Reports SDK 1.5 (for Leopard support). Mac OS X TestRelease configuration will not build without the updated SDK (download from smartcrashreports.com). Also included: a missing file from r1777. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1778 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-29 21:04:01 +00:00
Jens Ayton
6528a2f38f Hopefully log to <app dir>\Oolite\Logs under Windows. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1777 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-29 20:26:09 +00:00
Jens Ayton
7c4f0e7a98 Send OXP verifier logs to log directory under Linux. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1776 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-29 09:48:56 +00:00
Jens Ayton
a9f7317991 Logging to ~/.Oolite/Logs/Latest.log instead of stderr under Linux, part 2 of 2. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1775 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-29 09:36:17 +00:00
Jens Ayton
f28d1f589d Logging to ~/.Oolite/Logs/Latest.log instead of stderr under Linux, part 1 of 2. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1774 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-29 09:34:31 +00:00
Jens Ayton
47563b5518 Added uniform types for random numbers, vectors and quaternions. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1773 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-28 17:39:49 +00:00
Nikos Barkas
5e8da50afc Added the key stations_require_docking_clearance to the universal section of planetinfo.plist. Added logging of native display mode under Windows and Linux. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1772 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-28 10:25:13 +00:00
cmdrjames
7814a2ba28 Fixes for AI from: Eric Walch 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1771 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-26 20:10:24 +00:00
Jens Ayton
a7771707ec Fixed missile collision bug as per eric's analysis. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1770 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-26 08:53:12 +00:00