Commit Graph

9864 Commits

Author SHA1 Message Date
BaerMitUmlaut
a596bc91c7 Added radar scan PFH 2016-06-14 11:47:22 +02:00
BaerMitUmlaut
615d2ed0cf Initial commit ACE_Radar 2016-06-13 11:44:16 +02:00
commy2
a4bd6ea80f Merge pull request #3893 from acemod/virtualMasDiv0
virtualMass - Fix div0 error when naked
2016-06-10 10:27:36 +02:00
commy2
e55881e1ef Merge pull request #3894 from acemod/fixNametagsUAV
Fix nametag error when assignedTeam is nil
2016-06-10 10:20:16 +02:00
Glowbal
bbb8bafa1c Merge pull request #3895 from acemod/devHandleDamage
Temp fix for change to handleDamage in dev branch
2016-06-10 09:28:44 +02:00
PabstMirror
dc6d5f1367 Temp fix for change to handleDamage in dev branch
Fix #3892
2016-06-09 21:26:50 -05:00
PabstMirror
5ecc09d78c Fix nametag error when assignedTeam is nil 2016-06-09 20:42:30 -05:00
PabstMirror
e8f7f6ea24 virtualMass - Fix div0 error when playing as rabbit 2016-06-09 20:30:45 -05:00
Glowbal
c3d984d6e7 Merge pull request #3840 from acemod/eol-lf
Convert to LF line endings
2016-06-10 00:15:51 +02:00
jonpas
3389720f6b Merge branch 'master' into eol-lf 2016-06-10 00:12:07 +02:00
jonpas
1c06764d03 Add Extract Dependencies script (#2640)
* Add Extract Dependencies Python script, Add tools\temp to .gitignore

* Change backtick to single quote

* Remove unnecessary import

* Remove all whitespace

* Add support for multi-line dependencies, Add header comment, Improve

* Fix final message

* Update output to Jekyll IF statements for inclusion on pages

* Space

* Correct comments for Jekyll usage
2016-06-09 14:59:26 +02:00
jonpas
f1ae73967d Normalize leftovers 2016-06-09 14:28:31 +02:00
jonpas
b97ba4990d Normalize 2 more files 2016-06-09 14:25:57 +02:00
jonpas
bd5f6107a0 Merge branch 'master' into eol-lf 2016-06-09 14:24:45 +02:00
Glowbal
8c9b31b1c7 Merge pull request #3815 from acemod/cbaEventSystem
Deprecate ACE events framework
2016-06-09 14:20:26 +02:00
commy2
24ce8b7753 Merge pull request #3880 from acemod/spotting_scope_animated_reticle
Update Spotting Scope
2016-06-07 19:41:09 +02:00
commy2
5d0e257cd8 center interaction point, add gunner shadows 2016-06-07 19:36:03 +02:00
BaerMitUmlaut
bce92e8d42 Merge pull request #3567 from BaerMitUmlaut/microdagr-microoverhaul
MicroDAGR Microoverhaul
2016-06-07 09:58:18 +02:00
commy2
f14a1b990b simplify optics config 2016-06-07 07:38:01 +02:00
Nicolás Badano
527db2bd07 Merge pull request #3884 from acemod/fixShowWindInfoControlsText
Fix wind info keybind string
2016-06-06 21:39:54 -03:00
Nicolás Badano
56d604b2d7 Merge pull request #3883 from acemod/explosivePickUpMainAction
Move Defuse action to main action
2016-06-06 21:36:38 -03:00
jonpas
89db8bef5a Fix wind info keybind string 2016-06-07 02:22:53 +02:00
jonpas
9287214781 Move Defuse action to main action 2016-06-07 00:51:06 +02:00
commy2
5135d3bedd delete duplicate files 2016-06-07 00:36:41 +02:00
commy2
3ee10a8c2f add gunner proxy to FIRE GEO LOD and add it to a component 2016-06-07 00:28:09 +02:00
commy2
f5a96ac2fc add editor stuff for spotting scope 2016-06-07 00:17:04 +02:00
commy2
12ab4e9fa6 match controls at boarder 2016-06-06 23:33:00 +02:00
commy2
6a5c9cfca7 black periphery 2016-06-06 23:14:19 +02:00
commy2
36d0b78811 coeficient handling interface sizes was inverted 2016-06-06 21:36:29 +02:00
commy2
cd43c17f80 animate the scope 2016-06-06 19:22:24 +02:00
commy2
be260e896b animated reticle for spotting scope 2016-06-06 17:22:17 +02:00
commy2
fe03272dc6 Merge pull request #3874 from acemod/cleanup_nightvision
code cleanup fnc_blending
2016-06-06 12:23:42 +02:00
jonpas
e779bc0cb2 Merge pull request #3877 from acemod/fixUIerror
Fix selective UI in FFV slots
2016-06-05 14:04:49 +02:00
jonpas
021a123fc6 Fix selective UI in FFV slots, Properly fix config name check 2016-06-05 14:02:55 +02:00
Glowbal
2ad3f57414 Merge pull request #3872 from acemod/fixUIerror
Fix selective UI script error when changing certain other settings
2016-06-05 13:44:22 +02:00
commy2
e776306295 Merge pull request #3876 from acemod/cleanupMovement
Cleanup movement and improve debugging
2016-06-05 12:57:34 +02:00
jonpas
2cc1252f81 Remove unused CfgInventoryGlobalVariable in movement and improve debugging 2016-06-05 12:45:53 +02:00
commy2
0424f5db73 cleanup fnc_blending 2016-06-05 10:12:05 +02:00
commy2
8ed2dd11d2 Merge pull request #3871 from acemod/magRepackImprovements
Add size parameter to displayTextPicture, Improve parameter checking …
2016-06-05 00:05:07 +02:00
commy2
a9a0cfc001 Merge pull request #3873 from voiperr/nvgthrowfix
Fix NVG overbright when player throws grenades
2016-06-04 23:43:53 +02:00
commy2
f8474a379c Merge pull request #3870 from acemod/fixMagRepackInVehicle
Fix goKneeling changing animation inside vehicle (1.60)
2016-06-04 22:54:47 +02:00
voiper
354e84e058 Cleanup. 2016-06-04 12:26:38 -07:00
jonpas
b541b0b4f0 Fix selective UI script error when changing certain other settings 2016-06-04 21:20:10 +02:00
jonpas
3124270254 Quote the unquoted 2016-06-04 21:07:24 +02:00
voiper
cef4152407 Merge branch 'nvgthrowfix' of https://github.com/voiperr/ACE3 into nvgthrowfix 2016-06-04 12:06:30 -07:00
voiper
a10b6ee8e2 Fix thrown blink. 2016-06-04 12:05:47 -07:00
jonpas
5a20f1286b Change internal event framework names to contain prefix and be as short as possible 2016-06-04 21:05:26 +02:00
jonpas
8ff4a2ecaf Add size parameter to displayTextPicture, Improve parameter checking in displayText functions, Cleanup magazine repack (privates, deprecated macros, style) 2016-06-04 20:40:55 +02:00
jonpas
03a56b1f7d Fix goKneeling changing animation inside vehicle (1.60) 2016-06-04 19:58:53 +02:00
SilentSpike
90ebf9638b Update common event names to meet new standard 2016-06-04 11:12:56 +01:00