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

3725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Werle
290e855b0b Fixes to deb-package builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4475 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-15 11:22:08 +00:00
Jens Ayton
0913e64d0b Fixed an OpenGL error. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4474 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-14 23:16:26 +00:00
Jens Ayton
cfb869eba9 Version bump. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4472 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-13 12:21:36 +00:00
Jens Ayton
14011511da Cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4471 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-13 12:14:13 +00:00
getafix
2d1aa63cd4 Makefile - fixed 'pkg-autopackage' build option (following r4431) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4470 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-13 09:06:27 +00:00
Jens Ayton
128e76cc10 Further improved :time macro by giving the temporary function being traced a name, and duplicated the pattern for :trace. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4468 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-13 00:35:00 +00:00
Jens Ayton
f13537c2a1 Fixed 32-bit Mac debug builds of libpng. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4467 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-13 00:34:18 +00:00
Jens Ayton
6a2f165d8a Removed redundant closure in previous commit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4466 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-12 23:40:56 +00:00
Jens Ayton
374beab871 Fixed :time macro. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4465 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-12 23:34:10 +00:00
Eric Walch
b8698a5785 Excluded expandDescription from the time limiter. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4464 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-12 21:53:15 +00:00
Jens Ayton
74da492e8e Added alternative galactic coordinate properties to SystemInfo and PlayerShip so both internal and LY coordinates are available in each context. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4463 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-12 19:09:43 +00:00
Michael Werle
e4089d38f8 Fix for bug #17995 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4462 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-11 22:36:53 +00:00
Michael Werle
b5d27a87e7 Fix for slow docking computer disabled during red-alert (Bug #17993). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4461 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-11 18:21:37 +00:00
Jens Ayton
3d524e5eed Changelog nit: "various" should be last. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4460 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-11 17:09:27 +00:00
Michael Werle
d595847214 Forgot to update the Changelog for last commit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4459 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-11 17:03:47 +00:00
Michael Werle
7e27039ae4 Interim fix for mass-dependent fuel prices (Bug #017947) 
- This fix hard-codes the value for the CobraMk3.  This may not work properly if the player uses another ship-set in which the CobraMk3 has a different mass.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4458 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-11 16:41:49 +00:00
Eric Walch
4b4ee366cc Corrected typo. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4457 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-11 10:31:09 +00:00
Jens Ayton
2cf7cfea37 Preliminary 1.75.1 release notes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4456 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-10 22:02:52 +00:00
Michael Werle
92eefdea2e Don't reduce NPC bounties on misjump. Fixes #17992. 
Reported here: http://www.aegidian.org/bb/viewtopic.php?f=3&t=9413


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4455 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-10 21:43:48 +00:00
Jens Ayton
fa23e7bc11 Set max_missiles to 4 for NPC cobra3. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4454 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-10 20:53:53 +00:00
Jens Ayton
67dd32dc17 [Mac] Removed custom configuration for libpng; too much bother for a 133 KiB saving. Fixes bug #17968. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4451 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-10 17:27:18 +00:00
Jens Ayton
1871d5edaa Fixed Mac deployment build breakage from r4439. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4450 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-10 17:18:18 +00:00
Jens Ayton
037592aea8 Removed unused log message class. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4449 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-10 16:02:05 +00:00
Jens Ayton
2a8c8c7fe0 Fix exception on setting more than 16 pending escorts. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4448 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-10 16:01:10 +00:00
Jens Ayton
7ec4ffbef7 Bumped SpiderMonkey to FF4rc1. No code changes needed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4447 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-10 15:50:22 +00:00
Jens Ayton
93294de189 Limited octree iteration depth for pseudo-volume calculations, thus restoring masses (except for very small objects), thus restoring mass lock behaviour (bug #17940). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4446 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-10 14:29:16 +00:00
Jens Ayton
70cab9b71b Added a note, added Nicolas Boulenguez to contributor list. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4445 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-08 16:55:27 +00:00
Jens Ayton
f15a119569 Mac build now uses PDF version of Read Me. RTFD version is gone. (Incidentally, has anyone noticed that the font size in the PDF is insanely, illegibly small? I suspect people want to be able to read it without printing it on A3 paper.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4444 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-08 16:14:54 +00:00
Michael Werle
0ff18e7dd8 Convert download scripts to /bin/sh, as requested by 'Spooky' for better compatibility with FreeBSD (and other Unices). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4443 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-08 15:23:01 +00:00
Jens Ayton
920f41925b Semi-fix for spawn() on subentities: instead of spawning near the witchpoint, they spawn relative to the parent. The effect is disappointing, as they're distributed too widely, but at least comprehensible. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4442 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-07 22:38:14 +00:00
Jens Ayton
bce1bf09d8 Style tweak. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4440 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-07 22:34:35 +00:00
Jens Ayton
cd41d9f67e Fix -- well, band-aid -- for the Four and Halfth Crash of Commander McLane (http://aegidian.org/bb/viewtopic.php?f=3&t=9383); also, avoid subscribing to events for every single HID device. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4439 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-07 20:58:56 +00:00
Eric Walch
d915a49dcd - Changed the priority order for the docking computer in the mainStation eagis. 
- Fixed a deprecated (but probably never used) command in the cloaking device script.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4438 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-07 20:55:48 +00:00
Nikos Barkas
9d2b1f558a Fixed exception when more joysticks than MAX_STICKS were detected. Also eliminated a couple more NSLog occurences. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4437 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-06 19:01:05 +00:00
Michael Werle
08bdbe1ef1 More debian build tweaks. 
- removed 'espeak-data' from package
 - by request, cleaning the package also dist-cleans libjs

Also updated copyright notice and man page.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4436 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-06 03:52:13 +00:00
Eric Walch
c01796f709 - Clean ships, changing target to another offender ship, no longer get a bounty themselves. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4435 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-05 13:24:21 +00:00
getafix
4bc17dc2e5 Makefile - on 'distclean', Javascript will also 'distclean' (following r4420) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4434 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-05 06:51:29 +00:00
Michael Werle
200902f9da Applied a (slightly tweaked) patchset sent in by Nicolas Boulenguez, the Debian maintainer of Oolite. 
Changes consist of:
 - use #include instead of #import for C header files.
 - explicitly #include <assert.h> in various source files.
 - tweaks to build process for Debian.
 - deleted obsolete src/SDL/make* package building scripts.

"Works for me" - please check build process still works for you; esp. on Windows
.



git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4433 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-05 03:14:05 +00:00
Jens Ayton
24d92c67e4 Fixed attribute stack imbalance in OOBreakPatternEntity. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4432 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-04 21:46:26 +00:00
Michael Werle
36130bed1b Makefile improvements as suggested by Spooky on the BB to improve interoperability with other Unices (Patches provided). 
(See http://aegidian.org/bb/viewtopic.php?f=5&t=9363)
 - change 'make' to '$(MAKE)' throughout
 - similar for other commands
 - Use '-u' switch for 'cp' only for Windows and GNU OSes.
 - convert GNUmakefile.postamble from DOS to Unix file-endings

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4431 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-04 19:21:17 +00:00
Jens Ayton
10cc064d27 Comment cleanup from r4427. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4430 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-04 17:21:16 +00:00
Nikos Barkas
2aa071ffe6 Fixed bug with zero-delay timers firing twice on Windows. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4429 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-04 16:28:43 +00:00
Eric Walch
81011a92b0 mission.runScreen({titleKey: "foo"}) is working again. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4428 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-04 14:13:35 +00:00
Jens Ayton
870edd713c Fixed credit multiplication bug. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4427 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-04 12:20:51 +00:00
Nikos Barkas
031848917f Fixed some spelling in mission texts. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4426 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-03 09:23:25 +00:00
Michael Werle
26ae55c232 Fix for #17975 - exclude setting of planetary textures from the JSTimeLimiter. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4425 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-01 22:07:44 +00:00
Nikos Barkas
9b51f4a018 Undid commit of r4422. The string that I tried to localize was not meant for screen display, only for logging. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4424 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-28 23:44:54 +00:00
Jens Ayton
c703289b4a Mac 32-bit build fix. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4423 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-28 23:25:54 +00:00
Nikos Barkas
ae2cbbc607 Changed literal string inside wormhole description to its i18n mapped in descriptions.plist equivalent. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4422 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-28 08:57:21 +00:00
Nikos Barkas
a3ce242582 Eliminated build warning. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4421 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-28 00:03:41 +00:00