Commit Graph

3596 Commits

Author SHA1 Message Date
ulteq
4449c99eba Removed debug output 2015-04-18 12:13:27 +02:00
ulteq
2a6dcbfbcb Added automatic unit conversion for the target data 2015-04-18 12:12:19 +02:00
ulteq
9057edb1e2 Added a new module option for wind deflection:
*enabled - true/false
2015-04-18 11:10:05 +02:00
commy2
4264f78128 player has to put weapon on back before climbing, check if still can climb 2015-04-18 10:16:10 +02:00
commy2
fd821de353 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-18 09:27:07 +02:00
commy2
9633547d6b tweak ability to climb 2015-04-18 09:26:47 +02:00
PabstMirror
060dc22ad5 Merge pull request #721 from acemod/privatesPass1
Privates Var Fixing
2015-04-17 23:51:23 -05:00
PabstMirror
d7da259c11 Merge pull request #688 from acemod/optionMenuStuff
Option menu stuff
2015-04-17 23:49:37 -05:00
bux578
e2185d2d4a Merge pull request #725 from Tachii/patch-9
Update stringtable.xml
2015-04-18 06:44:37 +02:00
bux578
a610872863 Merge pull request #724 from Tachii/patch-8
Update stringtable.xml
2015-04-18 06:44:20 +02:00
bux578
55cd6536a8 Merge pull request #727 from Tachii/patch-11
Update stringtable.xml
2015-04-18 06:44:05 +02:00
bux578
386802cc16 Merge pull request #726 from Tachii/patch-10
Update stringtable.xml
2015-04-18 06:42:48 +02:00
bux578
ed242fdea4 Merge pull request #723 from Tachii/patch-7
Update stringtable.xml
2015-04-18 06:42:39 +02:00
PabstMirror
caef5c105f More Privates 2015-04-17 22:40:37 -05:00
ViperMaul
db4de5100d #552 - Copy important files and extensions 2015-04-17 20:23:39 -07:00
PabstMirror
71e62711c6 #731 - stop error if target offscreen 2015-04-17 22:02:23 -05:00
jaynus
c952a97de8 Revert "synced events implemented into litter."
This reverts commit 32df4a2adc.
2015-04-17 19:38:05 -07:00
jaynus
32df4a2adc synced events implemented into litter. 2015-04-17 19:33:07 -07:00
jaynus
93d03b404f JIP Sync events complete. 2015-04-17 19:26:27 -07:00
jaynus
da09b74fe4 Don't JIP check server side, but still have it fire for HC. 2015-04-17 18:27:35 -07:00
jaynus
8fa0c91632 Added PlayerJIP event, handled full requests on JIP. 2015-04-17 18:23:26 -07:00
Tachii
ad61557557 Update stringtable.xml 2015-04-18 03:10:28 +03:00
Tachii
711be038fc Update stringtable.xml 2015-04-18 03:09:51 +03:00
Tachii
b7c7d2ff15 Update stringtable.xml 2015-04-18 03:04:14 +03:00
commy2
708a2aa374 check if ddls are present on mission start 2015-04-18 01:44:53 +02:00
Tachii
04858bb673 Update stringtable.xml 2015-04-18 02:19:09 +03:00
PabstMirror
ed2e847247 More Privates 2015-04-17 18:13:09 -05:00
Tachii
7f942a06f8 Update stringtable.xml 2015-04-18 02:11:16 +03:00
Tachii
0bb3238db1 Update stringtable.xml 2015-04-18 02:09:59 +03:00
esteldunedain
faa7513a79 Merge branch 'streamlinedBasicDiagnosis' of github.com:KoffeinFlummi/ACE3 into simpleDiagnosis 2015-04-17 20:09:04 -03:00
esteldunedain
15720dce31 Yellow and Red medical crosses 2015-04-17 20:08:30 -03:00
Tachii
bd3ef35c88 Update stringtable.xml 2015-04-18 02:07:49 +03:00
commy2
ad287d3d23 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into error 2015-04-18 01:05:42 +02:00
commy2
3ec5acbdb0 stuff 2015-04-18 01:05:30 +02:00
esteldunedain
cba00e7b5d Merge remote-tracking branch 'origin/master' into simpleDiagnosis 2015-04-17 20:03:04 -03:00
esteldunedain
c423e9d743 Merge remote-tracking branch 'origin/medicalFixes' into simpleDiagnosis
Conflicts:
	addons/medical/ACE_Medical_Actions.hpp
	addons/medical/ACE_Medical_SelfActions.hpp
2015-04-17 20:02:51 -03:00
Tachii
1e446fb060 Update stringtable.xml 2015-04-18 02:01:09 +03:00
esteldunedain
a5c3e86cd3 Fixes 2015-04-17 20:00:43 -03:00
esteldunedain
cce9e1f04c Simple diagnose 2015-04-17 19:38:03 -03:00
esteldunedain
1d208b4efc Modify Function for medical actions 2015-04-17 19:36:03 -03:00
ulteq
b32a2b7495 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-18 00:12:04 +02:00
ulteq
314b0d23d6 ATragMX Feature Expansion:
*Added Gun and Ammo Data Screen
*Added Atomospheric and Environmental Data Screen
*Added Target Data Screen
*Added support for coriolis- and spin drift
*Added a second option (AT) to enter atmospheric data
*Target data is now saved/restored in/from the profileNamespace
*Atmosphere data is now saved/restored in/from the profileNamespace
*Selected gun profile is now saved/restored in/from the profileNamespace
*Fixed several bugs in the dual-/imperial unit systems
*Minor bug fixes in the target range assist screen
*Minor bug fix in the target speed assist screen
2015-04-18 00:11:53 +02:00
PabstMirror
dce344c85f Ignore Case 2015-04-17 16:51:27 -05:00
commy2
25d8c6c93e function to show error message box 2015-04-17 23:24:43 +02:00
Glowbal
d1a09ae7fc fixed vehicle crashes for adv 2015-04-17 23:15:41 +02:00
PabstMirror
00f26144ec More Privates 2015-04-17 15:45:00 -05:00
Glowbal
bc4d102d08 changed variable initialization - everything is now done local 2015-04-17 22:43:31 +02:00
bux578
9c054b7f35 Merge pull request #720 from gienkov/master
PL translation
2015-04-17 22:38:04 +02:00
Glowbal
cbc3584f9d removed duplicate condition attribute 2015-04-17 22:24:42 +02:00
Glowbal
9670267d20 Fixed wrong classnames for IV treatments 2015-04-17 22:21:54 +02:00