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

3007 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jens Ayton
c54fe64bbf Updated Mac OpenGL context handling to be slightly more similar to recommended best practice. Doesn't actually _follow_ best practice because best practice only works in Snow Leopard. Also, avoid unnecessary graphics reset during startup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3611 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-26 13:18:31 +00:00
Jens Ayton
7613a150bf Less tight JS time limit in testrelease builds for now. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3610 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-26 12:51:47 +00:00
Marc
ea7bebd7e5 - Removed the redundant Vector3D.vectorFromCoordinateSystem() convenience method in favour of the just as convenient Vector3D([1,2,3]).fromCoordinateSystem('pwm') usage... (trunk & maintenance) 
- groolite method name cleanup. (trunk)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3609 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-26 12:48:23 +00:00
Marc
7caae74618 * Internal & legacy coordinates conversion: we now have Vector3D.vectorWithCoordinateSystem(vectorExpression, string:coordSystem); 
plus the instance methods vectorValue.fromCoordinateSystem(string:coordSystem) for 'pws','spu', etc... -> 'abs' conversions, and vectorValue.toCoordinateSystem(string:coordSystem), that performs 'abs' -> 'pws','spu', etc... (maintenance & trunk)
 - removed the now redundant system.legacyToCoordinates() (trunk)
- removed a spurious market setup warning (maintenance)
- removed a GNUStep compile warning (maintenance)
- minor code tidying up.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3607 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-26 11:10:39 +00:00
Jens Ayton
54125b43fb Cleaned up inconcistent whitespace in CHECKLIST.TXT. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3606 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-26 10:49:24 +00:00
Jens Ayton
44596f8334 Added pseudo-root exception handler for GNUstep. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3605 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-25 21:40:23 +00:00
Nikos Barkas
6f6a6e84b2 Possible fix for random speech related crashes on Windows, as reported in www.aegidian.org/bb/viewtopic.php?t=9116 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3600 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-25 16:08:34 +00:00
Jens Ayton
032813faac Updated Mac Ogg and Vorbis libraries. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3598 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-25 09:22:54 +00:00
Nikos Barkas
bf28e7bb6a Fixed build error. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3597 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-25 07:37:58 +00:00
Jens Ayton
47a7610e3e Missing change from r3594. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3595 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-24 23:48:59 +00:00
Jens Ayton
fa049510d0 Vector3D and Quaternion methods now throw JS exceptions if called on objects of the wrong type. Various Vector3D and Quaternion utility methods now assert non-nullness of parameters rather than quietly failing. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3594 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-24 23:48:38 +00:00
Jens Ayton
d4b43e5ff9 Removed some unused declarations. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3593 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-24 19:39:40 +00:00
Jens Ayton
288b0650d5 Improved JS profiler output. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3592 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-23 20:02:36 +00:00
Marc
444814900a - implemented system.legacyToCoordinates() as per discussion on http://aegidian.org/bb/viewtopic.php?t=8117 
To be ported to maintenance before 1.74.1?

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3591 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-23 05:06:33 +00:00
Jens Ayton
4f9bbd2262 Tiny cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3590 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-22 20:40:12 +00:00
Jens Ayton
8749abb049 Switched gpu-settings.plist to a dictionary, for useful merging behaviour. Added explicit precedence setting. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3589 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-22 20:39:41 +00:00
Jens Ayton
5ea3215c1c Cleaned up JS exception wrapper stuff. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3588 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-22 18:08:10 +00:00
Jens Ayton
6f9f338732 Fixed a bunch of syntax errors flagged by Apple-Clang 1.5. Switched default compiler for 64-bit Mac OS X build to LLVM-GCC (because using Clang causes a linker crash). To build under Leopard, it will be necessary to change back; see src/Cocoa/oolite-targets.xcconfig. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3587 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-21 23:08:06 +00:00
Jens Ayton
32e1884e05 Groovy yet horrible macros to automate conversion of ObjC macros to JavaScript macros, and also profile individual native callbacks. More info in the Top Secret Mailing List Treehouse. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3586 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-21 18:07:47 +00:00
Jens Ayton
bcb23f31ee Removed redundant warning for unknown method types in shader bindings/JS call(). More sorting of JS properties for ease of maintaining documentation. Minor cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3585 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-21 14:55:34 +00:00
Nikos Barkas
c3061d4029 Fixed some breakage in equipment.plist. Upgraded Windows GNUstep base library to version 1.18.0. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3584 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-21 07:46:03 +00:00
Marc
e84a0d339c - fix: short range map highlight should have dealt with system info icons, as well as system names. (trunk & maintenance) 
- more equipment tweaks, hopefully sensible ones. (trunk)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3583 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-21 01:18:02 +00:00
Michael Werle
1f66a0fa7a Fix crash-bug when moving cursor around local screen. It's possible for a target-system to be selected which isn't in the local systems cache. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3582 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-20 16:14:39 +00:00
getafix
37e90934cf Added instructions on how to install an autopackage package. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3581 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-20 09:41:45 +00:00
Jens Ayton
0f0fc52754 Renamed EquipmentInfo.canAwardMultiple to canCarryMultiple. Equipment visibility now applies to shipyard blurbs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3580 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-19 20:40:09 +00:00
Marc
fb228765e3 Corrected mission text typo. (trunk & maintenance) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3579 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-19 19:56:05 +00:00
Jens Ayton
6ded4261b2 Cleaned up canAwardEquipment - now admits the existence of canAwardMultiple equipment, and has less redundancy. Added available_to_player and available_to_NPCs properties for equipment. Exposed five new equipment properties to JS. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3578 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-19 19:18:41 +00:00
Jens Ayton
16b8d30f54 Trumbles are no longer listed as equipment on status screen - hard-coded in maintenance, equipment attribute in trunk. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3577 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-19 18:36:10 +00:00
Jens Ayton
2eebd7cacf JS and legact scripts can now award multiple trumbles. equipmentStatus() now works for trumbles. setEquipmentStatus() cannot be used to damage impervious equipment types, including but not limited to trumbles. Cleaned up awardEquipment methods and damage handling. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3576 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-19 18:04:01 +00:00
Marc
40f2cf60de - major espeak languages cull. Temporarily removed Russian voice due to incompatibility with Russian oxp. 
- minor ship.sendAIMessage() cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3575 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-19 17:52:52 +00:00
Jens Ayton
fc408bd911 Disabled shaders for that horrible lying VirtualBox thing. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3574 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-19 15:50:25 +00:00
Jens Ayton
66a01337e9 Added JS Ship.sendMessage(). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3573 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-19 13:37:54 +00:00
Eric Walch
749ea7de08 Make sure the mission version of the constrictor always has a bounty, even when a constrictor version from a third party is chosen. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3571 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-19 13:37:34 +00:00
Jens Ayton
b084484661 Implemented stack trace for AI recursion error. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3570 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-19 13:10:55 +00:00
Jens Ayton
86436966f2 Re-enabled maximum_shader_level settings (trunk). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3569 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-19 11:50:35 +00:00
Jens Ayton
be0ba9331c Disabled shady dust on GMA 9XX systems (where vertex shaders are handled on the CPU). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3568 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-19 11:45:00 +00:00
Jens Ayton
2512412213 Expanded JS debug call() to methods that return numbers, vectors or quaternions. Now shares code with shader uniform bindings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3567 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-19 11:14:35 +00:00
Jens Ayton
b5c5b5547d Tidied up prefix script a bit. Use longer timeout when loading scripts (accidentally omitted from r3550. Sorted JS Ship methods. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3566 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-19 09:42:04 +00:00
Jens Ayton
c7f103fe1f Sorted JS Ship property declarations. Fixed bug where attempting to get a weapon type for a weapon with no slot would halt the script (backported). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3565 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-18 13:10:52 +00:00
Jens Ayton
0a19def066 Sorted OOJSPlayerShip property/method declarations. Fixed bug when trying to engage autopilot while docked. Cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3564 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-18 12:37:06 +00:00
Jens Ayton
b3125322a9 JS player.ship.engageAutopilotToStation() no longer silently halts the script when failing. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3563 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-18 12:00:57 +00:00
Jens Ayton
94e8dfc093 JS player.ship.awardEquipmentToCurrentPylon() no longer silently halts the script when failing. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3562 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-18 11:48:40 +00:00
Marc
46c4badaa7 - Change: Thargons will now use the standard 'EQ_THARGON' identifier internally. Should still accept the non-standard 'thargon' identifier as a an alias - there might well be related breakages! (trunk) 
- Change: reworded debug console error messages. (trunk & maintenance)
- Comment cleanup. (trunk)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3561 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-18 08:41:35 +00:00
Jens Ayton
b2120abb35 Sorted some JS property and method declarations alphabetically to make checking their corresponding wiki pages easier. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3560 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-17 22:57:31 +00:00
Jens Ayton
e0c2c5123b Minor optimizations and cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3559 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-17 22:56:28 +00:00
Jens Ayton
0eae9af0e7 Optimized OOLogAbbreviatedFileName() for faster OOGL() and logging. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3558 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-17 22:55:57 +00:00
Eric Walch
8120ac3653 Make "Game Options" the default choice on the load/save game page, when docking as a non-main station instead of the first line what is "Begin New Game" on such stations. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3557 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-17 20:53:05 +00:00
Marc
10b04327cf Further changes to main weapon purchase. 
- GUI: show the weapon being purchased before listing the facings, as in 1.74.
 - if the shipyard data has "weapon_facings" = 0; (i.e. no weaopon facing is available) no main weapon will be offered for sale.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3555 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-17 18:29:21 +00:00
Marc
cb4fa48f9f - fix: restored case insensitvity for 'classic' manifest identifiers. In other words, player.ship.manifest['Gem-Stones'] works again. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3553 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-17 14:34:42 +00:00
Michael Werle
8f63bcdfa9 Fix wrong logging of market generation errors (bug #17251). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3552 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-16 20:16:42 +00:00