Felix Wiegand
05228b147d
Update links in README
2015-04-09 22:27:16 +02:00
Felix Wiegand
0de99fe8a0
Update modules.md
2015-04-09 22:14:12 +02:00
Felix Wiegand
3554a3bfe9
Update modules.md
2015-04-09 22:14:01 +02:00
Glowbal
84c8e02328
Merge pull request #396 from KoffeinFlummi/medicalCleanup
...
Medical cleanup
2015-04-09 22:13:31 +02:00
PabstMirror
253614d442
Explosives: cancel placement when opening interact
...
"zoomtemp" doesn't work for me, so this gives an additional way to
cancel. It was also possible to start planting multiple explosives.
made a small change to make QGVAR(PlantingExplosive) always reset
2015-04-09 14:48:27 -05:00
Glowbal
d94943a9ff
getting hitpoint damage on non existing hitpoint returns type instead of bool
2015-04-09 21:38:35 +02:00
KoffeinFlummi
e836d2627d
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-04-09 21:38:12 +02:00
KoffeinFlummi
b54d1e8786
Nicer output in build.py
2015-04-09 21:37:54 +02:00
Felix Wiegand
1b94e2e33a
Update README.md
2015-04-09 21:35:56 +02:00
KoffeinFlummi
63861a9fc0
Remove TO_MERGE
2015-04-09 21:33:25 +02:00
KoffeinFlummi
30862b4bfc
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-04-09 21:26:19 +02:00
KoffeinFlummi
5e918eb707
Remove AGM from TO_MERGE folder
2015-04-09 21:25:55 +02:00
Glowbal
093d340ee7
Changed: Dragging/carrying now works for units with broken legs
...
Added unload and load of unconscious units
2015-04-09 21:23:10 +02:00
Felix Wiegand
d81ed9f969
Merge pull request #397 from KoffeinFlummi/master-docs
...
Add documentation to master branch
2015-04-09 21:17:30 +02:00
KoffeinFlummi
8ca882248a
Add documentation to master branch
2015-04-09 21:09:49 +02:00
Glowbal
0926397ab4
Removed deadcode and obvious comments
2015-04-09 20:13:46 +02:00
Glowbal
39cbf21278
Removed deprecated carry functions
2015-04-09 20:12:30 +02:00
commy2
2d265ec6c2
prevent ai fro being stuck, #290
2015-04-09 16:54:50 +02:00
commy2
b41c6280ba
prvent falling ai from being stcuk, fix #290
2015-04-09 16:52:59 +02:00
commy2
147fcdfa0c
Merge pull request #392 from KoffeinFlummi/requiredaddons
...
sorting out required addons for modularity
2015-04-09 16:37:47 +02:00
esteldunedain
f0cc0941e5
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-09 10:05:38 -03:00
esteldunedain
8519bb04b7
Merge remote-tracking branch 'origin/removeRecoil'
...
Conflicts:
addons/recoil/config.cpp
2015-04-09 10:05:14 -03:00
Nicolás Badano
c57044fd4a
Merge pull request #390 from KoffeinFlummi/betterMapColors
...
Improve map colors by taking them from A2
2015-04-09 09:52:06 -03:00
esteldunedain
6447b39d1a
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
...
Conflicts:
addons/scopes/XEH_postInit.sqf
2015-04-09 09:32:58 -03:00
esteldunedain
34639c153c
Allow holding scope adjustment keys
2015-04-09 09:31:18 -03:00
Felix Wiegand
3a289e811e
Merge pull request #376 from KoffeinFlummi/tools-cleanup
...
Tools cleanup
2015-04-09 13:39:38 +02:00
KoffeinFlummi
3a871eed58
Merge branch 'master' into tools-cleanup
2015-04-09 13:37:19 +02:00
commy2
5ea35a01bb
sorting out required addons for modularity
2015-04-09 13:23:29 +02:00
esteldunedain
99aa439561
Improve map colors taking them from A2
2015-04-09 01:28:36 -03:00
PabstMirror
2033676e81
another undef to Make PBO-Project Happy
2015-04-08 18:20:00 -05:00
commy2
c86687afbb
Merge pull request #269 from KoffeinFlummi/142inheritance
...
142 - fix inheritance changes
2015-04-08 22:02:05 +02:00
commy2
3e3390750d
manual merge
2015-04-08 22:01:41 +02:00
commy2
b43451dd2f
Merge pull request #268 from KoffeinFlummi/142currentchannel
...
142: ace_common_fnc_currentChannel is no longer relyable
2015-04-08 21:52:19 +02:00
commy2
c5b38c8942
manual merge
2015-04-08 21:51:42 +02:00
commy2
1ae69d56ff
Merge pull request #377 from KoffeinFlummi/142light
...
142 directional light for map effects
2015-04-08 21:46:48 +02:00
commy2
7346c194f4
Merge pull request #306 from KoffeinFlummi/optics
...
Taosenai's Animated Optics req 1.42
2015-04-08 21:41:12 +02:00
PabstMirror
c3564ee883
undef to Make PBO-Project Happy
2015-04-08 14:38:29 -05:00
Glowbal
3702679ee4
fixed wrong value for radio disabled on waking up
2015-04-08 21:31:59 +02:00
jaynus
fb8c4fa1eb
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-08 12:09:24 -07:00
jaynus
3f84a08494
Update FCS iteration limit for accuracy over range.
2015-04-08 12:09:11 -07:00
PabstMirror
a4af1fcb30
Fix Marker Placement on UAV Map
2015-04-08 13:55:29 -05:00
commy2
3de3432664
Merge pull request #271 from KoffeinFlummi/142resting
...
1.42 - Remove scripted weapon resting
2015-04-08 20:26:13 +02:00
PabstMirror
2bc0976979
Merge pull request #277 from KoffeinFlummi/revert-276-revert-272-142menudeploy
...
Revert "Revert "1.42 - cursor mode when bipod deployed""
2015-04-08 13:26:05 -05:00
PabstMirror
023a2d2202
Merge pull request #267 from KoffeinFlummi/142Markers
...
1.42 Marker Placement
2015-04-08 13:24:55 -05:00
PabstMirror
176a39e86c
Merge pull request #265 from KoffeinFlummi/142InventoryConfig
...
1.42 Inventory Config
2015-04-08 13:22:12 -05:00
PabstMirror
007e4fc234
Merge pull request #274 from KoffeinFlummi/142requiredaddons
...
1.42 ensure ace is loaded after marksmen configs
2015-04-08 13:21:33 -05:00
PabstMirror
af3d6a5113
#386 - Ace Options Menu on main menu
...
Same limitations as CBA controls, needs a intro or mission loaded
Doesn't work with -skipintro command line.
2015-04-08 10:33:12 -05:00
commy2
01a9374a26
Merge pull request #382 from KoffeinFlummi/disablebs
...
disable cursor showing map position
2015-04-08 10:48:31 +02:00
commy2
deece11689
remove debug
2015-04-08 10:47:56 +02:00
commy2
a47cdb9738
disable map cursor coordinates in mp
2015-04-08 10:45:57 +02:00
