6036 Commits

Author	SHA1	Message	Date
commy2	27ca3dc7bd	Merge pull request #2471 from acemod/340noactionmenu ... optional pbo to hide select weapon actions	2015-09-17 22:47:35 +02:00
commy2	3927103a86	Merge pull request #2483 from acemod/340staticmgfcs ... add fcs to static machine guns	2015-09-17 22:47:23 +02:00
commy2	ca43520b7f	Merge pull request #2482 from acemod/340fixdaylaserlight ... fix daylasers being a virtual light source	2015-09-17 22:47:13 +02:00
commy2	cfc7102cb6	Merge pull request #2481 from acemod/340loadcargohint ... display text when loading / unloading cargo	2015-09-17 22:47:05 +02:00
commy2	7336e694c1	Merge pull request #2480 from acemod/340doanim2tweak ... tweak doAnimation switchMove to do no akward camera jumps whenever possible	2015-09-17 22:46:54 +02:00
PabstMirror	7faee2e6ff	Merge pull request #2492 from acemod/fixCPR ... Fix CPR params	2015-09-17 12:37:45 -05:00
PabstMirror	5fc127e94c	#2491 - fix params	2015-09-17 11:34:32 -05:00
commy2	a03bc44ba0	add fcs to static machine guns, close #1188	2015-09-17 14:40:58 +02:00
commy2	864c0b4baf	fix daylasers being a virtual light source, fix #2416	2015-09-17 14:17:48 +02:00
commy2	42a754a981	display text when loading / unloading cargo	2015-09-17 13:43:55 +02:00
KoffeinFlummi	067b08611e	Fix missing newlines	2015-09-17 12:54:26 +02:00
KoffeinFlummi	49cc207e6b	Merge remote-tracking branch 'origin/pr/2397' into polish-merge	2015-09-17 12:53:47 +02:00
commy2	a09ca8fb80	tweak doAnimation switchMove to do no akward camera jumps whenever possible, fix #2474	2015-09-17 12:23:56 +02:00
commy2	014203413d	handle optional pbos in checkFiles	2015-09-17 02:13:21 +02:00
commy2	ca72770c48	add english translation to switch units module	2015-09-16 23:49:34 +02:00
commy2	6d80740a20	don't default to english on the switch units module description	2015-09-16 23:29:07 +02:00
PabstMirror	b8c687611e	Merge branch 'release'	2015-09-16 14:10:02 -05:00
ViperMaul	c748e56f4a	bump v3.3.1.2	2015-09-16 11:42:01 -07:00
commy2	b7715152e2	correct cargo capacities for quads, karts, boats and jets	2015-09-16 20:12:56 +02:00
commy2	f383e8701d	increase trucks cargo space	2015-09-16 19:27:32 +02:00
PabstMirror	539e158a97	Merge branch 'release'	2015-09-16 10:35:19 -05:00
ViperMaul	e78b59c28a	bump to 3.3.1.1	2015-09-16 05:09:48 -07:00
ViperMaul	f83a76b304	Merge pull request #2458 from acemod/FixAB ... Fix Advaced Basllistic Performance bug	2015-09-16 05:07:26 -07:00
jokoho48	c1baf4f8f7	tweak Vales for B_Truck_01_Base and B_Truck_01_box_F	2015-09-16 12:45:08 +02:00
jokoho48	a24e5b4665	fix Performance issue in AB	2015-09-16 11:54:49 +02:00
gienkov	e2f9b31fb2	small fix + repair translation	2015-09-16 11:53:05 +02:00
gienkov	a66f4d0e09	Merge remote-tracking branch 'origin/master' into pl-translation-8	2015-09-16 11:44:35 +02:00
gienkov	b94df35c08	Revert "fixed duplicate stringtable entries" ... This reverts commit ab02bed1c1.	2015-09-16 11:42:45 +02:00
ViperMaul	8330aadb6f	bump version to 3.3.1	2015-09-15 17:56:57 -07:00
PabstMirror	2c2d79cfe0	Merge pull request #2439 from acemod/badXEHcheck ... Bad xeh check	2015-09-15 19:46:10 -05:00
PabstMirror	e254af9964	Fix missing )	2015-09-15 19:26:37 -05:00
PabstMirror	1ea1094a73	Merge branch 'release'	2015-09-15 16:16:10 -05:00
Glowbal	a124b05672	Revert "disable a10 tracers, commanche tracers only nvg"	2015-09-15 21:25:01 +02:00
Glowbal	c6c51af548	Updated build version	2015-09-15 21:13:36 +02:00
Glowbal	7e5ab07e32	Merge pull request #2387 from acemod/FixHCPPE ... Fix that PPEffects Throw a error on HC	2015-09-15 21:04:37 +02:00
Glowbal	b2b221db20	Merge pull request #2441 from SzwedzikPL/air_no_tracers ... disable a10 tracers, commanche tracers only nvg	2015-09-15 21:02:40 +02:00
PabstMirror	88f89b8d76	also check allDeadMen	2015-09-15 13:30:04 -05:00
PabstMirror	a8688609d7	Typo	2015-09-15 13:10:06 -05:00
Glowbal	3cc2ccf025	Merge pull request #2438 from acemod/wheelRepairSettingToolkit ... Add Setting for toolkit requirement for wheel repair	2015-09-15 20:04:38 +02:00
PabstMirror	0e32c28552	#2437 - Warn users when mods break XEH	2015-09-15 12:55:08 -05:00
PabstMirror	db37fa0e04	Update stringtable.xml	2015-09-15 11:45:02 -05:00
PabstMirror	c50c53e5bb	remove debug	2015-09-15 09:57:53 -05:00
PabstMirror	9cd470b849	Add Setting for toolkit requirement for wheel repair	2015-09-15 09:54:55 -05:00
commy2	2c7a2b4140	Merge pull request #2406 from acemod/captiveOnRespawn ... Reset captive status on respawn for reliability	2015-09-15 16:37:01 +02:00
gienkov	6588237e8c	stringtable DAGR	2015-09-15 15:05:30 +02:00
PabstMirror	17fdce7196	Cleanup preInit	2015-09-15 08:03:56 -05:00
Glowbal	478b618e4b	Merge pull request #2429 from MikeMatrix/feature/switchToLogMacros ... Feature/switch to log macros	2015-09-15 14:51:23 +02:00
PabstMirror	d6d64b58b0	Merge pull request #2430 from acemod/microDagr-customDrawEvents ... microDagr - Add ability to access draw event for minimap	2015-09-14 23:36:07 -05:00
PabstMirror	f419762653	Fix time of flight display	2015-09-14 23:33:32 -05:00
PabstMirror	61cbe543ee	Fix #2432 - Don't check for null attached when mounted	2015-09-14 18:06:46 -05:00