7581 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
commy2	e753131f2d	arms and legs to vulnerable, better scaling for pilots and csat	2015-09-03 16:17:48 +02:00
commy2	a84be46ed4	fix errors from cleanup	2015-09-03 15:49:49 +02:00
commy2	0436209dae	Merge branch 'master' of https://github.com/acemod/ACE3 into medical-adjustments	2015-09-03 15:33:53 +02:00
commy2	736be74c2b	Merge pull request #2344 from acemod/322hideclock ... hide clock on map if no watch in inventory, #414	2015-09-03 13:44:20 +02:00
commy2	36b42f2780	Merge pull request #2343 from acemod/322flares ... scripted approach to hand flares, fix #1079	2015-09-03 13:44:04 +02:00
commy2	529c85df58	Merge pull request #2338 from acemod/322sit ... Sitting improvements	2015-09-03 13:43:53 +02:00
commy2	6b7f84b297	add missing ;	2015-09-03 13:39:17 +02:00
commy2	76bb2bd2b8	replace function with FUNC macro	2015-09-03 13:37:36 +02:00
commy2	a187be7255	sort flashbang under explosive grenades	2015-09-03 13:23:15 +02:00
PabstMirror	024dc3effe	Cleanup	2015-09-03 00:16:48 -05:00
PabstMirror	789de9d111	runAfterSettingsInit helper func	2015-09-03 00:11:49 -05:00
PabstMirror	cbccd898ea	Run functions after setting init	2015-09-02 23:58:24 -05:00
kaban	15fe2c32b8	Russian Translations - Update	2015-09-03 04:58:08 +03:00
kaban	08b7110e58	Russian Translations - Update	2015-09-03 04:54:52 +03:00
kaban	50b05fcdf0	Russian Translations - Update	2015-09-03 04:38:38 +03:00
commy2	fbf00b9aa5	correct comment	2015-09-03 02:55:40 +02:00
kaban	91cae690c0	Russian Translations - Update	2015-09-03 03:36:15 +03:00
ProfessorCZ	44fa520bdd	Czech Translations - Update	2015-09-03 01:20:24 +02:00
PabstMirror	c213c0e05a	Merge pull request #2352 from jonpas/slideshowPrivates ... Cleaned up Slideshow privates	2015-09-02 16:10:31 -05:00
jonpas	def2d29501	Cleaned up slideshow privates	2015-09-02 22:51:31 +02:00
jonpas	0bbf4d4128	Prevent Cargo opening if vehicle is locked	2015-09-02 22:24:46 +02:00
Glowbal	f38d245771	fixed bloodloss for basic medical	2015-09-02 21:56:00 +02:00
commy2	f939f9215e	stop flickering of wounds, fix #346	2015-09-02 20:49:17 +02:00
commy2	7d2f1f52a4	remove protection, hitpoint config (fix ubc), some debug stuff	2015-09-02 20:13:51 +02:00
commy2	dc5e6b7c3c	Merge branch '323medicalstrcturaldamage' into medical-adjustments	2015-09-02 20:02:19 +02:00
commy2	9665f73fa3	Merge branch 'master' of https://github.com/acemod/ACE3 into medical-adjustments	2015-09-02 17:03:36 +02:00
SilentSpike	6aa191b788	Merge pull request #2327 from acemod/fixGunnerGoggles ... Fix gunner goggles	2015-09-02 13:31:50 +01:00
commy2	07ab7d1c35	correct comment	2015-09-02 02:00:53 +02:00
commy2	29efc13556	hide clock, use eventhandler	2015-09-02 01:59:07 +02:00
commy2	43c54d51e8	hide clock on map if no watch in inventory, #414	2015-09-02 01:40:38 +02:00
commy2	83424cdcab	header for fnc_flare	2015-09-02 00:03:16 +02:00
commy2	7ce606740c	make flares work in mp	2015-09-01 23:56:25 +02:00
commy2	be56fd7d46	scripted approach to hand flares, fix #1079	2015-09-01 23:19:49 +02:00
commy2	471d54f674	better saling for tracer sizes, fix #1008	2015-09-01 21:48:40 +02:00
commy2	237d5b6536	stand up action (uses get out shortcut) and less awkward standing animaton	2015-09-01 21:03:28 +02:00
commy2	acfc48efc2	animate head when surrendered and handcuffed	2015-09-01 20:00:28 +02:00
commy2	405d85eaaa	fix leaning back through chair while sitting, fix #1795	2015-09-01 19:06:20 +02:00
PabstMirror	264091957a	#1917 - Pointing Update Circle Icon	2015-09-01 10:09:14 -05:00
commy2	fb9ad6075f	Merge pull request #2337 from acemod/322bouncym84 ... bouncing flashbangs, fix #1907	2015-09-01 17:05:36 +02:00
commy2	c0defe9204	Merge pull request #2336 from acemod/322hcmodule ... high command module breaks ace, fix #2134	2015-09-01 17:05:24 +02:00
commy2	dd788342fe	remove commented debug messages	2015-09-01 16:37:46 +02:00
bux578	de66c2be7b	add commy's newest issue	2015-09-01 13:16:58 +02:00
commy2	b1fbbcc49f	bouncing flashbangs, fix #1907	2015-09-01 12:46:15 +02:00
commy2	5e68486233	high command module breaks ace, fix #2134	2015-09-01 10:06:01 +02:00
commy2	73911f701d	add debug messages for #2134	2015-09-01 08:53:11 +02:00
Michael Braun	035b3432c5	Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros ... Conflicts: addons/common/XEH_postInit.sqf	2015-09-01 08:45:59 +02:00
PabstMirror	c97e0eb500	MapTools - Handle Bad Aspect Ratio	2015-08-31 22:50:01 -05:00
jokoho48	3f4d0af940	prevent Issues with other mods	2015-09-01 01:03:34 +02:00
jokoho48	afee398b11	woops	2015-09-01 00:51:32 +02:00
jokoho48	5d612abd02	posible Fix for #2310	2015-09-01 00:42:13 +02:00