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

1305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jens Ayton
edc97898a2 Fix for non-shader material breakage in r1565. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1568 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-20 15:22:51 +00:00
Jens Ayton
a3cd6cf6ca Stuff from r1565-r1566, now with not doing the svn in src/. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1567 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-20 15:02:38 +00:00
Jens Ayton
02bc392335 Implemented music mode UI. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1566 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-20 14:38:09 +00:00
Jens Ayton
36eff7cb26 Fixes for subentity shader bindings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1565 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-20 13:19:25 +00:00
cmdrjames
35d3a61ba2 potential fix for [ Bug #12240 ] Ghost Cargo Pods 
Fixes some cases where cargo is left unscoopable, but there may be others.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1564 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-20 11:39:35 +00:00
cmdrjames
0805b6b6e8 minor change to text of logging 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1563 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-20 11:34:52 +00:00
Marc
17dc35ef1e bugfixed altimeter: now works correctly with the sun, and with n nested planets (as opposed to just 2 nested planets). Improved altimeter behaviour when planets are close to each other. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1562 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-20 01:21:32 +00:00
Marc
aa023b65a5 Materials: undone r1497 changes to OOMaterial.m and hopefully improved texture handling in OOShaderMaterial.m 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1561 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-19 17:46:50 +00:00
Jens Ayton
a09eb90389 Trimming down to four nebula textures, step 3 of 2 (syntax fix, updated Xcode project, updated contributors.txt). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1559 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-18 13:36:01 +00:00
Jens Ayton
92996fd787 Trimming down to four nebula textures, step 2 of 2. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1558 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-18 13:31:05 +00:00
Nikos Barkas
56a8907cb5 Checking in Eric's fix for the Constrictor mission incorrectly resetting mission briefing after the Constrictor has been destroyed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1556 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-18 09:43:22 +00:00
Nikos Barkas
a1d99539d6 Small fix for previous commit. HUD now does not switch off if game is paused and user presses 'n' without having switched it on first. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1555 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-16 13:36:26 +00:00
Nikos Barkas
ef293949bd Added setOverallAlpha HUD method. When in pause, the 'o' key will switch off the hud by making it fully transparent (could be useful for screenshots). The 'n' key (all debug flags off) will make the HUD reappear. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1554 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-16 13:13:01 +00:00
Jens Ayton
11e2d46271 Wrote unit tests for OOCollectionExtractors, as part of making them an independent library, and fixed several semantic bugs. Will port unit tests back to Oolite version. Also silenced an unimportant build warning using gcc 4.2 with -Wstrict-overflow=5. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1553 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-13 17:02:19 +00:00
Erich Ritz
c3f5a1f9bf Revert change to MAX_AXES and MAX_BUTTONS for mac as well. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1552 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-13 10:13:42 +00:00
Nikos Barkas
7fbd85b259 Fixed turret subentities not showing. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1551 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-13 00:13:03 +00:00
Erich Ritz
474a2969a4 Revert change to MAX_AXES and MAX_BUTTONS 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1550 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-12 22:38:17 +00:00
Nikos Barkas
424300bdf8 Added Getafix to contributors list for enabling shader support on the Linux builds. Appended Disembodied's Advice for New Commanders text to Oolite_Readme.txt. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1549 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-12 06:31:46 +00:00
Marc
a935ca8808 Corrected quaternion error message. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1548 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-11 06:08:31 +00:00
Nikos Barkas
b97ab4db52 Checking in Getafix's Linux shaders fix. Linux users with systems supporting shaders, please check that shaders work. Linux users with systems not supporting shaders, please check that the program continues to run without problems. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1547 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-09 06:24:16 +00:00
Marc
a16d13609c Great DESC conversion continues. Bugfix for bug #13564 & oolite now gives the right message when trying to jump more than 7 ly. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1546 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-06 01:55:53 +00:00
Marc
6ef2d66b16 JS Bugfix: changes to local system properties (tech level, government, etc...) now take effect immediately. Minor change to a new description string. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1545 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-06 00:18:03 +00:00
Marc
cc9f7cd857 Energy unit changes: energy units recharge rate adjusted to offer a better challenge to the player, and naval/extra energy unit purchase behaviour more flexible (see resolution of Bug #13507, Naval Energy Unit bug in berlios). Warnings added if energy units are going to be removed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1544 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-05 16:12:59 +00:00
Nikos Barkas
8a219606a2 Fix altitude bar never becoming red at low altitude (thanks Getafix). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1543 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-05 08:50:14 +00:00
Jens Ayton
33a5d8fb01 Disabled adaptive octree depth, because it seems to be breaking collision detection. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1542 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-04 10:04:52 +00:00
Marc
2f48840d7a Game Over part3. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1541 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-04 01:10:08 +00:00
Marc
0f38445b4e Shipyard techlevel bugfix. It now works as described in the wiki (i.e. techlevel=5 will allow ships to appear for sale in systems with technological level 6) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1540 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-03 22:47:18 +00:00
Jens Ayton
00482abd93 Fixed signed/unsigned comparison warning. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1539 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-03 20:42:07 +00:00
Erich Ritz
bbce7ad3ef Clear both button and axis settings for functions which support both when assigning a new button or axis. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1538 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-03 00:52:12 +00:00
Marc
c950465443 Game over bugfix, part 2. Now game over reinitialises the universe. Tested anything I could think of, hopefully there won't be any more loose ends. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1537 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-02 21:35:27 +00:00
Erich Ritz
0efb695254 Correctly handle analog axes for view control 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1536 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-02 16:01:07 +00:00
Erich Ritz
2e5f7c95de Add joystick button/axis support for view forward, aft, port, and starboard. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1535 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-02 14:02:16 +00:00
Marc
b62473dc29 Game over changes: restart now sets system data properly, and the reset event is now called only once after game over. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1534 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-01 23:41:29 +00:00
Erich Ritz
93cbddc81f Reduced max rows in Joystick config page so \'Game Paused\' text doesn't overlap. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1533 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-01 22:44:10 +00:00
Erich Ritz
9e06509c44 Allow for more than 15 joystick functions on the configuration screen by splitting the list into multiple pages. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1532 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-01 16:19:12 +00:00
Marc
3b8ec3ee87 Passenger berth bugfix: immediately after loading a save game, sometimes berths could be purchased even with a full cargo. Could lead to negative (ie really huge) cargo space. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1531 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-01 01:48:32 +00:00
Nikos Barkas
57a1f9ef7e Fixed Cargo Bay Extension not extending cargo space when bought. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1530 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-31 21:15:57 +00:00
Marc
b4207bb73d Change: js reset events are now run after initialising mission variables from save files: housekeeping routines can now be placed inside this.reset! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1529 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-31 21:08:14 +00:00
Jens Ayton
94525b8b9e Added overall_alpha key to HUD dictionaries, defaulting to 0.75%. (Idea from another_commander, but rewritten for flexibility and generality.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1528 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-31 17:23:03 +00:00
Marc
05f0167d07 Spikey ball bugfix for setUpPlanetFromTexture. Hopefully that's the last bug in there... 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1527 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-31 12:05:46 +00:00
Marc
c4c264bb38 Plugged memleak in new setUpPlanetFromTexture. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1526 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-31 08:43:51 +00:00
Marc
71d4731a08 Corrected a typo in previous bugfix, and added experimental planet.setTexture in javascript. Usage restricted to shipwillexitwitchspace & shipwilllaunchfromstation, with log warnings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1525 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-31 06:20:02 +00:00
Marc
874adc106b Bugfix: altimeter and script/ai notifications on nearing planet now work for all planets & moons, including nested planets. Not tested with - or meant for - more than 2 nested planets at a time. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1524 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-31 02:18:13 +00:00
Marc
f7d8cacc11 Can't-stop-bugfixing bugfix. The witchspace/leave aegis & planet vicinity events now fire in the proper order! (Bug #13237) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1523 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-30 06:00:08 +00:00
Marc
62082e6b1e Bugfixes: comms log works as expected. First in, first out. Repairing a damaged weapon (awarded via oxp) doesn't add an extra weapon anymore. (bugs #13471 & #13481). 
Changes: weapon mountings with mounted weapons now in a darker green. awardEquipment: if undamaged equipment present, trying to assign its damaged equivalent will fail with a warning. Trying to award an undamaged weapon using awardEquipment() will also fail with a warning.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1522 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-30 04:33:20 +00:00
Jens Ayton
69003c93ed Added Thargoid Curses to SystemDescription.dot output, and changed the Eat Foo, Bar! insult to use more varied values of Foo. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1521 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-28 09:31:35 +00:00
Nikos Barkas
d8fd8310da Better fix for the Advanced Space Compass issue. Now works as expected also with the JavaScript player.awardEquipment method. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1520 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-28 02:30:23 +00:00
Nikos Barkas
eda5722fd9 Fixed Advanced Space Compass not working immediately after being bought. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1519 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-28 01:35:27 +00:00
Erich Ritz
f75d924c76 Fixed compiler warning (changed type int to unsigned). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1518 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-27 22:36:13 +00:00
Nikos Barkas
4d7e682c94 Update to contributors.txt. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1517 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-26 19:42:49 +00:00