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

567 Commits

Author SHA1 Message Date
Jens Ayton
c2cb7d94e0 Implemented tricky part of polygon sprite outline generation, less tricky part to follow. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2693 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-24 18:34:39 +00:00
Jens Ayton
09e61dbdc9 Added polygon-sprite-dump-svg preference to save on graph paper. (This will be useful when I implement outline tesselation this weekend.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2686 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-21 19:43:22 +00:00
Jens Ayton
bc3a113b0f Incomplete support for general polygons in missile icons. (In case of splodey, setting the OLD_ICONS macro in HeadUpDisplay.m to 1 will revert to the old drawing code.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2661 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-10 12:23:24 +00:00
Marc
47f9f2c920 * corrected manifest miscount when ship in flight. 
* last change to player.ship.manifest: manifest.food & similar are now read/write manifest quantities. Internally all commodities are now going to be referenced by the canonical identifiers, commodities.plist still overrides the displayName - the .manifest.list array is unchanged, and still read-only.
* renamed 2 ship properties for consistency: ship.availableCargoSpace & ship.cargoCapacity now become ship.cargoSpaceAvailable & ship.cargoSpaceCapacity.

- more code tidying.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2637 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-06 09:09:08 +00:00
Jens Ayton
287da97963 Weekend of SVN Death fixes: partial fix for planet texture mapping suckiness (disabled by default, see FIXED_TEX_COORDS in PlanetEntity.m). Fixed crash when constructing JS timer with invalid parameters. Some cleanup and stuff. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2636 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-05 13:13:06 +00:00
Jens Ayton
09843c8073 ...and removed now-unused flare256.png texture. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2603 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-25 19:36:08 +00:00
Jens Ayton
2f12c5c4e2 Moved laser and explosion flashes over to OOLightParticleEntity, and changed OOLightParticleEntity size from an NSSize to a single diameter. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2602 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-25 19:35:13 +00:00
Jens Ayton
6b2e74be02 Reinstated plasma impact bursts. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2601 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-25 18:27:47 +00:00
Jens Ayton
3132dc8fe4 Moved plasma shots over to the new hotness. Bloom effect on plasma impact is temporarly disabled pending yet another new OOLightEntity subclass. Also fixed a bug where turrets would hold fire until target was well inside of range, instead of just outside as per comment. Also also, removed entity isParticle ivar. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2600 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-25 17:36:59 +00:00
Jens Ayton
426815f740 Freed ECM blasts from their ParticleEntity bonds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2546 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-20 16:06:33 +00:00
Jens Ayton
ec4aa91753 Spent several hours worrying about the need to deep copy data before async cache flush and the performance implications of doing so, then realised there was no reason that would be necessary. Currently back to async flushing without deep copy, and profiling code. The profiling timer implementation for Windows is untested and may be broken. Also, fixed a nasty bug in OODeepCopy() where empty dictionaries ere turned into sets. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2541 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-20 14:02:55 +00:00
Jens Ayton
c988131375 Data cache writes are now asynchronous, for great snappy. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2537 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 22:03:36 +00:00
Jens Ayton
ab8aebe696 Turned OOTextureLoadDispatcher into more general OOAsyncWorkManager. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2536 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 21:47:05 +00:00
Jens Ayton
dafcec17b1 Here's a thought: instead of asking libpng for data in the wrong order and then swapping it, how about asking for data in the right order? It's a crazy idea, but it might just work. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2530 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 18:17:38 +00:00
Jens Ayton
657d4556a8 Updating Xcode project to keep up with GNUmakefile for once. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2529 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 18:09:51 +00:00
Marc
baa5430180 - got xcode to compile with the renamed javascript-errors.plist 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2497 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-13 16:25:48 +00:00
Marc
fabfc9b391 - F7 screen now shows the nova sun for systems destroyed by novae, planets everywhere else. 
- moving from screen to screen now always resets the background image.
- fixed xcode compile warning.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2494 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-13 14:51:21 +00:00
Jens Ayton
712097c550 Gave sparks the slimming treatment. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2480 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-12 10:44:29 +00:00
Jens Ayton
68d44cb438 Sundry OOGL()-ification, and added temp code to dump the instance size of various entity classes at startup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2474 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-11 15:06:58 +00:00
Jens Ayton
8a9c0b0551 Factored exhaust plumes into a separate class. Moved instance variables used only by exhaust entities into said new class, saving several megabytes of memory. Added Entity memory consumption (not including drawables and materials) to FPS display as a graphic reminder that they're still too big. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2467 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-10 23:13:20 +00:00
Jens Ayton
d83e9031c8 More static analyzer fun: fixed flagrant abuse of -init in -[Universe reinitAndShowDemo:], don't create a nav boy if creating a station fails, get systeminfo before asking it for a government in [-Universe witchspaceShipWithPrimaryRole:] (so skipping of escorts in safe systems works). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2438 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-08 19:28:13 +00:00
Jens Ayton
c50eec56f8 Cleaned up among feature macros; updated log header appropriately; simplifed log header generation a bit; fixed clean build of Mac debug configuration (Debug.oxp no longer wants OoliteDev.app). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2430 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-08 15:06:22 +00:00
Jens Ayton
6244814f2f Fixed Mac Deployment configuration (it isn't supposed to be exporting anything). Log header now lists [GLSL Shaders] and [OXP Debug Features] as appropriate. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2429 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-08 13:54:06 +00:00
Marc
e93b8aa9ee Mac build: 
- really removed all traces of 10.3 from the build settings now(probably)
- changes to codebase to enable Deployment builds to link properly, might affect other platforms builds.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2428 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-08 13:37:28 +00:00
Marc
ea62edcb5e * mac builds on trunk: 
- removed all stray references to 10.3, and testRelease should now build properly on PPCs too.
- Still couldn't correct the 4 missing debug exports from Deployment.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2427 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-08 09:05:30 +00:00
Marc
cc12a609bc - got it to compile & execute ok on Xcode 3.1 for debug & test release configurations. There are still 4 -exported_symbols missing from the deployment configuration, though... 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2426 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-08 08:26:30 +00:00
Jens Ayton
982bd06d68 Tweak to Xcode project: Oolite is now named Oolite.app in all configurations, to avoid an incompatibility between Xcode 3.2 and Xcode 3.1. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2425 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-07 21:53:05 +00:00
Jens Ayton
7d85d3391d New! Hardcore OpenGL error checking action. Compile time option (OO_CHECK_GL_HEAVY) to check for OpenGL errors before and after, ideally, every single GL function call. (Exception: for immediate-mode drawing, checking is done before glBegin() and after glEnd().) Temporarily enabled by default in Mac debug builds for compatiblity testing. Oh, and fixed a bug where shader programs that fail to build could sometimes be deleted twice. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2424 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-07 20:37:44 +00:00
Jens Ayton
b3b6eceae0 Fixed Mac 64-bit build. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2421 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-07 16:39:33 +00:00
Jens Ayton
ea629fbeb4 Beginning of a lightweight replacement for ParticleEntity, currently used for flashers. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2415 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-06 19:07:53 +00:00
Jens Ayton
8293a67ecc Fixed an oversight that was causing traderInterceptAI.plist to be excluded in Mac builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2394 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-05 14:16:55 +00:00
Jens Ayton
238d0feaee Moar property lists: slow-gpus.plist (matching patterns for GPUs where we should default to simple shaders, unimplemented); shipdata-overrides.plist (fixes for known, minor, third-party problems; currently suppresses one harmless error from griff_spacebar_subent_template); script-patches.plist, similar auto-patcher for third-party scripts (unimplemented). Also, syntax error reports for legacy scripts now provide a sort of path to the problem, e.g. assassins.0.do.321.do.1.conditions.0, which just happens to provide information needed to write script-patches.plist entries. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2382 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-04 19:00:30 +00:00
Jens Ayton
15dae1b410 Random unexpected feature of the week: refactored texture loading dispatch into a separate class (instead of class methods in OOTextureLoader), and added an implementation that uses NSOperationQueue rather than hand-rolled thread pool if available (OS X 10.5, GNUstep 0.19). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2381 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-04 17:28:59 +00:00
Jens Ayton
3b36f20058 Fixed build issue for debug OXP in Debug/x86_64 configuration. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2374 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-03 22:38:42 +00:00
Jens Ayton
c59c9743e1 Got the project building with Clang, which revealed a number of syntax errors. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2371 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-03 21:08:03 +00:00
Jens Ayton
00077466ab Various tweaks and a handfull of hacks to get Oolite building for x86_64 OS X. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2370 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-03 20:01:35 +00:00
Jens Ayton
b15825ddfd Administrative updates for OS X: Xcode projects are now marked as requiring Xcode 3.1 rather than 3.0 (3.1 is an update for Leopard). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2364 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-03 15:57:44 +00:00
Jens Ayton
97aedf381b Fixed build under Xcode 3.2 (Snow Leopard). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2355 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-02 15:24:18 +00:00
Jens Ayton
fd60071a53 Fix for somehow broken checkin of r2352. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2353 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-02 12:23:38 +00:00
Jens Ayton
3c10a9b2be Bumped version number. Changed Mac system requirement to 10.4, and cleaned up target configuration in preparation for 64-bit support. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2335 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-30 14:49:03 +00:00
Jens Ayton
6aaf7a1e75 Committed unspeakable necromancy on the graveyard of the repository. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2331 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-29 23:09:22 +00:00
Jens Ayton
999fe7e969 Trying to convince svn that this deleted directory is really deleted. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2330 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-29 22:50:59 +00:00
Jens Ayton
50e19e1a68 Attempted fix for aegis-tracking crash. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2329 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-29 22:20:06 +00:00
Jens Ayton
a4823f6ef7 Update log tweaking fun time: added some of Marc's suggestions, moved OXP stuff that isn't scripting to its own section, removed note about questionable throw_sparks feature. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2324 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-29 19:14:48 +00:00
Jens Ayton
efca253270 Last-minute change: changing misspelled event handler playerTargettedMissile() to playerTargetedMissile(), and related spelling fixes in code. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2321 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-29 17:05:36 +00:00
Jens Ayton
9781d2b9d1 Fixed possible but unlikely cause of crashes in JavaScript error handling, and improved log message classes for JS errors (symbolic names instead of magic numbers). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2308 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-23 20:49:25 +00:00
Jens Ayton
0dc704c26d Removed (optional) installation of Smart Crash Reports in Mac test release builds - it's just too evil. SCR will still be used if it's installed (usage is passive). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2306 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-23 16:51:42 +00:00
Jens Ayton
8f31c44b21 Changeged various option macros to use 0/1 convention instead of undefined/defined convention. Moved definition of these macros into an xcconfig file when building for OS X, so that their definition is shared with the debug OXP and is the same across configurations. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2298 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-21 19:46:53 +00:00
Jens Ayton
5c52303826 Added -[ShipEntity hasEquipmentItem:includeWeapons:]; hasEquipmentItem: is now a shortcut fot hasEquipmentItem:foo includeWeapons:NO. Moved JS hasEquipment() from PlayerShip to Ship and made it include weapons by default, with optional argument to suppress this. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2216 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-06-21 12:35:37 +00:00
Jens Ayton
d4b7f42c08 Changed oolite.bug.reports@gmail.com to bugs@oolite.org as appropriate. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2206 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-06-14 19:22:31 +00:00