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

177 Commits

Author SHA1 Message Date
Jens Ayton
ca06516f4c Cleaned up texture pixel-twiddling code a bit. Added extract_texture texture option (for, e.g., using one channel of a shader effect map as a glow map in non-texture mode). Mac: renamed custom static libpng to libpng_for_oolite, to avoid linking to wrong library when normal libpng installed in /usr/local/lib. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3165 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-15 23:51:41 +00:00
Nikos Barkas
2dd40c216c Updated GNUmakefile with most recently added files. This fixes crash at startup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3161 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-13 07:30:06 +00:00
Jens Ayton
29e904f0f6 More work on player shader binding issue: implemented ProxyPlayerEntity class. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3052 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-03 21:23:31 +00:00
Jens Ayton
94d00e8086 Followup to r3049: second occurrence of same mistake. Also, fixed a typo in a makefile comment. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3050 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-01 23:22:32 +00:00
Nikos Barkas
b5efda4c21 Upgrading libpng to version 1.4.0 for the Windows build. Ships now are considered as executing a spawn action also when launched for the first time. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3023 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-14 02:00:53 +00:00
Jens Ayton
4284da31cd Ships with the same model but different material dictionaries now work properly. Changed mechanism for saving and restoring wormholed ships. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2994 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-23 22:20:55 +00:00
Marc
bb93c112da - yet more go-faster tweaks to the texture generator. 
- integrated the previously separate atmosphere generator inside OOPlanetTextureGenerator, to avoid noise generator overheads.
- added NEW_ATMOSPHERE compile-time switch to OOPlanetEntity.

- tidying up of contract market generators: while they're still slow, some dead code was removed.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2918 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-30 09:17:01 +00:00
Marc
44df4a0f56 - oops! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2868 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-10 00:38:24 +00:00
Nikos Barkas
d4ecb1f3e3 Removed reduntant entry in GNUmakefile. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2809 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-29 22:58:06 +00:00
Jens Ayton
5ddbe997b1 New planets now have procedural diffuse maps. Unfortunately, the generator seems to hang from time to time. Incidentally, the log entries saying Dequeued generator <OOPlanetTextureGenerator 0x133d7bcf0>{{(null) -- failed}} are not an actual failure. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2807 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-29 21:57:57 +00:00
Nikos Barkas
cba7d4f041 Enabled building with NEW_PLANETS defined on SDL builds. Fixed a warning in OOPlanetEntity.m. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2805 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-29 18:12:33 +00:00
Jens Ayton
7754f83cb7 Oops! That last commit wasn't really ready. Here's the rest of the fix, along with some half-baked new planet stuff (disabled with NEW_PLANETS in Universe.m). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2803 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-29 16:48:14 +00:00
Nikos Barkas
8f9c581505 Fixed SDL build for the new planet drawables system. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2801 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-29 15:43:13 +00:00
Jens Ayton
878f382106 Split suns out into a separate SunEntity class. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2792 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-28 14:17:57 +00:00
Nikos Barkas
e1c1924e9e Build configuration changes to align the SDL builds with the Mac equivalents. Added the pkg-win-deployment configuration for stable releases. The deployment settings are forced, while the test release ones are adjustable. Tested successfully on Windows for the test releae, deployment, snapshot and debug configurations. Linux testing still needed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2746 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-14 16:18:23 +00:00
Jens Ayton
5dd0443728 Refactored AI GraphViz stuff for slightly better legibility and put it in its own file. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2743 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-14 14:29:42 +00:00
Michael Werle
aa0821047a Added -Wall to compiler options for Linux 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2680 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-17 15:03:05 +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
251bdb1b07 Cleaned up some junk, and added missing files to makefile. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2605 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-25 19:57:46 +00:00
Nikos Barkas
e4138c6906 Fixed Windows build (timeGetTime definition was missing). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2549 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-20 17:08:14 +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
7fa48675ab Rolled back Windows dependencies for pthreads (no longer used). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2543 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-20 14:22:11 +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
Nikos Barkas
5bf7e028fe Bringing Oolite Windows up to date: Added required pthread library dll, headers and import lib to project. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2539 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 23:37:38 +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
c090222c17 Abstracted away testing of different NSNumber types. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2527 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 17:52:38 +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
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
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
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
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
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
Nikos Barkas
722b229202 Added watermark text for the snapshot versions. Currently working on Windows. The idea is to use the snapshot releases for things like nightly builds or distributions of the game other than the official ones. Updated the readme of the Windows version to reflect current project situation. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2234 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-11 16:09:53 +00:00
Nikos Barkas
688d186508 Made incoming missile targeting a default build option. A clean project rebuild is recommended. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2180 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-05-19 07:59:20 +00:00
Darren Salt
b65a385115 Remove obj{,.spk}{,.dbg} in the "clean" target. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2169 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-05-07 22:07:07 +00:00
Nikos Barkas
8d77a7b467 Made missiles always return true in ShipEntity's hasHostileTarget: Implemented targetting of nearest incoming missile. This is activated using Shift+t or an assigned joystick button. Testing is still required. The entire implementation is guarded with the TARGET_INCOMING_MISSILES macro, disabled by default until it is agreed that this change does not influence gameplay in undesireable ways. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2151 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-29 20:29:15 +00:00
Michael Werle
e0344e1d54 Wormholes: 
* Enable by default in GNUmakefile
* Adjust price to something more plausible
* Fix discrepancy in save-files between loading & saving

SDL Sound:
* Commit in sound patch when no sound-card available (was committed into 1.72 ages ago)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2124 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-08 22:36:37 +00:00
Michael Werle
360e502c40 First draft of the Wormhole Scanner 
To test: define WORMHOLE_SCANNER preprocessor macro (see GNUmakefile), by default off.

TODO: 
 * Restore wormhole if not expired and in current system
 * Draw Wormhole exit effects
 * Revise techlevel, price, description
 * bugs?



git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2111 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-31 01:12:24 +00:00
Jens Ayton
886bfccbab Applied dsalt's libespeak patch. It doesn't work for me, but the build is fine if not built with make libespeak=yes so it doesn't hurt anything. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2091 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-15 16:14:03 +00:00
Nikos Barkas
4d0fd3267c The Windows executable now sets itself up when starting, making the RunOolite.bat file obsolete. Also, no more console window appears on Windows when starting the game. Modified installer script as required. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2074 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-23 18:54:14 +00:00
Jens Ayton
557a353cc4 Subentity definitions can now be dictionaries, and this is now used as the internal format. Ship registry now uses mutable dictionaries for entries while working on them for simplicity, and uniques strings and numbers once done for efficiency (in the same way binary plist generation does for the cache... I really should double-check that GNUstep does that). Also simplified handling of external views, fixing a crashing bug (triggered the third time the player died) in the process. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2051 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-11 17:37:20 +00:00
Jens Ayton
358543e7ed Rearranged GNUmakefile for easier diffing and browsing. (Roughly matches layout of Xcode project, which is useful as long as it's mostly being edited by me.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2035 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-06 21:48:50 +00:00
Jens Ayton
b268bed080 Fixed further build breakages. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2034 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-06 20:39:20 +00:00
Jens Ayton
12e982fa06 Removed a bunch of temporarily #ifed-out stuff from previous commit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2029 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-06 16:42:22 +00:00
Jens Ayton
dbde672d01 "Small" change to group and escort handling, now with explicit group objects. I really must stop making "small" changes. (N.b.: JavaScript ShipGroup currently fails to work in interesting ways.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2028 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-06 16:13:36 +00:00
Nikos Barkas
e4adae07fd Removed debug flag code for procedurally textured planets (not required anymore). Added the ALLOW_PROCEDURAL_PLANETS macro to the SDL builds makefile. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2009 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-22 07:20:25 +00:00
Jens Ayton
164fd3f2e9 Implemented whitelisting for legacy script conditions, and accidentally optimized evaluation while at it. Conditions for world scripts are currently sanitized (i.e. whitelisted, aliases resolved, syntax checked and partially tokenized) on the fly; this will be cached once sanitizing is implemented for actions. Deleted unused class OOLegacyEventHandlerScript. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1998 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-16 01:24:01 +00:00
Jens Ayton
b02f108735 Implemented AI validation OXP verifier stage. Removed invalid and unused shuttleAI.plist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1993 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-12 18:04:02 +00:00