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

1529 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jens Ayton
832d91c048 Fixed pointer type mismatch warning for non-OS X. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1910 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-14 19:22:23 +00:00
Jens Ayton
4b131c9a32 Checked in tools/sysdesc_key_table.plist, translation table for --export-sysdesc and --compile-sysdesc. Changed SystemDescription.dot to perform symbolic name substitution in strings when sysdesc_key_table.plist is present. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1909 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-14 18:46:24 +00:00
Jens Ayton
a00a7f495c Implemented --export-sysdesc and --compile-sysdesc command-line options for translators. Improved robustness of system_description parsing and allow entries with other than five elements. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1908 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-14 18:30:52 +00:00
Jens Ayton
cda597ce89 Made addShips: family diagnostic messages slightly less bad. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1906 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-13 10:21:31 +00:00
Jens Ayton
8335b41e98 Removed "Believed-dead method -[ShipEntity setSuppressExplosion:] called", since that method is now called by JavaScript remove() and explode(). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1905 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-13 10:06:27 +00:00
Jens Ayton
e6101522ab Fixes to plist schema verifier (any delegated type would cause verification to fail silently). Added requires_docking_clearance to known keys for stations. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1904 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-13 01:12:55 +00:00
Jens Ayton
14218af75d Fixed misleading message for bad subentity definitons. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1903 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-12 15:39:12 +00:00
Jens Ayton
e9bd87e99a Changed all occurences of glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, ...) to use glTexEnvi at suggestion of Dermot Costello. Also removed lots of such calls from trunk in favour of resetting to default (GL_MODULATE) after changing it to anything else. This could just possibly fix sky blending errors and GL_INVALID_ENUMs under Windows with ATI cards, but don't hold your breath. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1900 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-10 20:42:08 +00:00
Jens Ayton
a26e612250 Minor tweaks to Mac startup screen; added code for preloading/caching of all meshes, disabled until I finish some refactoring of OOMesh. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1899 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-10 19:23:01 +00:00
Nikos Barkas
24c095aed3 Added code to allow drawing of yaw indicator on HUD. Thanks go to Darren Salt for this contribution. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1898 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-09 12:58:33 +00:00
Nikos Barkas
d22637b4d7 Modified RunOolite.bat and uninstaller script to work on the same paths used up to now. Fixed charset OXPs a little more. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1896 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-07 11:43:05 +00:00
Jens Ayton
957482cd77 Fixed width tables for charset OXPs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1895 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-06 16:17:44 +00:00
Jens Ayton
1b092b002d Allow looped music via JavaScript. Added %N to SystemDescription.dot dump. Added :qotd console macro for moments of boredom. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1894 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-06 11:34:01 +00:00
Jens Ayton
bc07f0e740 Changed %X string code to %N. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1893 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-05 12:33:56 +00:00
Jens Ayton
eae4c8e765 SystemDescription.dot now ends up in log file directory on all platforms. Added shipdata-overrides.plist with all names for localization. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1892 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-05 01:14:34 +00:00
Jens Ayton
4e900975c8 OOMeshes are now dynamically sized. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1890 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-04 15:20:43 +00:00
Jens Ayton
edb5351c6f Fix for exception when loading model with no TEXTURES section. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1889 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-03 00:59:44 +00:00
Jens Ayton
debd8f4a37 Fixed build break for case-sensitive systems in r1887. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1888 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-30 23:30:18 +00:00
Jens Ayton
2612658ce8 Various tweaks to make reuse in tools easier. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1887 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-30 02:03:27 +00:00
Jens Ayton
1cb2df40dd Cleaned up shaders slightly. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1886 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-28 20:20:58 +00:00
Jens Ayton
ab24d9efd3 Rewrote default shader to work in tangent space and support normal mapping. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1885 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-28 19:37:47 +00:00
Jens Ayton
cd50c95e36 Fixed crash dealing with JS systemInfo objects. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1884 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-25 22:29:38 +00:00
Jens Ayton
471b801691 Fixed bug in ship generation where ships were always selected from complete list of ships for role rather than list with rejected ones removed. Also fixed floating-point precision errors in mutable probability sets when dealing with large weights. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1883 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-25 16:36:33 +00:00
Nikos Barkas
fa78e06512 Update the Windows OpenGL extensions function lists to include the functions required for normal mapping. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1882 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-24 09:34:09 +00:00
Jens Ayton
536fc338a6 Tangent support for shaders. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1881 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-23 23:07:24 +00:00
Nikos Barkas
3db7b294d9 Fixed a bug that allowed main stations to be generated in witchspace. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1879 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-23 12:29:21 +00:00
Jens Ayton
ba110a5bbe HUD overall alpha (and thus HUD hiding) now affects message/com log GUIs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1878 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-22 18:20:38 +00:00
Jens Ayton
9a4a016d6f Fixed short-form float uniform bindings, like x = 42;, in OpenStep-format plists. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1877 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-21 15:44:17 +00:00
Nikos Barkas
c409371fa9 Fixed bug with script spawned tharglets having crews. Introduced the isUnpiloted property for ships to control unpiloted ships setup and behaviour better. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1875 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-20 15:46:44 +00:00
Jens Ayton
798170677c Fixed setter for JS Ship.heatInsulation. Removed redundant punctuation on web site. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1874 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-19 21:18:58 +00:00
Nikos Barkas
663bd56a59 Fixed incorrect capping to maximum tech level for optional equipment in shipyards. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1872 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-19 16:20:51 +00:00
Nikos Barkas
4ed8bcf446 Fixed bug where going into any of the F6 screens with the injectors key pressed would result in injectors continuing to run even after releasing the key. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1870 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-18 19:29:17 +00:00
Jens Ayton
a4de3f8cce Fix for crash on fourth attempt to play a given OOCAStreamingSound (OS X only). Fixed JS validation errors in Sound.play(), Sound.playSound(), expandDescription() and displayNameForCommodity(). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1869 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-17 22:06:25 +00:00
Michael Werle
a68999c901 Windows Installer - now extracts Oolite Version number from oolite-version.xcconfig (thanks Ahruman), taking into account X.Y and X.Y.Z version numbers. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1867 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-17 19:04:27 +00:00
Michael Werle
0011b8ca9a Windows Installer 
* Merged Snapshot and Standard packaging scripts (and removed superfluous installer scripts)
* Detect previously installed versions of Oolite and prompt for uninstall
* Removed 2 DLLs which don't appear to be required anymore
* Add some additional version numbering and description to the packaged executable

Makefile
* Auto-generate version information for Windows Installer
* TODO: auto-extract Oolite version from Info-Oolite.plist


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1866 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-17 10:42:14 +00:00
Jens Ayton
13170efb49 Made player.ship.setEquipmentStatus() fire equipmentDamaged() event as appropriate. Corrected Create Ship dialog box in Mac debug OXP. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1865 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-16 17:44:06 +00:00
Jens Ayton
bb9577150e Yes, we need that there. Only with the right parity. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1864 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-16 13:10:03 +00:00
Nikos Barkas
e77e92d5fa Fixed a small bug that would not allow HUD to be switched off again after the first time. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1863 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-16 12:52:17 +00:00
Nikos Barkas
5a46341787 Found and dealt with a stray localizable string in the code. Changed equipmentDamaged and equipmentDestroyed events to return the key of the affected equipment instead of its name. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1861 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-16 09:28:27 +00:00
Jens Ayton
f6c4815f79 New toy for screen shots and graphics debugging: slow mode (console.debugFlags ^= 0x400). Also made HUD hiding a debug flag for console access. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1860 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-15 23:06:58 +00:00
Nikos Barkas
0a1117ba8e Replace SDL.dll with a stripped version for distribution. Upgrade the installer script to modern interface and add confirmation dialog for the uninstaller. Remove DTDs installation for the Windows build, since the gnustep-base-1_15.dll is already built to not require them. Tweak a little the installer so that it does not fail with some versions of NSIS (such as mine ;-) ). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1859 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-15 14:21:56 +00:00
Michael Werle
f65d5b21f0 * fix oversights from build-system-revamp commit 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1858 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-15 10:24:21 +00:00
Michael Werle
ceb2b2e302 * Revamped build system - should make it a lot easier for people to build the sources and create packages 
** Use "make -f Makefile help" to see a list of targets
** Updated Windows NSIS Packager rules
** Minor Tweaks to Debian rules

* Updated SpiderMonkey from 1.7 pre-release to 1.7 (minor changes only)
** Supplied new js32.dll for Windows (built with MSVC)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1857 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-15 09:54:01 +00:00
Jens Ayton
dd1ac56784 Simpler, more efficient equipment shopping code using OOEquipmentItem, with side effect that available_for_all now parses its value correctly.. Corrected use of fuzzyBooleanForKey: in r1855. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1856 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-15 01:10:01 +00:00
Nikos Barkas
57b893d9f2 Fixed not working hasShipyard key for stations. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1854 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-14 23:19:51 +00:00
Jens Ayton
19cbb04377 * Fixes to ship registry: 
- is_template is no longer inherited, causing all derived ships to be
    silently deleted. 
  - Ships whose model can’t be found are now reported and deleted from the
    registry.
  - Ships used as subentities no longer require roles. 
  - Ships with invalid subentity definitions (not exactly eight tokens) are
    now reported and deleted from the registry. 
  - New is_external_dependency key suppresses errors for missing like_ship and
    subentity references. (A ship with is_external_dependency will still be
    deleted from the registry if it can’t be properly resolved, there just
    won't be a message about it.)
 * Added missing compatibility method player.spawnOne().
 * Default galactic_hyperspace_behaviour respelled to BEHAVIOUR_STANDARD.
 * Corrected warning text in setGalacticHyperspaceBehaviourTo:.
 * Added nil check in collision detection.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1853 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-13 09:47:15 +00:00
Michael Werle
520c61fbb3 * Fix bug with Docking Clearance - could no longer cancel requests 
* Fix bug with Docking Clearance - waive fine when in Escape Pod



git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1851 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-13 02:25:11 +00:00
Jens Ayton
8d22e3c41c Work on cleaning up Clang Static Analyzer diagnostics. In particular, moved away from redundant and broken JSFooGetFoo functions. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1850 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-10 23:41:00 +00:00
Nikos Barkas
bfde71ea55 Fixed thargoid curses comms messages appearing out of nowhere (thanks Eric). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1848 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-09 10:05:53 +00:00
Nikos Barkas
28ae09331a Fixed mute trumbles. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1846 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-09 08:45:58 +00:00