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

5736 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AnotherCommander
d7bbefaa77 Minor tweak to previous commit. 2014-01-29 10:42:49 +01:00
AnotherCommander
282b2f2770 Adjust screen size correction factor for showShipModelWithKey: to be able to handle also game windows with height bigger than their width. 2014-01-29 10:26:30 +01:00
AnotherCommander
f553455a98 Attempt to fix issue #80 (incorrect position of ship model on status screen in non-4/3 aspect ratio resolutions). This fixes SDL builds only. For Mac, it should be sufficient to add a call to [PLAYER doGuiScreenResizeUpdates] after a window resize event, but I cannot test this here. 2014-01-29 09:29:42 +01:00
cim
2be5513f1d Fix typos in priority AI script 2014-01-28 17:54:15 +00:00
cim
8cfeb5c562 Update OXZ index url 2014-01-27 22:07:25 +00:00
cim
f6a66792e7 Don't use OXP Cobra 3 as the strict mode new game ship model 
Closes #81
 2014-01-27 18:12:27 +00:00
AnotherCommander
530e1cfb53 Fixed a little personality-related bug from previous commit. 2014-01-27 14:52:47 +01:00
AnotherCommander
cf08bb2ea3 The user defaults boolean key 'show-ship-model-in-status-screen' can be now set to YES for displaying the player ship model in the status screen. Contributed by Pleb, who has been addded to the contributors list. 2014-01-27 13:52:08 +01:00
AnotherCommander
5e01396e78 Merge branch 'master' of github.com:OoliteProject/oolite 2014-01-27 10:43:50 +01:00
AnotherCommander
8f0f0cf8b2 Farm out ship model drawing code to new PlayerEntity method -showShipModelWithKey: shipData: personality: factorX: factorY: factorZ: inContext: to avoid code duplication. 2014-01-27 10:42:50 +01:00
cim
012facbe09 Add file_size property to OXZ manifests 
Test manifest index has been updated to include this property.
 2014-01-23 21:49:01 +00:00
cim
5ee878d511 Wild guess at cause of #79 2014-01-22 22:03:06 +00:00
cim
01bb1e1b81 Fix typo in assassin AI 
(and same typo in a currently unused method)
 2014-01-22 18:05:07 +00:00
cim
d5f99b6e84 Remove collision check optimisation 
It doesn't seem to help game speed much, and it gives odd results at times (going all the way back to buoy repair stations and commie transports, in fact)
 2014-01-21 22:35:33 +00:00
cim
20dff539a5 More extra logging for the cache problems 2014-01-21 18:20:19 +00:00
cim
e514f43dca Add some comms message points (and test messages) for witchspace entry 2014-01-20 20:03:05 +00:00
cim
a6e18a02c4 Add more cache logging temporarily. 2014-01-20 20:03:05 +00:00
AnotherCommander
3b95ebbd34 Updated year visible on screen to 2014 on title screen and Windows installer. 2014-01-20 17:21:16 +01:00
cim
c272d8952d Ships can be set to have available_to_all equipment barred 
script_info = { "oolite-barred-equipment" = ("EQ_KEY1","EQ_KEY2",...); };
 2014-01-19 11:48:35 +00:00
cim
678abb6569 Display "restarting" notice when OXZ manager is applying changes 2014-01-18 16:45:38 +00:00
AnotherCommander
554517faf6 Switch ownership of watermark from HeadUpDisplay to Universe. This way it can be displayed at all times, as it is meant to be. 2014-01-18 16:06:56 +01:00
Jens Ayton
03b13bb114 Fix invalid logging of NSUIntegers 2014-01-18 11:56:29 +01:00
Jens Ayton
29150762a3 Correct signed/unsigned arithmetic confusion 2014-01-18 11:56:10 +01:00
cim
ed7a8db979 Merge branch 'master' into oxz-installer 
Conflicts:
	src/Core/Entities/PlayerEntityControls.m
	src/Core/ResourceManager.m
	src/Core/Universe.m
 2014-01-17 21:59:26 +00:00
cim
c5a91aa8f2 Docking ships don't release their escorts until later 2014-01-17 21:50:35 +00:00
Kevin Anthoney
ecf5b45503 start profile screen on axis row 2014-01-17 18:38:41 +00:00
AnotherCommander
925a4035c2 Reverted previous commit and re-applied it the way cim intended it to be. 2014-01-17 14:14:00 +01:00
Kevin Anthoney
4031f75c8a remove some unused stuff 2014-01-17 08:44:53 +00:00
Kevin Anthoney
4c217c8c56 add axis-specific deadzones, cleanup 2014-01-17 08:44:53 +00:00
Kevin Anthoney
a50d609be6 get profile saving to work 2014-01-17 08:44:53 +00:00
Kevin Anthoney
67076e5f06 streamlined configurator screen 2014-01-17 08:44:53 +00:00
Kevin Anthoney
151d715074 expunge lots of code in favour of simplified approach 2014-01-17 08:44:53 +00:00
Kevin Anthoney
5eedd343cd Add profile edit screen 2014-01-17 08:44:53 +00:00
Kevin Anthoney
073eda0f9f commit because everything so far seems to be working properly 2014-01-17 08:44:53 +00:00
Kevin Anthoney
b12f205d17 massive re-jig of joystick profile code 2014-01-17 08:44:53 +00:00
Kevin Anthoney
3238d47c91 Add initial OOJoystickProfile code 2014-01-17 08:44:53 +00:00
cim
0b97d57603 Guard against phase differences in refresh rates 2014-01-16 21:16:13 +00:00
cim
6b7f934440 Fix mouse controls on shipyard screen 2014-01-16 21:13:15 +00:00
cim
0abc4c5b21 Fix bug with failed download handling 2014-01-16 20:52:15 +00:00
cim
e53dff467a Fix left/right keys in install/remove settings 2014-01-16 20:46:37 +00:00
cim
c626a955e1 A bit more in-manager documentation 2014-01-15 20:57:36 +00:00
cim
8e0438631d Fix list scroll bugs, better sorting of lists, other UI fixes 2014-01-14 22:45:31 +00:00
cim
a3b05abf76 Turn off debug logging, sort the installation list 2014-01-14 19:45:51 +00:00
AnotherCommander
22da020473 Fix two bugs, one regarding equipment with requires_cargo_space set when fully loaded with cargo and one about misreporting available cargo space when fully loaded and with equipment requiring cargo space present. 2014-01-14 19:11:50 +01:00
cim
fe4192029e Finish off basic interface, a bit of cleanup 2014-01-13 18:27:43 +00:00
cim
5483a170cc Colour-code install menu by installability 2014-01-12 22:52:40 +00:00
cim
a7b8f83c68 OXZ removal, make install-reported version accurate 2014-01-12 13:19:02 +00:00
Jens Ayton
7f5e17be82 Staticize a local constant 2014-01-12 12:47:51 +01:00
cim
8d3ef6e4ab PlanetTextureGenerator also needs to use initWithPath 2014-01-11 18:11:26 +00:00
cim
b18a45f281 Allow installation of managed OXZs, adjust a few other bits 2014-01-11 17:44:32 +00:00