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

1641 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Nikos Barkas
5a0a0a1184 Added the requires_docking_clearance key for stations in shipdata.plist. Defaults to NO. Added the read/write JS property requiresDockingClearance. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1769 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-24 10:08:39 +00:00
Nikos Barkas
711b189d38 Further improvements to docking clearance. Penalty of 5 percent of credits amount with a ceiling of 5000 Cr applied for anauthorized docking. Station responses to docking clearance selected from lists. No penalty applied when sun is going nova. Only fugitive players are denied clearance to dock. All the above still needs -DDOCKING_CLEARANCE_ENABLED to be compiled in. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1768 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-23 09:51:14 +00:00
Nikos Barkas
3f9ea4d02b Improved implementation of docking clearance request. Added the playerRequestedDockingClearance script handler. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1767 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-21 21:14:54 +00:00
Jens Ayton
16fa3fb94b Added ability to pass parameters using sendScriptMessage: 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1766 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-21 15:57:06 +00:00
Nikos Barkas
9ed1b38567 Very basic initial implementation of docking clearance request. DOCKING_CLEARANCE_ENABLED must be defined in order to compile this in. Moved related hardcoded strings out to descriptions.plist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1765 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-21 13:01:19 +00:00
Jens Ayton
ee4e599ebf Fixed memory management bug in modified texture code. Simplified code by adding singleton OONullTexture. Minor tweaks to reduce clang static analyzer messages. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1764 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-18 23:09:56 +00:00
Nikos Barkas
b99dc5cc56 Added Eric's proposed playerBoughtEquipment script event handler. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1763 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-17 14:27:22 +00:00
Nikos Barkas
cea5c716dd Fixed textures related crash (not sure if this fix is the best possible, as it is mostly a revert of some code entered at revision 1759, but since it does not seem to crash on modern hardware anymore, it will have to do for now. Testing will be required). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1762 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-13 14:50:58 +00:00
Nikos Barkas
e06aa2a400 Applied a slightly modified version of CmdrLUke's and Cmdr Wyvern's code for joystick deadzone control. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1761 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-07 11:44:23 +00:00
Nikos Barkas
2c8bb802cb Increased default joystick deadzone from 0.02 to 0.05 in hope of achieving slightly better joystick response. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1760 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-05 14:11:10 +00:00
Jens Ayton
c2349842e3 Fixed build with NO_SHADERS defined, and other fixes for Irix. Also fixed some faulty logic confusing textures and materials. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1759 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-02 17:11:07 +00:00
Jens Ayton
5458fc508c Improved error messages for JS addShips commands when passing insufficient parameters. Four static analysis diagnostics fixed: one real one-time memory leak, one false alarm about a memory leak due to silly memory managment, a potential uninitialized variable in key config set-up, and one bug in the clang static analyzer fixed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1758 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-02 00:41:41 +00:00
Jens Ayton
8b5d9523c0 Some missing shipdata verifier things. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1757 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-01 19:15:52 +00:00
Jens Ayton
3f07f2230c Fiddling with script converter, and bunch of scripting changes as a result: added player.rank, player.legalStatus, system.countShipsWithPrimaryRole(), system.pseudoRandomNumber, system.pseudoRandom100, system.pseudoRandom256; renamed Ship.shipDescription to Ship.name and Ship.shipDisplayName to Ship.displayName. Also, JS console script now strips out trailing line breaks. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1755 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-01 18:21:21 +00:00
Jens Ayton
705c2aa739 Cleanup and tweakage. Assigning null to a mission variable in JS now deletes it. incomplete JS console lines that are buffered rather than executed are prefixed with _ instead of >. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1753 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-31 18:49:19 +00:00
Nikos Barkas
513bfaccef Reverted experimental code from revision 1748, due to GCC 3.4.2 not being able to handle native ObjC exception syntax. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1752 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-30 16:37:15 +00:00
Jens Ayton
8d71d62b2d Fixed JS system.shipsWithPrimaryRole() as in r1751. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1751 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-30 02:21:49 +00:00
Jens Ayton
379bd91c6d Fixed JS system.filteredEntities(), entitiesWithScanClass() and shipsWithRole() (all were completely non-functional). Added groovy new entity-finding console macros: :nearest, :tnearest, :find, :findS, :target (see debugConfig.plist). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1750 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-30 01:43:00 +00:00
Jens Ayton
c3da65606f Fixed some OXP verifier issues, twiddled OOCocoa.h so clang static analysis works again. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1749 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-29 20:44:06 +00:00
Jens Ayton
28727321da Experimentally checking in some native exception syntax to see if it breaks anyone's build. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1748 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-29 20:26:15 +00:00
Nikos Barkas
9c5d0b418e Fixed a small language problem with MinGW. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1747 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-26 06:01:50 +00:00
cmdrjames
03e2e67761 [ Bug #13945 ] escorts don't have turrets in 1.71.2 
There was a look which didn't stop when it got to the ship which owns the subentity, and went up the chain to the group leader.  I have also changed docking behaviour, as during my testing I found that anyone docking would ignore me when I attacked it.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1746 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-25 11:14:53 +00:00
cmdrjames
bedf7cbecc Collision detections were previously set for both ships that were close, but were tested for independently. This gave the impression that maybe only one party would be alerted. I think there is still a problem though, I think ships will normally not avoid collisions with carriers (as they are stations) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1745 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-25 09:43:22 +00:00
cmdrjames
75806ac5e3 Simple fix for traders crashing after launch. Discussed here: http://www.aegidian.org/bb/viewtopic.php?t=4906&highlight= 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1744 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-25 09:27:55 +00:00
Jens Ayton
4d59905fc8 Fix for JS Entity.isValid not working for invalid entities. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1743 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-24 22:32:11 +00:00
Jens Ayton
5307011661 More happy loose end fun. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1742 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-24 22:30:11 +00:00
Jens Ayton
86859ce8e9 Cleaning up my mess. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1741 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-24 22:13:59 +00:00