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

3837 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jens Ayton
a33912483e Fix for bug #18083 (dangling equipment references): stop updating if session ID changes, i.e. game has reset. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4542 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-05-07 08:46:45 +00:00
Jens Ayton
e5ad9aafa7 Session ID reset now only happens on reset (derp). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4541 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-05-07 07:41:56 +00:00
Jens Ayton
3390d5e0e6 Fix for descriptions.plist verifier when using missile icons defined in XML plists. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4540 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-05-06 12:32:59 +00:00
Jens Ayton
1716b3df43 Test for malicious formatting strings in descriptions.plist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4539 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-05-05 09:40:08 +00:00
Jens Ayton
2835103894 Added code to verify that entites added to the universe were created in the current game session - specifically to try to avert bug #18083, but also a good general consistency check. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4538 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-05-05 09:01:25 +00:00
Jens Ayton
0a737c94a7 Fixed range of broadcastThargoidDestroyed, which was broken when switching to the predicate system for searching. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4537 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-05-04 17:31:31 +00:00
Jens Ayton
35ecbe0fab Removed logging, which isn't getting us anything. Also reenabled JavaScript usless-expression warning. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4536 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-05-04 07:05:17 +00:00
Nikos Barkas
6be6ffc624 Fixed a typo in the Oolite Reference Sheet's credits box. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4535 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-05-01 21:39:01 +00:00
Jens Ayton
396a29a9c1 Removed patent nonsense from default vertex shader. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4534 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-05-01 16:10:30 +00:00
Eric Walch
a8aa0fc2e8 - fuel-leak now stops after death. 
- station launch is now checked every 2 seconds after the initial 6 seconds.
- corrected my last wormhole rings commit: Only ships leaving after the player should get them.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4533 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-05-01 09:46:36 +00:00
Marc
5b83750a31 More on fuel prices: 
- implemented dynamic version of fuelChargeRate.
 - removed protected fuel_charge_rate variable from shipEntity object.
 - initial implementation of post-MNSR - more accurate - fuel ratio calculations, bracketed by '#if 0's

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4532 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-29 21:27:55 +00:00
Jens Ayton
9e9a8da3b8 Mouse control mode no longer incorrectly starts in mouse-yaw mode (Bug #18052). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4531 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-28 19:01:56 +00:00
Jens Ayton
aee593fa13 Fixed some comments. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4530 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-28 18:47:04 +00:00
Jens Ayton
f4e20b12d5 Generated planet textures are now mip-mapped, and generated emission maps now inherit options (in particular, mip-mapping) from their source textures (in order of precedence: emission_and_illumination_map, emission_map or illumination_map). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4529 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-27 22:02:17 +00:00
Jens Ayton
92749b1a1e Subentity mass is now accounted for correctly. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4528 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-27 19:26:11 +00:00
Jens Ayton
2fdf7f25b6 Handle missing planet textures more gracefully. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4527 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-26 16:28:31 +00:00
Marc
b05f83cc8c Fixes to fuel/mass prices: 
- always uses the current cobra3 mass as its base mass.
 - no on-the-fly fuel rate recalculations anymore.
 - removed the (already marked for '#fuel charge testing' only) fuel_charge_rate savegame key.
Clean up: an initial setup method inside Universe now has a more meaningful name.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4526 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-26 10:03:31 +00:00
Jens Ayton
a1b28ecb52 Rolled back r4524. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4525 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-24 23:21:50 +00:00
Marc
69fa821072 Heat shields now compatible with strict mode... fixed one standard mission in strict mode, and made fuel collecting in strict viable again. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4524 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-24 16:16:03 +00:00
Eric Walch
34b4427b41 - Ships disgorging from wormholes now also use witchspaceLeavingEffects 
- Pirate Escorts now correctly follow their leaded trough a wormhole
- Added the AI message ACCEPTED_ESCORT to be able to send attack instructions to the escort when self in fight.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4523 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-24 10:07:33 +00:00
Jens Ayton
54780c3ac8 Fixed a punctuation error. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4522 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-22 17:54:41 +00:00
Jens Ayton
730c2ee7ad Like r4520, but a few lines down. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4521 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-21 22:10:22 +00:00
Jens Ayton
5c6ddfd9bd Removed a misleading comment. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4520 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-21 21:54:33 +00:00
Nikos Barkas
9541bba187 Fix for part of bug #18082: The origin system the player has (mis)jumped from is now included in the list of possible destinations for an NPC scripted system exit, when in interstellar space. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4519 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-20 20:30:44 +00:00
Nikos Barkas
30161ff021 Tentative fix for friendly fire events triggering battles between NPCs. Introduced the -isFriendlyTo: method in ShipEntity, currently used exclusively by -setTargetToPrimaryAggressor. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4518 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-20 12:42:29 +00:00
Nikos Barkas
dde231fe0d Fixed bug #18068 (Ships from wormholes aren't added to beacon list). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4517 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-17 16:10:22 +00:00
Nikos Barkas
bfc8d51069 Better fix for long distance targeting bug (Berlios #18011). The previous targeting behaviour is now maintained. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4516 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-15 15:01:12 +00:00
Jens Ayton
797a3a73b6 Libpng version update. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4513 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-12 18:12:48 +00:00
getafix
f6a0d8b3ac POSIX installer - Package name according to build mode. 
pkg-posix (release-deployment)        - oolite-MAJ.MIN.REV.linux-ARCH.run
  pkg-posix-test (release)              - oolite-MAJ.MIN.REV-(test, beta, rc1, etc.).linux-ARCH.run
  pkg-posix-snapshot (release-snapshot) - oolite-MAJ.MIN.REV.SVNREV.linux-ARCH.run
  pkg-posix-nightly (release-snapshot)  - oolite-trunk-MAJ.MIN.REV.SVNREV-dev.linux-ARCH.run


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4512 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-12 15:52:33 +00:00
Nikos Barkas
cfb54ae6c7 Fixed bug where a ship was apparently attacking itself whenever one of its subentities was taking energy damage. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4510 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-12 12:22:57 +00:00
getafix
ffd1ab6603 POSIX installer - Redirected 'which' stderr to /dev/null in the post-extraction setup script. 
In some distros (e.g. Fedora 11, Mint 10 Julia) the 'which <filename>' command 
                  uses stderr to report a filename not found or other warnings.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4509 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-04 20:00:57 +00:00
Nikos Barkas
f0ca994e6d Fixed scripted misjumps not working when set from within the shipWillEnterWitchspace handler for wormholes created by ships other than the player. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4508 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-03 20:45:33 +00:00
getafix
7a9d03e456 POSIX new installer - Updated to facilitate rsync repository setup for oolite-update script 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4507 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-03 16:31:48 +00:00
Jens Ayton
93e798ed93 Fixed leak of every entity in system in sendAllShipsAway (introduced in r2491). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4506 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-02 12:32:29 +00:00
Jens Ayton
66a27ce9d8 Added an impulse to the player's escape pod on launch, making it harder to fly through the doppelgänger. (Bug #17919) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4505 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-02 11:31:52 +00:00
Jens Ayton
5ce16b9d74 All clock adjustments are now additive (Bug #17969). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4504 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-02 10:03:39 +00:00
Michael Werle
2d72212f21 Another #include fix reported by Nicolas Boulenguez. 
For more details, see Debian bug #614277.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4503 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-01 20:16:11 +00:00
Jens Ayton
32e521da25 shipSpawned() now fires for the main station, but launch_actions still do not. See http://aegidian.org/bb/viewtopic.php?f=3&t=9520 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4502 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-01 16:46:15 +00:00
Jens Ayton
d922713702 Fixed legacy ship action bug where scriptTarget was being set to target. Totally different! Obviously. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4501 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-31 20:42:37 +00:00
Jens Ayton
a943c4d41a Cleaned up various script.foo.trace log message classes so they can actually be used to debug stuff. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4500 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-31 20:41:56 +00:00
Nikos Barkas
873c1b6546 Fixed bug when generating system information for systems sharing the same coordinates in the same galaxy. Suppressed bogus internal error message when galactic jumping. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4499 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-30 20:59:54 +00:00
Jens Ayton
08f5c8fd03 Fixed crash when garbage collection is triggered during JS engine reset. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4497 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-30 18:03:37 +00:00
getafix
bf1961bcd5 POSIX new installer - automatic spawning of a new terminal in X11 when 
a non-nightly installer is started from the desktop.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4496 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-27 22:03:25 +00:00
getafix
113cb53fcb pkg-posix-nightly - produced package now installs unattended. 
If the user is root then the installation is system-wide, else
it is installed in the user's home directory, without asking.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4495 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-27 17:06:58 +00:00
getafix
2544ec26dc Packager target added for new POSIX packager (r4492): 
* pkg-posix-nightly   - builds a release self-extracting package


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4494 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-27 14:30:25 +00:00
Jens Ayton
67aa1fb371 Default HUD roll and pitch indicators no longer overlap. (Bug #17916) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4493 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-26 19:16:16 +00:00
getafix
b386776e8b Added new packager for POSIX (e.g. FreeBSD, Linux etc.). 
Stéphane Peter's makeself.sh script (http://megastep.org/makeself/) is
used to produce the installers/posix/oolite-<version>.x86[_64].run 
self-extractible package.

Packager targets added:
 * pkg-posix           - builds a release self-extracting package
 * pkg-posix-test      - builds a test release self-extracting package
 * pkg-posix-snapshot  - builds a snapshot release self-extracting package


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4492 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-26 13:58:16 +00:00
Jens Ayton
3b5e5cb2e3 NPC ship Q-bombs added with has_energy_bomb are now represented as EQ_QC_MINE rather than EQ_ENERGY_BOMB. This change should also make NPCs able to use Q-bombs added through scripts. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4491 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-25 18:04:33 +00:00
Jens Ayton
5e5ff684ff Fixed crash (dangling pointer) in AI reactToMessage: stack dump. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4490 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-25 00:44:58 +00:00
Nikos Barkas
0aef9f29fd Makefile now builds also Basic-debug.oxp on Windows and Linux systems. The Windows installer has now an additional page which allows the user to select whether to install Basic-debug.oxp or not. This page is available only in the test-release and test-release-snapshot configurations. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4489 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-25 00:19:12 +00:00