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

1944 Commits

Author SHA1 Message Date
Darren Salt
9fa8558eb4 Cope with failure to set a full-screen mode. 
libsdl1.2debian 1.2.13-5 has a patch which enables xrandr.
However, this patch causes oolite to segfault on selecting full-screen mode.
This can be worked around by setting SDL_VIDEO_X11_XRANDR=0.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2699 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-24 23:29:38 +00:00
Jens Ayton
edc70ece82 Protection against death by degenerate polygon. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2698 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-24 22:35:43 +00:00
Jens Ayton
9915908ae6 Fixed geometric reasoning error in r2695. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2697 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-24 21:46:37 +00:00
Nikos Barkas
49e2fe394e A couple of small fixes with game window set up on Windows. A 800x600 setting will actually generate a 800x600 game window (was creating 792x573 previously). This is consistent with previous Oolite versions. As a byproduct of this, oolite.gameSettings.gameWindow.width/height returns correct values also when used in the this.startUp event handler. Test on Linux may be required. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2696 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-24 21:04:49 +00:00
Jens Ayton
d89759c039 Improved mitred vertex appearance. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2695 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-24 20:49:44 +00:00
Jens Ayton
f04114145f Polygon sprite outlines implemented. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2694 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-24 19:58:26 +00:00
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
6b1933f727 Cross-platformicated r2691 (I think). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2692 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-24 09:09:01 +00:00
Nikos Barkas
3345d0134d Added information about the game window in the [UNIVERSE gameSettings] dictionary. This information is represented by a dictionary with keys width, height and fullScreen. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2691 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-23 21:17:58 +00:00
Nikos Barkas
714f3a33cc Added the shipFiredMissile(missile, target) script event for player and NPCs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2690 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-23 07:16:41 +00:00
Jens Ayton
94a35c235f Fix polygon sprite behaviour when getting empty polygons. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2689 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-23 06:47:57 +00:00
Nikos Barkas
ceac5263af Commited Y A J's patch for caching information on the Short Range Chart screen, in order to avoid [UNIVERSE generateSystemData:] being called continuously and resulting in frame rate drop. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2687 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-22 07:57:55 +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
Eric Walch
5ecd442443 Added "cascade weapon" as cause of death. Corrected the switched "energy damage / removed" messages. scanFonNonThargoid does no longer find cloaked ships. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2685 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-21 12:15:45 +00:00
Nikos Barkas
84800c9134 Allow break pattern model to be specified externally. This works similar to the docking clearance: The default is set in the 'universal' section of planetinfo.plist under the 'default_breakpattern_model' key and is used for both hyperspace and docking pattern. Docking pattern can be overriden for each station by setting the key 'docking_pattern_model' in its shipdata. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2684 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-20 20:28:12 +00:00
Marc
bf2c0ae47e - fix: new missile & beacon icons code seems to be working OK now, resuming normal HUD display... 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2683 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-19 23:47:40 +00:00
Marc
3824a9ae87 - fixed a mac compile warning. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2682 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-19 21:30:37 +00:00
Marc
228ae5a9f5 - change: hyperspace tunnel colour now scriptable from inside planetinfo.plist 
- comment cleanup inside constrictor hunt.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2681 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-18 19:30:31 +00:00
Nikos Barkas
8fa1b264d9 Cleared 'control reaching end of non-void function' warning. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2679 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-17 12:50:22 +00:00
Michael Werle
f6f36aeebd Additional dumping for WH_SCANINFO_NONE assertion failure (See: http://aegidian.org/bb/viewtopic.php?t=6925) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2678 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-17 11:28:29 +00:00
Michael Werle
ed416313a0 Heatshield rework as per http://aegidian.org/bb/viewtopic.php?t=6922 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2677 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-16 23:23:31 +00:00
Nikos Barkas
5dcf1b4226 Improvement to the Advanced Navigational Array: Pressing Shift+6+Ctrl now displays the optimized-for-time route to destination in cyan color. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2676 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-16 22:03:59 +00:00
Marc
c946e0a528 - added USEMASC switch to enable/disable MASC military jammer & filter usage at compile time. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2674 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-16 10:43:25 +00:00
Eric Walch
93ba473d78 fixed sanity check confusion with docked station during firing the playerWillDockStation. Now all places that lose a target while tracking targets will send a noteLostTarget and will go into performIdle. When noteLostTarget was called without a target, it still will notify the ship about losing a target. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2673 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-15 17:09:38 +00:00
Michael Werle
8abfd996a4 Named missile-armed messages, as per http://aegidian.org/bb/viewtopic.php?t=6895 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2670 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-12 21:22:01 +00:00
Marc
c0ca2c8d27 - fix: when selling equipment, playerBoughtEquipment could disrupt time adjustment (test case:buy & sell thargon drones with captured thargons oxp) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2669 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-11 20:30:24 +00:00
Michael Werle
472cdae1dd New OOPolygonSprite - change APIENTRY #define guard from platform-specific to check whether APIENTRY is already defined in current environment. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2668 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-11 16:16:16 +00:00
Jens Ayton
545b654b19 Added log message to help tell polygon sprites apart in tesselation spew. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2667 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-11 14:24:30 +00:00
Jens Ayton
233dd3131e Cleaned up APIENTRY stuff, and implemented polygon sprite combine callback, thus enabling self-intersecting polygons. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2666 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-10 22:36:17 +00:00
Marc
b850d1ce79 - got OOPolygonSprite to compile under both windows and macs - might still fail under linux... 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2665 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-10 19:49:00 +00:00
Michael Werle
6843c56f0a Tweak to Target System Memory Expansion - properly uses ID mode now when missile targetting is not active. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2664 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-10 19:40:10 +00:00
Marc
26860395eb - fix for ludicrous display settings 
- last minute tweaks to new APIs for consistency: ship.equipment[n] just returns the type of equipment, finding out if the player's equipment is damaged is handled by querying .equipmentStatus, .maxMissiles is now missileCapacity, again to be consistent with all the other .xyzCapacity properties.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2663 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-10 15:06:02 +00:00
Nikos Barkas
89d4f55cbf Fixed crash in Windows when using multi-contour polygon sprites for missile icons. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2662 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-10 14:10:57 +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
e1ea90a110 * change: .awardEquipment and .removeEquipment now return false if not successful. 
* change: awarding/removing a passenger berth/extended cargo bay via script now works, and changes max cargo appropriately.
* change: .hasEquipment now works with passenger berths.
- more code cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2660 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-09 19:03:14 +00:00
Jens Ayton
4dc0a13fe9 As per thread on JS mission screen redesign, added global expandMissionText() and made mission.addMissionTextKey() a convenience wrapper. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2659 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-09 15:11:25 +00:00
Nikos Barkas
883837e701 Fixed rapid fire turrets. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2658 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-09 12:18:13 +00:00
Jens Ayton
0279aef8a1 A week's accretion of minor cleanup stuff. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2657 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-09 10:18:19 +00:00
Jens Ayton
2e02643e80 Fixed type mismatch error. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2656 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-08 23:45:38 +00:00
Eric Walch
fcf3262010 bounty now correctly returns bounty and not legal_status. (Probably a C&P error as player only knows legal_status) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2655 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-08 21:10:20 +00:00
Nikos Barkas
38a29f0c84 Sanitized conditions in hasShipyards before processing them, so that e.g. hasShipyard = ([quotes]score_number greaterthan 1[quotes]); works again. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2650 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-08 08:36:53 +00:00
Marc
95c2797e81 - fix: switching to galaxy map from contracts screen using '?' now highlights the contract destination correctly in all cases now - it was failing with short names like 'Ra' in galaxy one. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2649 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-07 23:43:08 +00:00
Nikos Barkas
70d2d2b260 Fixed exception when hasShipyard was being given a conditions array to process. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2648 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-07 21:09:19 +00:00
Michael Werle
7bb913afe0 - Tweaked new docking-clearance-request-updates messages as discussed. 
- Renamed docking-clearance resource strings to be more consistent.
- Fixed slow-gpus plist; it was causing exceptions in MacOS


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2647 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-07 20:26:02 +00:00
Marc
bcbe5fd939 - undone the generic fix for status screen paging as it was hampering the F5/F5 screen (it became F5/F5/F5) hopefully re-applied the older fixes in the right place. 
- reworked some error messages. Added to entropy / killed a few fairies by allowing 3 separate aliases for each of the double-worded commodities (foo in Manifest['foo']). Some culling is probably advisable.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2644 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-07 00:33:14 +00:00
Eric Walch
61414e8e02 Added update messages when player is waiting for docking clearance 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2642 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-06 16:16:02 +00:00
Marc
a7c2cd2578 - hopefully last tweak to the way available cargo is computed... 
- tidied up some warnings, and added a test condition against changing cargo values when Special Cargo is in use.
- corrected a silly mistake in the manifest commodity setter.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2641 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-06 16:12:50 +00:00
Michael Werle
4009e2259a Replaced OOUniversalID id_locks[] with ShipEntity * id_locks[] (OOWeakReferences) in StationEntity - this should fix phantom ships from holding up NPC ships. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2640 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-06 15:29:53 +00:00
Marc
0721d9d93b - added the js manifest code to trunk... 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2639 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-06 09:49:10 +00:00
Marc
b1b835713e - deprecated player.ship.awardCargo() & player.ship.canAwardCargo() 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2638 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-06 09:20:34 +00:00