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

3688 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Werle
cbce376119 Major Wormhole fixing. 
* Mainly the fix for interstellar wormholes: http://aegidian.org/bb/viewtopic.php?f=3&t=9283
** Wormholes now use coordinates rather than seeds for their origin and destination (extra keys in savegame)
* Also various other fixes for ships following the player ship
** Escorts of ships following the player now also follow
** Escorts can't overtake their mother into the wormhole
* Some code refactoring:
** All ships now enter wormholes through [ShipEntity enterWormhole] instead of variously calling [WormholeEntity suckInShip:]
** Removed the static wormhole in ShipEntityAI.m

Unrelated:
* Makefile - only clean Javascript on 'distclean', not on 'clean'.



git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4420 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-27 23:29:34 +00:00
Eric Walch
8e45928422 Removed the bit that always set the player status to STATUS_DOCKED at the end of missionscreens without choices. It is wrong because a missionscreen could have been set up in flight, triggering a inconsistent state. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4419 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-27 14:36:49 +00:00
Jens Ayton
15858be796 Several fixes related to credits handling: 
* Credit assignments from JavaScript now correctly truncate to 64-bit
  decicredit values. Previously, on 32-bit systems they'd be truncated to
  32-bit decicredit values, and on 64-bit systems overflowing values would
  wrap. This was especially problematic since extracting the maximum credit
  value to a JS number and then putting it back would set credits to 0.
* When loading saved games, floating-point credits values go through the same
  clamping logic as JavaScript assignments. This fixes the equivalent problem
  of maximum credits values being treated as 0 on load.
* Legacy awardCredits: now uses 64-bit arithmetic.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4417 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-27 12:06:53 +00:00
Jens Ayton
e4abe5c15f Added entityDestroyed ship script event. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4416 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-27 11:15:01 +00:00
Jens Ayton
e701ddd4c4 Fixed a typo. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4415 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-27 11:11:16 +00:00
Eric Walch
840492dc88 - removed a reason for thargoid escorts attacking other thargoids. 
- removed a reason for escorts not attacking again a de-cloaked target.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4414 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-27 09:54:24 +00:00
getafix
2991bf77b9 [Linux] SpiderMonkey build fix - Do not build test libraries & programs 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4413 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-27 09:20:30 +00:00
Eric Walch
fe76628531 - Corrected random lasershots by thargoids in the [0,0,1] direction. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4412 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-26 18:33:34 +00:00
Eric Walch
4869900942 - Lowered the distribution range for ships added with 'addShipsToRoute' to MAX_SCANNER_RANGE 
- Groups added with this command are now added closer to each other.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4410 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-26 13:51:31 +00:00
Jens Ayton
71e7128d73 Updated to FF4b12 SpiderMonkey for Mac; code now requires this version due to an API change. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4409 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-26 10:30:27 +00:00
Michael Werle
4f4fafe255 Better fix for r4402 - removes reliance on Universald IDs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4407 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-25 22:15:31 +00:00
Michael Werle
6f383ef3ba Simplest fix for the not-following-player-through-wormhole bug. 
See: http://aegidian.org/bb/viewtopic.php?f=3&t=9263



git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4402 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-24 23:00:33 +00:00
Jens Ayton
1d5edda0d0 Correct script target for legacy script_items in CARGO_SCRIPTED_ITEM scoopables. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4401 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-24 19:03:24 +00:00
Nikos Barkas
19271bda03 Set timestamps in log messages default to YES. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4400 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-23 23:19:44 +00:00
Jens Ayton
8434e83af3 [Mac] Support for game pads that actually describe themselves as game pads rather than joysticks. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4399 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-23 22:26:50 +00:00
Jens Ayton
0532597b11 JS: Removed redundant implementation of isPlayer on Ship (we have one on Entity). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4398 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-23 19:49:38 +00:00
Jens Ayton
cab766e81b Commented some things. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4397 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-23 19:41:34 +00:00
Jens Ayton
fbaaec461f Fixed credits formatting on game over screen. gameoverscreen-score-@-f is now gameoverscreen-score-@. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4396 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-22 23:46:37 +00:00
Jens Ayton
1bb89377ce Added logging for about-to-load-JavaScript, and enabled it by default (for 1.75.1) to catch a crasher. http://aegidian.org/bb/viewtopic.php?f=3&t=9223 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4395 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-22 21:27:54 +00:00
Eric Walch
6d1743d8c8 - Spelling corrections. 
- Reverted a accidentally committed file

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4394 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-22 20:02:08 +00:00
Eric Walch
5959f6b60e - Corrected problem with legacy_addShipsAtPrecisely() and escorts 
- Spelling corrections.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4393 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-22 19:28:12 +00:00
Jens Ayton
72bb9e10fa [Mac] Right-click/touchpad release no longer recenter cursor on map screens. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4392 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-21 00:06:25 +00:00
Eric Walch
a23f7d3d32 Corrected the wormhole shrink behaviour in nova systems. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4391 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-20 22:05:51 +00:00
Jens Ayton
85a85701f0 Commented on SystemInfo.systemsInRange(). Ideally, it would have been deprecated in 1.75 in favour of system.info.systemsInRange(), but it wasn't and in fact only SystemInfo.systemsInRange() works in 1.75. SystemInfo.systemsInRange() is now discouraged, and will soon be undocumented. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4390 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-20 20:16:44 +00:00
Jens Ayton
5a83148e65 Fixed SystemInfo.sytemsInRange() and SystemInfo.prototype.systemsInRange() (broken in prototype fixup). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4389 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-20 20:09:30 +00:00
Nikos Barkas
09fcf332f6 Fix division by zero error when an still entity is forced into a wormhole. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4388 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-20 18:38:11 +00:00
Nikos Barkas
4f2fd896c7 Stray NSLog elimination. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4387 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-20 16:54:35 +00:00
Eric Walch
ebdb82a6de Added a check to prevent the ' Jousting' after a hit observed by Switeck. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4386 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-20 13:02:42 +00:00
Michael Werle
a2790a34da Improvements to libjs makefile: only reconfigure/rebuild when necessary. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4384 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-20 10:09:29 +00:00
Jens Ayton
79949f2eba Version bump. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4383 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-20 09:51:22 +00:00
Nikos Barkas
1f08aff035 The Windows uninstaller does not do an unconditional clean up of the root game folder anymore. It deletes only the few specific files that are installed by default, thus avoiding potential accidental user files deletion. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4382 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-20 09:41:16 +00:00
Jens Ayton
b17b6ba45a Removed JS compatibility warnings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4381 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-20 09:27:51 +00:00
Marc
ec7e8d27e0 - include all weapons and missiles with equipmentStatus() to keep things simple for oxpers. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4380 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-19 16:58:57 +00:00
Jens Ayton
84d3113061 Fixed exception loading ships with no roles specified. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4379 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-19 10:09:05 +00:00
Marc
188c0f4f35 'Credits' changed to 'credits' in processEscapePods. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4378 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-19 07:40:35 +00:00
Nikos Barkas
4f94bfdec5 Fixed joystick in SDL builds getting the wrong deadzone value, resulting in noticeable drift. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4377 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-18 23:36:27 +00:00
Michael Werle
0ad42dc3d0 Minor tweaks to Debian packaging - source package needs to rely on zip and curl for auto-building. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4376 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-18 23:20:27 +00:00