Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,296 Commits 73 Branches 88 Tags 752 MiB
8488bea67c
Commit Graph

7296 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ViperMaul
8488bea67c bump v 2015-09-16 11:48:52 -07:00
ViperMaul
c748e56f4a bump v3.3.1.2 2015-09-16 11:42:01 -07:00
commy2
6b8a210956 Merge pull request #2465 from acemod/331bcargospace 
increase trucks cargo space
 2015-09-16 20:16:20 +02: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
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
ViperMaul
9ef391301e Merge pull request #2459 from acemod/tweakCargoSize 
tweak Cargo Size for B_Truck_01_Base and B_Truck_01_box_F
 2015-09-16 05:07:04 -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
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
Glowbal
04512ebbc9 Merge pull request #2442 from acemod/revert-2441-air_no_tracers 
Revert "disable a10 tracers, commanche tracers only nvg"
 2015-09-15 21:25:47 +02: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
PabstMirror
e029e8318f microDagr - Add ability to access draw event for minimap 2015-09-14 16:37:39 -05:00
Glowbal
16b7bb389c Merge pull request #2428 from acemod/FixMainMenuInfo151 
Fix main menu info151
 2015-09-14 23:30:00 +02:00
Glowbal
d52cc917ea Merge pull request #2419 from acemod/FixBBTexturePath2 
Fix Bandage Texture Path and UV
 2015-09-14 23:26:00 +02:00
Glowbal
4b6082d836 Merge pull request #2424 from acemod/medical-tweaks 
Medical tweaks
 2015-09-14 23:20:50 +02:00
Glowbal
7b7ad6eea8 fixed tweak to basic bandage 2015-09-14 23:18:20 +02:00
PabstMirror
f7bd557a30 Fix some stringtable weirdness 2015-09-14 16:11:43 -05:00
PabstMirror
cbc86a1280 Merge pull request #2408 from acemod/FixRTPinMDAGR 
Posible fix for #2407
 2015-09-14 16:01:55 -05:00
Glowbal
10ac127159 Fixed incorrect new damage value in handleDamage advanced. 
The new handleDamage from BI added a new value to the parameters that we didn't account for in handleDamage advanced.
 2015-09-14 21:15:57 +02:00
Glowbal
33ac78dbac Addresses the large amount of bandages required in basic medical 
This should restore the bandaging behavior back to how it is before the adjustments made to basic medical
 2015-09-14 21:14:56 +02:00
Glowbal
8c60e76979 Tweaks made to improve determine if fatal algorithm 2015-09-14 21:13:58 +02:00
Glowbal
37639066c2 Include missing frame in the caching execution 2015-09-14 15:19:58 +02:00
Glowbal
6d4744b9ea Increased duration of knock down for basic medical 2015-09-14 15:19:18 +02:00
Glowbal
032dd6c87c Tweaked visual effects. 2015-09-14 15:18:56 +02:00
jokoho48
fb75f6ad9e Fix Bandage Texture Path and UV 2015-09-13 18:57:07 +02:00
jokoho48
b2b41ce8af Merge branch 'release' of https://github.com/acemod/ACE3 into release 2015-09-12 18:13:12 +02:00
jokoho48
5feee53c69 Posible fix for #2407 2015-09-12 18:12:57 +02:00
SilentSpike
7c846502b5 Reset captive status on respawn for reliability 
Previously we were resetting on death, but this caused problems when the respawnDelay was 0 as the dead unit wasn't actually the player.

To account for "group" and "side" respawn types where you change unit on respawn and could potentially become a captive unit, I am explicity checking the mission respawn type before resetting variables.
 2015-09-12 15:42:20 +01:00
SilentSpike
33a7340c8c Merge branch 'spectatorRespawnTemplate' into release 2015-09-12 14:04:17 +01:00