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

3947 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jens Ayton
aa80fbaa4f Slightly simplified auto-dock logic and eliminated a write-only variable that was bothering the static analyzer. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4724 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 21:01:20 +00:00
Jens Ayton
98fcd4b813 Removed a redundant and unidiomatic retain/release pair. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4723 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 20:46:17 +00:00
Jens Ayton
bc7369e1a8 Cosmetic changes to project settings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4722 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:38:30 +00:00
Jens Ayton
418953b4a0 Eliminated OOInvSqrtf and OOFastInvSqrtf (which wasn't faster), and various - mostly unused - fast_foo functions that depended on OOFastInvSqrtf being fast. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4721 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:16:26 +00:00
Jens Ayton
d0b7235ecf Eliminated arithmetic functions that existed only for (mostly dubious) PowerPC optimizations. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4720 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:16:18 +00:00
Jens Ayton
c8d7e46a44 Removed a bunch of PowerPC arithmetic stuff that probably wasn't helping much anyway. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4719 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:16:08 +00:00
Jens Ayton
ad453480d5 Removed some duplicated methods. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4718 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:15:59 +00:00
Jens Ayton
25264f5796 Fixed widespread confusion between OOCargoType and OOCommodityType. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4716 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:15:39 +00:00
Jens Ayton
d4856bf895 Fixed various problems caused by Clang's stricter type checking. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4715 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:15:28 +00:00
Jens Ayton
5921ace94f Repeated a bunch of configuration changes for Xcode 4 that somehow got lost in a git rebase. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4714 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:15:17 +00:00
Jens Ayton
d15e4988ad Added Xcode 4 schemes for Oolite's three configurations. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4713 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:15:04 +00:00
Jens Ayton
16d7119c0a Switched compiler to Clang. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4712 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:14:56 +00:00
Jens Ayton
3bb37fc867 Noted changed system requirements in change log. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4711 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:14:47 +00:00
Jens Ayton
7bf2a10879 Configuration fixes to get libpng deployment release to build. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4710 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:14:40 +00:00
Jens Ayton
86e3077e96 Merged Leopard support bundle into game. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4709 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:14:31 +00:00
Jens Ayton
6c9723dffd Eliminated OOLITE_LEOPARD macro. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4708 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:14:21 +00:00
Jens Ayton
95de278701 Removed PowerPC-specific hacks for SpiderMonkey. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4706 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:14:05 +00:00
Jens Ayton
b3e2d8ccd0 Mac build setting changes and code compatibility fixes: 
SDK is now 10.6.
Deployment target is now 10.5.
PowerPC support disabled.
Compatibility wrappers added to NSFileManager.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4705 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:13:56 +00:00
Jens Ayton
6c4a2e1dc9 Fixed precedence error in code to adjust fine level based on government. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4702 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-07 17:32:23 +00:00
Jens Ayton
4a4e33d649 Fixed potential bug loading player with no mission_variables dictionary. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4701 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-07 17:31:07 +00:00
Jens Ayton
424580a157 Removed a redundant validation check whose fallback was invalid and would blow up if you could actually hit it. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4700 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-07 17:23:49 +00:00
Jens Ayton
eaa5d19d70 Placating static analyzer. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4696 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-06 21:59:54 +00:00
Jens Ayton
dcfff2c2e7 Removed some redundant stringWithFormat: calls. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4695 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-06 10:10:59 +00:00
Nikos Barkas
02eca5ee69 Fixed typo in changelog. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4694 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-05 12:54:06 +00:00
Michael Werle
7312ad733c Bump copyright to 2012. Happy New Year! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4692 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-03 16:08:14 +00:00
Michael Werle
cb2d00a924 Bump version number to 1.77; start new Changelog. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4691 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-03 15:14:11 +00:00
Nikos Barkas
16dc33594a Lifted guards from feature 5359 (equipment_required for HUD legends) implementation. Feature is now active. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4690 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-03 14:26:38 +00:00
Michael Werle
d4066989e8 Reverse Compass - allows stepping backwards through beacons. 
Shift-\ (|) is now bound to stepping through the Advanced Space Compass's
targets in reverse order.  Beacon-list has been converted to double-linked
list to facilitate this.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4689 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-02 20:37:06 +00:00
Eric Walch
c5399fc202 'sendAllShipsAway' no longer tries to send ships without hyperSpaceMotor away. They won't jump anyhow and now they keep their original AI so that at least escorts without hyperSpaceMotor can follow their mother through her wormhole. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4688 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-01 16:17:36 +00:00
Jens Ayton
527b3214c7 Remapped ASS to Assignment in JS error identifiers. Also added some missing ones. Hmm, this should be automated. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4686 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-12-25 11:30:17 +00:00
Jens Ayton
e7076105a3 Comment typos. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4685 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-12-24 09:09:24 +00:00
Eric Walch
4c0ef848d4 Updated the keyconfig.plist for the BBC with all the new keys current Oolite contains. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4680 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-12-16 09:22:39 +00:00
Michael Werle
7dfdf6cde9 Changes to CHANGELOG as notified by Eric. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4678 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-12-09 15:24:44 +00:00
Nikos Barkas
39f4462057 Updated license file reference year. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4677 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-12-07 11:08:08 +00:00
Michael Werle
ef261a5f3e Draft Changelog for 1.76; thanks to Eric for starting this. Please review! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4676 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-12-06 17:19:56 +00:00
Marc
e501b79534 Wormholes fixes: 
- stopped NPCs following the player at different times from smashing against the navbuoy.
 - 'velocity zero' fix ported to NPCs following the player.
Minor code cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4675 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-12-03 20:25:11 +00:00
Nikos Barkas
c665a084d8 MNSR step 1: Rolling version number to 1.76. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4674 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-12-03 17:51:19 +00:00
Eric Walch
450c395138 - AI fix for homeAI. When multiple escape pods are launched, there is no longer a part suddenly disappearing. 
- AI fix for looting to prevent a ship circling around a cargo pod as I witnessed the other day.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4673 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-12-02 17:18:30 +00:00
Nikos Barkas
f8b7668b3c Fixed memory pool error when a game was being loaded from the command line on SDL builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4672 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-12-02 13:41:13 +00:00
Marc
3f010a5e0f Reinstated 'destructive' Makefile clean under windows. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4671 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-12-01 17:31:20 +00:00
Marc
6e06f5c94c In windows, 'make -f Makefile clean' now asks for confirmation before deleting the contents of oolite.app and the AddOns directory 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4670 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-11-30 00:05:17 +00:00
Marc
35f3a46c2c made 'make -f Makefile clean' less destructive under minGW, removed some redundant redundancy 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4669 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-11-29 20:20:51 +00:00
Marc
d6d4accdc8 The first attempt to start a witchjump after a galactic jump would abort. Should be fixed now. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4668 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-11-29 03:34:00 +00:00
Marc
63555f1812 rev4665 regression: fixed inconsistent state at startup when in windowed mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4667 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-11-28 15:25:51 +00:00
Marc
5be470ff88 Debug OXP fix: debug-only callObjC() function was made enumerable when disabled(!), it's now non-enumerable in all cases as God intended. 
NB: of course, Debug OXP inside AddOns needs to be updated!

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4666 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-11-28 14:11:59 +00:00
Marc
d2922e78d4 More js reset fixes: 
- made js engine less likely to stall on reset after player's death.
 - better feedback in case of load game failure due to js issues.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4665 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-11-28 01:17:03 +00:00
Marc
47786d1f79 - fix: in debug mode, Oolite would occasionally CTD after non-fatal linkedlist errors. 
- fix: only call frameCallBacks when game is actually running.
- fix: js reset problems should not stall/crash the game anymore. Kept test harness (#if 0-ed) for further tests.
- yep, some code cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4664 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-11-27 12:42:09 +00:00
Marc
f44dede98e Pause & autopilot fixes: 
- Unless explicitly in normal flight or docked, the game actively unpauses itself. This fixes 'frozen' pause mode when in witchspace tunnels.
 - Pause buttons weren't working when using the autopilot. Fixed.
 - Regression fix: pressing 'fast dock' while on autopilot stops the autopilot, as before.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4663 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-11-23 11:56:15 +00:00
Eric Walch
ca2205ff57 Set 'velocity' to zero on leaving witchspace. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4662 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-11-23 08:19:21 +00:00
Nikos Barkas
3567fdc57d Fixed inconsistency where fuel price displayed was not actual price being paid for ships with fuel charge rate other than 1.0. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4661 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-11-22 15:02:04 +00:00