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

5598 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Anthoney
c755d136c8 resize joystick profile graph, add labels 2014-02-04 19:12:20 +00:00
Kevin Anthoney
42e503fdf2 retain joystick deadzone settings when switching between profile types 2014-02-04 17:58:11 +00:00
Kevin Anthoney
aa65818558 Merge remote branch 'upstream/master' into joystick_configurator 2014-02-04 14:41:49 +00:00
Kevin Anthoney
b62f7912c5 Clamp deadzone to STICK_MAX_DEADZONE, not 1 2014-02-04 13:55:05 +00:00
Kevin Anthoney
f7c4c03ac8 put descriptions in descriptions.plist 2014-02-03 22:46:38 +00:00
cim
a54c7298d6 Fix some docking clearance bugs 2014-02-03 22:45:20 +00:00
AnotherCommander
e5021db935 Adjust warning message of previous commit to report the correct required OpenGL extension depending on the OS we are running on. 2014-02-03 17:44:04 +01:00
AnotherCommander
bb775dda97 SDL builds: Make v-sync settable from the user defaults file. The key is 'v-sync = YES/NO', default to YES. Report a warning at the display.initGL level if v-sync has been requested but could not be set. 2014-02-03 12:34:24 +01:00
cim
d8587418d7 Player Asp should be able to equip fuel scoop like NPCs 2014-02-02 22:22:14 +00:00
cim
e5895fe17f Prevent exception if planet texture definition is wrong 2014-02-02 22:22:14 +00:00
AnotherCommander
c6c097c702 Fix git clone url in README.txt (thanks stimer). Closes issue #83. 2014-02-02 18:13:15 +01:00
AnotherCommander
1aa6022982 Merge pull request #77 from kanthoney/joystick_configurator 
Joystick configurator
 2014-02-01 06:05:57 -08:00
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