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

4932 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cim
14400210f0 Sort savegame list alphabetically 2013-06-13 22:59:21 +01:00
cim
489d50754d Merge branch 'master' of github.com:OoliteProject/oolite 2013-06-13 22:35:26 +01:00
Jens Ayton
aeebd2304c [Mac] Fix unit tests 2013-06-12 00:56:47 +02:00
Jens Ayton
61e4b1682f Remove support for Mac OS X 10.5 and 32-bit Macs 
- Bump deployment target to 10.6
- Bump SDK to 10.8
- Remove i386 architecture
- Remove legacy full screen controller
- Remove OOLITE_MAC_OS_X_10_6 macro (would always be 1)
- Update xibs
- Bump Mac-specific submodule for equivalent changes
 2013-06-11 23:48:26 +02:00
Jens Ayton
07b97309e6 Merge branch 'maintenance/1.77' 
Conflicts:
	.gitmodules
 2013-06-11 23:39:59 +02:00
Chris Morris
b2070c46d4 Padding on parcel contracts still wasn't quite sufficient for really short trips, which could expire before you got to the station. Add four hours to deadlines. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5678 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-06-11 23:36:12 +02:00
Chris Morris
f93d75af2d Dead stations do not allow docking. Should fix oddity reported by Wyvern Mommy in Nova mission. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5677 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-06-11 23:36:09 +02:00
cim
d029c75570 Mission screens which don't allow interruptions from status screens now don't allow undocking interruptions either. 2013-06-11 20:05:26 +01:00
cim
8fe1bd3a5d Sort savegame list alphabetically 2013-06-11 19:48:03 +01:00
cim
26a23b4096 Add legalPenalty key to the entries in the station.market dictionary 2013-06-10 18:42:32 +01:00
cim
2ce0595a46 ship.energyRechargeRate now gives final rate for player ship (i.e. including energy units) 2013-06-08 11:07:48 +01:00
cim
0e2082addf Add ship.energyRechargeRate read-only parameter 2013-06-08 11:01:28 +01:00
cim
961b32b4e5 guiScreenWillChange fires on changes to F4 interfaces screen 2013-06-08 10:46:57 +01:00
cim
1dbdb18fa8 Ignore debug build directory as well 2013-06-08 10:44:39 +01:00
Jens Ayton
49b2dab38f Further fix Linux SpiderMonkey stuff 2013-05-14 01:22:49 +02:00
Jens Ayton
9d6af14f6f Fix SpiderMonkey Linux build 2013-05-13 22:14:03 +02:00
Jens Ayton
f3709fa842 Bump deps/mozilla for missing directory 2013-05-13 22:05:29 +02:00
Jens Ayton
1e3117655f Use submodules for Ogg and Vorbis (OS X) 2013-05-13 20:44:27 +02:00
Jens Ayton
1e86f3ef45 Make submodule references relative 2013-05-13 19:26:28 +02:00
Jens Ayton
24b24fa5b3 Make submodule references relative 2013-05-13 19:23:23 +02:00
Jens Ayton
c6e8a6acb6 Use submodule for SpiderMonkey (OS X/Linux) 2013-05-13 19:09:39 +02:00
Chris Morris
6bb8e901f4 Padding on parcel contracts still wasn't quite sufficient for really short trips, which could expire before you got to the station. Add four hours to deadlines. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5678 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-05-12 00:23:15 +02:00
Chris Morris
3eeeff5d84 Dead stations do not allow docking. Should fix oddity reported by Wyvern Mommy in Nova mission. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5677 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-05-12 00:10:41 +02:00
Jens Ayton
e3256a1b2a Fix Linux build for git layout 2013-05-11 23:56:28 +02:00
Jens Ayton
52dff6239c Update Mac build system for git layout and Xcode 4.6.2 2013-05-11 21:33:02 +02:00
Jens Ayton
dd53a44b82 Set up submodules 2013-05-11 21:32:45 +02:00
Jens Ayton
30de024c17 Add .gitignore 2013-05-11 17:34:59 +02:00
Chris Morris
c7880a1de2 Fix crash reported by richard.a.p.smith on long manifest screens 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5675 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-05-04 13:05:59 +02:00
Marc
d6d9568341 - regression fix: OXPs can show commander 'kills' once again - syntax fits current string expander, though. - fix: language OXPs can now translate thargoid character name & short description, as originally intended. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5674 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-05-04 13:05:59 +02:00
Nikos Barkas
9076243a4e Build unbreakage <KirkMode>Kaaaaaakkksssvn status</KirkMode> :-) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5673 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-05-04 13:05:59 +02:00
Marc
9c18e4f8a2 - Tweaked splash screen display logic to hopefully increase compatibility with some windows video drivers not available to the dev team. - Splash screen set to disable itself whenever display problems are encountered: should solve the vast majority of the current "Oolite doesn't start in windows" reports. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5672 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-05-04 13:05:59 +02:00
Jens Ayton
07398c6e2b Moved Mac-specific parts of DebugOXP into Mac-specific/. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5665 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-04-07 14:01:18 +00:00
Jens Ayton
1b6a19ba4f Deleted extremely obsolete, pre-1.65 era MorayMED textures. 
All other textures of this vintage are long gone.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5664 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-04-07 11:28:21 +00:00
Chris Morris
3825df3729 Fix ship leak in load/save screen 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5663 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-04-03 09:44:27 +00:00
Chris Morris
c01af88cab Fix crash on failed mesh load, plus other bugs exposed at same time 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5662 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-03-29 13:56:43 +00:00
Chris Morris
5afcfeeb67 Impact damage (and other sorts) now no longer give kill awards / bounty while cloaked. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5661 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-03-25 22:25:32 +00:00
Jens Ayton
f247e955ef Fixed sound glitch in guiclick.ogg. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5660 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-03-24 13:30:40 +00:00
Jens Ayton
0f25a6d7eb Fixed transformation of subentity bounding boxes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5659 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-03-24 09:39:53 +00:00
Jens Ayton
a32d957d20 Fixed assertion on loading model with 0 faces. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5658 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-03-24 09:39:37 +00:00
Chris Morris
6bc09b20d9 Fix from last commit: temperature updates now work properly again 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5657 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-03-23 10:46:15 +00:00
Chris Morris
8478849a50 Fix some update-related bugs for the player autopilot 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5656 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-03-23 10:26:24 +00:00
Chris Morris
f94614660b Zero velocity on restart and launch, stop autopilot on death 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5655 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-03-22 20:09:32 +00:00
Chris Morris
ad4ed52151 Make pause consistently unavailable on mission screens 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5654 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-03-19 20:33:01 +00:00
Chris Morris
06ecbeb53d Fix one allocation error noted by valgrind, note two other possible problems 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5653 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-03-18 22:16:40 +00:00
Chris Morris
2c45d6ecde Fix ghost ship bug with defense targets 
Fix non-frangible subentities taking heat damage 


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5652 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-03-18 17:49:20 +00:00
Nikos Barkas
20dd11afd6 Overhaul of the cloaking device handling code, mostly for player. Deploying Q-mine now causes the passive cloak to deactivate, like any other weapon does. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5651 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-03-13 17:55:38 +00:00
Nikos Barkas
26d53d3421 Fixed cloak-off sound not playing when firing laser and cloak-off message not being displayed when firing missiles. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5650 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-03-13 08:33:05 +00:00
Chris Morris
821d3134dc Allow firing in evasive state to stop high-accuracy Thargoids getting pinned out of returning fire. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5649 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-03-11 17:53:43 +00:00
Chris Morris
f1b79ba7be Stop exhaust origin drifting backwards at high speed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5648 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-03-06 20:25:12 +00:00
Chris Morris
14f8bf19af Fix contract reputation so that it uses -7 to +7 range as documented rather than -3 to +7 range 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5647 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-03-05 18:36:52 +00:00