Commit Graph

9614 Commits

Author SHA1 Message Date
James McCartney
121c45eb84 Raise a local event when a weapon is jammed 2016-04-11 22:29:33 +01:00
jonpas
8072c9db41 Merge pull request #3652 from acemod/setupAlwaysUseJunctions
Always use junctions for dev environment setup
2016-04-10 21:57:16 +00:00
Thomas Kooi
f6567841a2 Merge pull request #3665 from acemod/add-config-style-validation
Add config style validation
2016-04-07 20:01:11 +02:00
Glowbal
f409ce8248 Add config style validation 2016-04-07 19:55:10 +02:00
commy2
a8c0840cd1 Merge pull request #3658 from acemod/fixPlayerChangedEvent
Wait until postInit to install playerChanged event
2016-04-04 07:56:13 +02:00
PabstMirror
f8b46e859c Wait until postInit to install playerChanged event 2016-04-03 23:36:38 -05:00
jonpas
d931eb4e15 Improve XEH adding in cargo 2016-04-03 14:17:16 +02:00
jonpas
357045a0ed Merge pull request #3518 from ColdEvul/CargoAndInteractionCase
Carry, drag and load metal and plastic cases
2016-04-03 11:43:11 +00:00
jonpas
3abb3d321c Merge branch 'master' into customTaggingTextureSupport 2016-04-03 13:41:26 +02:00
jonpas
f4074e981a Merge pull request #3529 from acemod/tagEvents
Throw a globalEvent when a tag is created.
2016-04-03 11:38:24 +00:00
jonpas
2a7e0b2a48 Remove redundant directory symlink directive 2016-04-03 13:23:20 +02:00
jonpas
a9fd7c4d6f Always use junctions for dev environment setup 2016-04-03 02:27:23 +02:00
Nicolás Badano
8eb7d28e29 Merge pull request #3651 from acemod/addMapAltitudeToGPS
Add map altitude to GPS
2016-04-02 10:13:02 -07:00
jonpas
caf06f58c8 Add map altitude to GPS - fix #3650 2016-04-02 18:53:34 +02:00
nomisum
5c87161118 fixed logic problem 2016-04-02 15:53:39 +02:00
nomisum
02e3e1c7ec Merge remote-tracking branch 'refs/remotes/acemod/master' 2016-04-02 15:39:44 +02:00
nomisum
fed4662884 changed suggested lines to ace standards 2016-04-02 15:36:21 +02:00
Nicolás Badano
ec2c331bd9 Merge pull request #3644 from J3aLeiNe/master
fnc_getMGRSdata update1
2016-04-02 09:23:29 -03:00
commy2
a7cf010f7a Merge pull request #3648 from acemod/fixtagging_master
fix script error in tagging
2016-04-02 10:12:38 +02:00
J3aLeiNe
4576ea0194 abbottabad altitude fix
altitude 0 for altitude 1256
2016-04-02 09:50:50 +02:00
PabstMirror
84c5a0d266 FCS - Minor firedEH optimization 2016-04-01 21:51:22 -05:00
jonpas
31953c5d52 Merge pull request #3635 from acemod/fixInvertedGestureStopFreeze
Fix inverted gestures Stop and Freeze and minor gestures cleanup
2016-04-01 19:30:48 +00:00
jonpas
723d27fc99 Rename tagging action classes 2016-04-01 21:29:03 +02:00
jonpas
fbaae2beb3 Fix stringtable casing 2016-04-01 21:25:00 +02:00
jonpas
9f7f176b1f Merge branch 'master' into customTaggingTextureSupport 2016-04-01 21:24:31 +02:00
J3aLeiNe
d4a7d864aa fnc_getMGRSdata update1 2016-04-01 11:53:33 +02:00
J3aLeiNe
093da2badf Merge branch 'master' into master 2016-03-31 22:22:50 +02:00
PabstMirror
e104b0ac55 Merge pull request #3640 from acemod/fixZeusAutoAdd
Delay calling addCuratorEditableObjects for a frame
2016-03-31 10:04:44 -05:00
J3aLeiNe
c998ab622e fnc_getMGRSdata update1
fnc_getMGRSdata update1
2016-03-31 14:41:09 +02:00
bux578
076803951d Merge pull request #3628 from alef/translation/15bn/alef
Italian translation
2016-03-31 06:54:31 +02:00
commy2
35cb4cb0f5 Merge pull request #3643 from acemod/helicargosizes
specify helicopter cargo spaces
2016-03-31 01:11:24 +02:00
commy2
92af6ffe2e add cargo space to csat attack heli (can transport 8 troops) 2016-03-31 01:03:40 +02:00
commy2
28468bec82 specify helicopter cargo spaces, fix #3591 2016-03-31 00:57:04 +02:00
commy2
1b0794d6b4 Merge pull request #3641 from acemod/improveCodeToString
improve Code to String
2016-03-31 00:07:42 +02:00
Joko
6038ab89c9 improve Code to String 2016-03-30 23:02:52 +02:00
PabstMirror
6f412c312a Delay calling addCuratorEditableObjects for a frame
Fixes createVehicle not always being added on dedicated server.
2016-03-30 10:26:33 -05:00
bux578
ada519a59c sort people 2016-03-29 20:35:34 +02:00
PabstMirror
a83c3b5219 Merge pull request #3623 from acemod/fixAbTerrainProcessor
Fix AB Terrain Extension
2016-03-29 13:08:14 -05:00
commy2
89428dc55c Merge pull request #3624 from acemod/compatPboWarnings
Compat pbo warnings
2016-03-29 17:01:53 +02:00
commy2
a4c848a090 formating 2016-03-29 17:00:54 +02:00
jonpas
ec2be36e81 Use boolean 2016-03-29 16:25:55 +02:00
jonpas
2d22b06150 Add README.md to gestures and update author URL 2016-03-29 16:08:33 +02:00
jonpas
330977a709 Remove including DIK KeyCodes definitions, use decimal codes, Improve BI gesture handling even further 2016-03-29 16:03:41 +02:00
jonpas
3489dd48bb Remove unused gestures, Improve stringtabling and remove duplicate 2016-03-29 15:51:51 +02:00
commy2
49f6904f9e Merge pull request #3634 from acemod/fixerrornoname
fix FUNC(setName) for Zeus and alive spawned units
2016-03-29 15:48:19 +02:00
commy2
ef83a667c1 Merge pull request #3633 from acemod/fixdetonatescriptedexplosive
make FUNC(scriptedExplosive) work in scheduled env, ref #3621
2016-03-29 15:48:10 +02:00
jonpas
c24c1b9dc0 Fix inverted Stop and Freeze - prone Stop will still be freeze due to BI animation being wrong 2016-03-29 15:39:32 +02:00
commy2
4e1b2dd24a just delay setName one frame 2016-03-29 15:32:05 +02:00
commy2
1f6f90a5b2 fixerrornoname 2016-03-29 13:59:07 +02:00
commy2
666a4030b5 make FUNC(scriptedExplosive) work in scheduled env, ref #3621 2016-03-29 13:21:13 +02:00