cim
fd822b2c2b
Fix a couple of display oddities in new corona
2013-07-30 18:37:57 +01:00
cim
90441d6165
Merge pull request #48 from ErichRitz/scanner_display_bugfix
...
Fix scanner display bug introduced in 50895952
2013-07-29 10:21:33 -07:00
Erich Ritz
a4ecbdcd28
Fix scanner display bug introduced in 50895952
...
See aegidian.org/bb/viewtopic.php?f=9&t=14238 for description.
2013-07-28 14:52:33 -07:00
Jens Ayton
f437d81a12
Remove some unused things
2013-07-15 21:12:42 +02:00
Jens Ayton
87501d8e16
Bump Mac-specific
2013-07-15 20:59:49 +02:00
Jens Ayton
34588377cd
Sign hygiene
2013-07-15 20:58:49 +02:00
Jens Ayton
0a0885d91f
Fix .gitignore excluding src/Core on case-insensitive file systems
2013-07-15 20:58:01 +02:00
Jens Ayton
f7a664f18c
Add OOHPVector and OOJSPopulatorDefinition to Xcode project
2013-07-15 20:56:07 +02:00
AnotherCommander
185ea13e56
Made exhaust emissive color accessible from JS via the read/write exhaustEmissiveColor ship property.
2013-07-15 05:12:01 +02:00
cim
930a9ce659
Remove unnecessary debug lines
2013-07-12 20:38:40 +01:00
AnotherCommander
d5e274aee7
Made exhaust emissive color settable by user. The shipdata key 'exhaust_emissive_color' can be used on a per-ship basis for this purpose.
2013-07-12 04:25:49 +02:00
cim
e102fbd55c
Merge pull request #38 from OoliteProject/javascript-populator
...
Javascript populator and high-precision coordinate system
Closes #22 , implements partially #36 but some tuning of populator and especially repopulator will be needed later
2013-07-11 13:10:09 -07:00
cim
955cca855a
Adjust nova sun settings a little
2013-07-10 20:09:16 +01:00
cim
eaadf2eb01
Detach sun colour randomisation from star colour randomisation
...
Also randomises (slightly) flare and hues settings for the corona.
2013-07-09 20:11:18 +01:00
AnotherCommander
17c27818c7
Merge pull request #42 from OoliteProject/new-sun
...
Pull request for new sun accepted to master.
2013-07-08 16:51:05 -07:00
cim
779eb9bfc8
Display correct pause key in paused message. (issue #41 )
...
Needs fixing in maintenance branch too, but this fix won't work there, because that branch doesn't have c0c4f6d227
2013-07-08 22:20:17 +01:00
cim
c5ed9304f5
Fix conflict in ShipEntityAI
2013-07-08 22:00:09 +01:00
cim
8ca8e8a46f
Merge branch 'master' of github.com:OoliteProject/oolite into javascript-populator
...
Conflicts:
src/Core/Entities/ShipEntityAI.m
2013-07-08 21:53:03 +01:00
cim
fe9c9ece17
Depth-buffer bug fixed
2013-07-08 19:23:57 +01:00
cim
380c9f8f4a
Nova and related adjustments
...
- increase default corona flare
- increase nova corona flare ranges to match
- make nova stars in expansion phase keep high corona flare
- make flare changes in nova mission use frame callback for smooth changes
2013-07-08 19:01:38 +01:00
cim
9224aa96b4
Remove some unused member variables
2013-07-08 18:15:39 +01:00
Jens Ayton
44dc87bda9
Mac build niggle
2013-07-07 21:54:43 +02:00
cim
84dd448b65
Fix potential overheating bug when leaving planet for sun
2013-07-07 16:17:16 +01:00
cim
83ac586803
Adjust parameters slightly, fix atmospheric fog on translucent pass
2013-07-07 16:16:55 +01:00
cim
5fb04f74c3
Experimental: sun glare layer
2013-07-07 14:34:34 +01:00
cim
95139bb660
Reorganise sun drawing to have proper opaque and translucent passes
2013-07-07 13:14:07 +01:00
cim
81c35abf73
Merge branch 'master' of github.com:OoliteProject/oolite
2013-07-07 11:01:01 +01:00
cim
b3681c2cdc
JS properties and methods for docking (issue #35 )
...
ship.dockingInstructions;
ship.requestDockingInstructions(); from targeted else nearest station, returns instructions, sets flight parameters to instructions
ship.recallDockingInstructions(); returns instructions, resets flight parameters to instructions
2013-07-07 10:58:53 +01:00
Jens Ayton
e4b48f43e4
Moar warnings (and fixes for same)
2013-07-06 23:38:39 +02:00
Jens Ayton
6e0da86b00
Remove various unused macros
2013-07-06 23:38:11 +02:00
cim
2a173e8341
Alternative look for sun (code not tidied yet)
2013-07-06 20:12:34 +01:00
AnotherCommander
58f6cf2b70
Replace SVN revision number with build date in yymmdd format in Makefile.
2013-07-06 20:58:29 +02:00
cim
4e0797139f
Fix different compiler warning.
2013-07-06 14:41:49 +01:00
cim
b74e9712db
Add primed equipment notice to small HUD
2013-07-06 14:33:58 +01:00
Jens Ayton
b55ad05907
Fix Mac nightly script to gen changelogs
2013-07-06 14:38:22 +02:00
Jens Ayton
d6660d3f4c
Update Mac nighly script to build from Git
2013-07-06 14:04:28 +02:00
Jens Ayton
c4dcf9d92b
Merge branch 'maintenance/1.77'
2013-07-06 12:25:19 +02:00
Jens Ayton
3ad551d37a
Cleanup: don't need to -weakSelf objects for OOWeakSet
...
Relates to 0a484bb
2013-07-06 12:24:28 +02:00
cim
c88c6e502b
Fix under-retention (related to 0a484bb)
2013-07-06 12:24:06 +02:00
Jens Ayton
0a484bb78a
Fix several leaks of weakRefs
2013-07-06 12:20:59 +02:00
Jens Ayton
fa083fa434
Warning fix
2013-07-06 12:18:37 +02:00
Jens Ayton
6451ec3541
Cleanup: don't need to -weakSelf objects for OOWeakSet
...
Relates to 5636606
2013-07-06 12:18:31 +02:00
Jens Ayton
7bd48704f1
Integer precision issues and cleanup
2013-07-06 12:18:17 +02:00
cim
83e0f31316
Primable equipment dial for HUD
...
Hidden while docked (primable equipment unusuable) or if no primable equipment is installed
2013-07-05 20:30:09 +01:00
cim
fc4c5c23e7
Hostility indicator no longer depends on weapon range of enemy ship.
...
Prevents flickering when ship has weapons of different ranges.
2013-07-04 18:32:32 +01:00
cim
e458618945
Fix harmless compiler warning in Octree
2013-07-04 17:06:15 +01:00
cim
be589dbc47
Correct variable name in script
2013-07-04 17:02:24 +01:00
cim
221bc55185
Fix under-retention (related to 5636606)
2013-07-04 15:27:55 +01:00
cim
377733eff9
Merge branch 'maintenance/1.77'
...
Conflicts:
src/Core/Entities/ShipEntityAI.m
2013-07-04 14:59:15 +01:00
cim
a27d5da974
Remove performBroadside AI command.
...
(Only really useful for testing anyway, never been in a stable release)
2013-07-04 14:50:26 +01:00
