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

4538 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jens Ayton
c476cf0cd9 @privatize all the things! Well, most of the things. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5226 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-24 16:45:00 +00:00
Jens Ayton
0450f6c21c * Style and type safety cleanup. 
* Added compatibility shim for instancetype keyword; see OOCocoa.h.
* Removed two -play methods in CoreAudio sound implementation which would cause an exception if actually used.
* Removed unused -[OOBreakPatternEntity breakPatternWithCircle.]
* Cleaned up header comments in debug OXP.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5225 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-24 16:02:30 +00:00
Jens Ayton
cb827ccce0 [Mac] Added support for Lion system-standard full screen mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5224 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-24 13:10:46 +00:00
Chris Morris
5244cfb3d3 Some new ship JS properties 
ship.currentWeapon
ship.weaponPosition*
ship.AIFoundTarget
ship.AIPrimaryAggressor
ship.destination
ship.desiredRange


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5223 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-23 19:46:23 +00:00
Chris Morris
83f61d6182 Make various cargo loading/purchase routines consistent when carrying 500-999kg of cargo. Should avoid losing precious metals on save/load, and being able to scoop over total cargo capacity. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5222 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-22 21:01:06 +00:00
Chris Morris
555bb947d5 Fix bad validation of effectdata model specification 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5221 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-22 19:54:04 +00:00
Chris Morris
55b8b21944 Start shader bindings for Visual Effects (fake hullHeatLevel for default shader) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5220 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-22 19:40:56 +00:00
Chris Morris
1d8068a14c mission.unmarkSystem returns Bool. (false if *any* removal fails) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5219 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-22 19:25:07 +00:00
Jens Ayton
31c6041dc5 Removed a dead declaration. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5218 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-21 07:12:42 +00:00
Chris Morris
2700c41434 Change markedSystems to a property 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5217 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-20 19:35:29 +00:00
Chris Morris
36b4e9ae04 Visual effects can appear on scanner 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5216 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-19 20:10:16 +00:00
Chris Morris
41294e1782 Fix compiler error 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5215 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-19 18:49:05 +00:00
Chris Morris
59591cb038 Fix? possible cause of ghost entities. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5214 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-19 18:38:12 +00:00
Jens Ayton
1fe597a7f9 Xcode update for visual effect entities. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5213 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-19 18:34:06 +00:00
Chris Morris
44f1494b13 Initial addition of "Visual Effect" entities. 
- effectdata.plist defines them
 - VisualEffect JS representation
 - System.addVisualEffect()
 - System.breakPattern and Station.breakPattern properties to allow override of usual break pattern
 - No appearance on scanner yet
src/Core/Entities/OOVisualEffectEntity and src/Core/Scripting/OOJSVisualEffectEntity will need adding to XCode project, please.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5212 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-19 17:09:51 +00:00
Jens Ayton
0e617730dd [Mac] Changing resolution in 32-bit full screen mode works again. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5211 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-19 16:24:02 +00:00
Jens Ayton
8d8b73dc15 Switched from PRETTY_FUNCTION to FUNCTION in logging because the former is a bit too pretty in clang. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5210 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-19 15:30:55 +00:00
Jens Ayton
4dc213944f Fixed SDL build error. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5209 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-18 22:10:04 +00:00
Jens Ayton
580d56ada4 More mouse handling refactoring; mockup of desired Mac cursor behaviour, but cursor needs to be re-obscured after a timeout in keyboard flight mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5208 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-18 17:39:40 +00:00
Jens Ayton
12a0788c5b Unmissing files. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5207 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-18 16:49:55 +00:00
Jens Ayton
e638ea259b Removed vestiges of Groolite; Growl and Notification Center notifications appear above the game anyway in 64-bit now, and fixing Groolite for 32-bit ain't gonna happen. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5206 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-18 16:47:46 +00:00
Jens Ayton
52ad424bf8 Reorganized handling of mouse cursor visibility, adding GameController 
property mouseInteractionMode which also reflects the distinction between
flight mode with mouse control on and flight mode with mouse control off.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5205 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-18 16:09:15 +00:00
Chris Morris
ca65002926 Factor versions of scriptedAI parameters 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5204 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-18 15:28:22 +00:00
Jens Ayton
56d761b297 [Mac] Avoid flash of out-of-date window when quitting in 32-bit full-screen mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5203 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-18 14:28:40 +00:00
Jens Ayton
e5c88ea9c7 Removed support for .oolite_expansion_pack as alternative to .oxp, only accepted under special circumstances in Mac OS X. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5202 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-18 14:26:03 +00:00
Jens Ayton
0346d105a4 Cleanup of pause state management, and started work on high-level tracking of mouse interaction modes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5201 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-18 14:18:36 +00:00
Jens Ayton
d27c045cbb [Mac] Basic mouse control in 64-bit fullscreen. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5200 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-18 13:43:58 +00:00
Jens Ayton
b56b7899c6 Missing method prototype. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5199 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-18 13:06:01 +00:00
Jens Ayton
0ffc9c95cb Restored a debugging flag. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5198 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-18 13:05:02 +00:00
Jens Ayton
d94dbb60b2 [Mac] React to screen reconfigurations in 64-bit fullscreen. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5197 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-18 13:02:56 +00:00
Jens Ayton
3fc4d32fa9 [Mac] Use standard open/save dialogs in full screen in 64-bit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5196 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-18 09:21:34 +00:00
Jens Ayton
1b17ba2375 Syntax tweet for better compatibility with Eric. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5195 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-18 08:45:50 +00:00
Jens Ayton
31fb5be015 Avoid an unnecessary intermediate object. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5194 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-17 20:44:17 +00:00
Jens Ayton
f924b7786f [Mac] Fixed F12 key. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5193 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-17 19:55:21 +00:00
Jens Ayton
a0b554ec40 [Mac] Initial "Snow Leopard mode" full-screen support for 64-bit. 
Possible SDL breakage related to moving some display setting macros from
GameController.h to OOFullScreenController.h.

Features:
* Can access menu bar and dock in full-screen mode.
* Can command-tab out, use Spaces/Mission Control, etc. (Full-screen window
  hides when not frontmost application, except in Debug builds.)
* Can show JavaScript console, inspectors, help window etc. over game in
  full-screen mode.
* On multi-monitor systems, full screen mode will use the screen containing
  the largest portion of the non-full-screen window.
* Can control computer after breaking into debugger in full-screen mode
  without resorting to SSH.

Missing:
* Mouse control; hiding and capturing mouse during flight.
* Response to display reconfiguration.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5192 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-17 19:36:33 +00:00
Chris Morris
04f3793b08 Newline to end of table file to fix build warnings 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5191 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-17 16:19:58 +00:00
Chris Morris
0db1d55fb6 Introduce Javascript-based frame-by-frame AI management 
Add ship.max(Pitch|Roll|Yaw) properties
Modify player.ship.(Pitch|Roll|Yaw) properties so that signs reported are the same as for NPC ships.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5190 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-16 19:33:38 +00:00
Jens Ayton
50e44e796c Missing project file updates. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5189 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-15 07:08:02 +00:00
Jens Ayton
76e3ab0dd6 [Mac] Full-screen mode is once again remembered across runs. (In 64-bit, it's remembered even though it doesn't do anything except change the name of a menu item.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5188 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-14 20:01:00 +00:00
Jens Ayton
3d8084f015 [Mac] Stop trying to instantiate non-functional Groolite controller. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5187 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-14 19:58:32 +00:00
Jens Ayton
6a2f0eed4c Removed unused progress bar stuff cluttering up GameController. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5186 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-14 19:01:52 +00:00
Jens Ayton
adbda50a65 Missing files. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5185 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-14 18:53:35 +00:00
Jens Ayton
f99bb71d15 Cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5184 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-14 18:49:27 +00:00
Jens Ayton
31ae2a66c0 Full screen refactoring: OOFullScreenController subclass now used for Mac 64-bit dummy full screen mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5183 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-14 18:30:36 +00:00
Jens Ayton
15be2b134f [Mac] Leopard compatibility fix. No closures for Smeagol. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5182 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-14 17:54:50 +00:00
Jens Ayton
5405d6da12 Cleaned up refactoring cruft. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5181 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-13 20:59:20 +00:00
Jens Ayton
e1160cad38 More refactoring of full screen stuff. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5180 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-13 20:38:49 +00:00
Jens Ayton
d33ed4226b [Mac] Changed title of full screen menu item to Enter Full Screen and shortcut to control-command-F to comply with current human interface guidelines. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5179 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-13 20:38:26 +00:00
Jens Ayton
4b7f6b09d6 Clang pedantry strikes again! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5178 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-12 10:14:52 +00:00
Chris Morris
31a82244a3 More sensible output of mission.markedSystems 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5177 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-11 12:37:08 +00:00