Commit Graph

5426 Commits

Author SHA1 Message Date
SilentSpike
6251248a09 Fixed conditions 2015-06-01 20:36:05 +01:00
SilentSpike
49ef30ca5b Corrected macro 2015-06-01 20:36:05 +01:00
SilentSpike
aad56866ea Forgot my privates 2015-06-01 20:36:04 +01:00
SilentSpike
90033aa591 Updated function headers 2015-06-01 20:36:03 +01:00
SilentSpike
5f1725cf1f Missing setUnconscious parameter 2015-06-01 20:36:02 +01:00
SilentSpike
0dcfd9f941 Use zeus category 2015-06-01 20:36:02 +01:00
SilentSpike
a4512e4740 Implemented surrender module
Improved knockout module
2015-06-01 20:36:01 +01:00
SilentSpike
3702d0b671 Implemented knockout module 2015-06-01 20:36:00 +01:00
ulteq
14607f7aba Fixes random body bag teleports 2015-06-01 21:23:00 +02:00
ulteq
47acb0f470 Merge pull request #1458 from acemod/drag_carry_fix
Fixes random teleport when dragging/carrying inside of buildings.
2015-06-01 20:22:29 +02:00
PabstMirror
25a597e5fe Merge pull request #1460 from acemod/hitReactionsMounted
HitReactions - Don't do when mounted, add setting
2015-06-01 13:17:06 -05:00
PabstMirror
f57427ec96 switch waitAndExecute with 0 delay to execNextFrame
Should Fix #1463
2015-06-01 13:14:05 -05:00
ulteq
5c9bd122dd Merge pull request #1466 from acemod/modulesFix
Fixes build error: "config.cpp has externs but no RequiredAddons"
2015-06-01 20:12:27 +02:00
ulteq
9d4c572261 Fixes build error: "config.cpp has externs but no RequiredAddons" 2015-06-01 20:12:07 +02:00
Nicolás Badano
061a52b3f1 Merge pull request #1411 from Tourorist/patch-3
README_PL: localized shields
2015-06-01 14:47:22 -03:00
Nicolás Badano
9ed851a966 Merge pull request #1265 from gienkov/module-translations-2
Stringtable Zeus and View Distance
2015-06-01 14:44:04 -03:00
Glowbal
1c0c73be54 Merge pull request #1433 from acemod/fixSettingsFromModules
Delay initialization of modules until settings are properly setup
2015-06-01 19:18:11 +02:00
ulteq
8de5129313 Merge pull request #1464 from acemod/densityAltitude
Implemented Density Altitude calculation
2015-06-01 16:22:41 +02:00
ulteq
e626794866 Fixes array init 2015-06-01 16:21:30 +02:00
ulteq
0364975c12 Implemented Density Altitude calculation 2015-06-01 16:09:35 +02:00
KoffeinFlummi
fa73aec15b Merge https://github.com/Macusercom/ACE3 into german-merge 2015-06-01 14:27:49 +02:00
PabstMirror
473ab7d7c0 Fix mmg UBC 2015-05-31 23:48:20 -05:00
PabstMirror
e2217220eb HitReactions - Don't do when mounted, add setting 2015-05-31 16:16:14 -05:00
gienkov
a173b5b048 TABS 2015-05-31 22:46:32 +02:00
gienkov
212862a401 Merge remote-tracking branch 'origin' into pl-translation-1
Conflicts:
	addons/advanced_ballistics/stringtable.xml
	addons/frag/stringtable.xml
2015-05-31 22:45:09 +02:00
Macusercom
53e0b35c12 German 1 correction for Advanced Ballistics 2015-05-31 20:31:38 +02:00
ulteq
4802ffeebf Fixes random teleport when dragging/carrying inside of buildings. 2015-05-31 18:34:48 +02:00
ulteq
3a2fd9dc08 Merge pull request #1457 from acemod/weatherReadme
New weather module readme/feature description.
2015-05-31 17:39:52 +02:00
ulteq
a1f199bfdc New weather module readme/feature description. 2015-05-31 17:39:24 +02:00
ulteq
6292db8e3b Merge pull request #1456 from acemod/rain_probability
Overcast > 0.7 no longer implies rain:
2015-05-31 17:31:10 +02:00
ulteq
903fb89d77 Overcast > 0.7 no longer implies rain:
* The higher the overcast value the higher the chance for rain
* But you can end up having no rain with an overcast value of 1.0
2015-05-31 17:30:52 +02:00
ulteq
a0dc435850 Merge pull request #1455 from acemod/airFrictionUpdate
Updated all airFriction values according to: airFrictionAnalysis.txt
2015-05-31 17:09:29 +02:00
ulteq
5c8e79c50a Updated all airFriction values according to: extras/airFrictionAnalysis.txt 2015-05-31 16:45:59 +02:00
Bracconiere
0feef0802a Corrected 2015-05-31 17:28:10 +03:00
ulteq
807a155c1f Merge pull request #1453 from acemod/abExtensionFixes2
Ab extension fixes2
2015-05-31 14:31:51 +02:00
Macusercom
0a47396d10 Corrections for German translation 2015-05-31 14:25:52 +02:00
Glowbal
43a2fed7c2 New dll build for ab 2015-05-31 14:22:00 +02:00
Glowbal
b8b980bd92 Changed speed of sound to double 2015-05-31 14:21:25 +02:00
PabstMirror
89dfd8be17 Merge pull request #1450 from acemod/fixProgressbarDeath
Progress bar stops on death
2015-05-31 02:25:36 -05:00
Glowbal
0b8896239c Progress bar stops on death - fix for #1449 2015-05-31 09:23:36 +02:00
Macusercom
a44546af83 Added my name to AUTHORS.txt 2015-05-30 23:38:08 +02:00
Macusercom
5d1f2eafaa Fix German Translation 2015-05-30 23:34:19 +02:00
Macusercom
038880cb01 Additional Translations for German + some corrections 2015-05-30 23:33:51 +02:00
PabstMirror
23d300df52 Merge pull request #1417 from acemod/localDefuseObjects
Explosives - Local defuse objects
2015-05-30 15:46:07 -05:00
ulteq
b1f0f318ae Merge pull request #1443 from acemod/cupConfig
CUP config
2015-05-30 21:54:12 +02:00
ulteq
cb12146f41 Tabs -> Spaces 2015-05-30 21:53:28 +02:00
ulteq
75518af90f Tabs -> Spaces 2015-05-30 21:52:57 +02:00
ulteq
e41c51966b Added cup scopes config entries 2015-05-30 21:51:24 +02:00
Glowbal
3e3fdcf66e Merge pull request #1429 from acemod/cseNVGadjustment
NightVision adjustment - use CSE's gamma
2015-05-30 21:50:56 +02:00
ulteq
9936af3e4c Added config entries for all cup weapon classes 2015-05-30 21:20:40 +02:00