Commit Graph

7830 Commits

Author SHA1 Message Date
Glowbal
265eae14a0 Merge pull request #2713 from jonpas/deployLinkFix
Fix link in deploy tool
2015-10-08 23:16:53 +02:00
jonpas
fc7230359f Remove redundant variables (left-over from deploy wiki to gh-pages) 2015-10-08 21:58:02 +02:00
jonpas
7c101bde87 Change build badge tooltip 2015-10-08 21:01:06 +02:00
jonpas
7efcc3b8d1 Update version and download size 2015-10-08 20:33:20 +02:00
jonpas
4b7f281eba Fix slacking badge links, Add Travis CI build badge 2015-10-08 20:30:54 +02:00
licht-im-Norden87
8cbd573093 Update README_DE.md 2015-10-08 19:20:17 +02:00
jonpas
7258bc5efc Fix link in deploy tool 2015-10-08 17:55:54 +02:00
PabstMirror
f3c4ff66ca #2701 - Fix gun smoke on AMV 2015-10-08 02:51:54 -05:00
PabstMirror
39b838c7ab Merge pull request #2681 from acemod/vehDetachLocalfix
Attach getIn/Out run on local unit
2015-10-06 13:49:58 -05:00
commy2
9c22052871 Merge pull request #2685 from acemod/340removeactionsondead
remove check ammo action on destroyed static weapons
2015-10-06 19:36:19 +02:00
Glowbal
825b410ae8 Merge pull request #2684 from acemod/sqfValidatePython3
Validate sqf - python 3 compat
2015-10-05 20:33:31 +02:00
SilentSpike
e5b29727a5 Merge pull request #2617 from jonpas/zeusSpareparts
Add Zeus Modules for Adding Spare Parts
2015-10-05 19:01:50 +01:00
Glowbal
646907f77a Merge pull request #2562 from gienkov/pl-strings
PL medical string
2015-10-05 17:07:36 +02:00
PabstMirror
616bc9f8a0 local-private waitAndXX PFEH 2015-10-04 11:38:31 -05:00
PabstMirror
f3e61e2136 Merge branch 'master' into commonCleanupX 2015-10-04 11:31:05 -05:00
gienkov
b6d2cdee69 Merge remote-tracking branch 'origin/master' into pl-strings 2015-10-04 12:25:55 +02:00
commy2
d9595b6176 fix fnc_binocularMagazine on remote and dead units 2015-10-04 12:10:08 +02:00
commy2
92ed7eeac2 remove check ammo action on destroyed static weapons, fix #2671 2015-10-04 11:58:26 +02:00
commy2
42ce11cfee Merge pull request #2679 from acemod/340missingmags
fix missing magazines after certain scenarios
2015-10-04 11:46:36 +02:00
commy2
5ed290362d Merge pull request #2663 from acemod/340rallypointminutes
fix broken time format for rallypoints, fix #2662
2015-10-04 11:46:25 +02:00
commy2
040a63bd8f Merge pull request #2254 from acemod/waitUntilAndExecute
Add WaitUntilAndExecute Function
2015-10-04 11:45:54 +02:00
commy2
a2b6166aa0 optimization waitUntilAndExecute, add comments 2015-10-04 11:43:13 +02:00
PabstMirror
dc9ba7aa4c Validate sqf - python 3 compat 2015-10-04 03:48:37 -05:00
Glowbal
f8cebd9403 Merge pull request #2007 from jokoho48/codeCleanupWeather
Code cleanup Weather module
2015-10-04 09:36:32 +02:00
Glowbal
58ea8d5e2c Merge pull request #2543 from alef/feature/death_short_diagnose
Remove: pain diagnosis on dead patients
2015-10-04 09:34:10 +02:00
Glowbal
f884f7d8fd Merge pull request #2552 from acemod/sqf-parser
Add a first implementation of the sqf validator/parser/linter.
2015-10-04 09:33:42 +02:00
Glowbal
9ce4ce6cdd Merge pull request #2582 from acemod/fixLitterFloating
fix Littergeneric fly over ground
2015-10-04 09:32:03 +02:00
Glowbal
e36df978ec Merge pull request #2646 from DerekSauer/FixArmaInjury
Fix healHitPointAfterAdvBandage - Issue #2498.
2015-10-04 09:28:47 +02:00
Glowbal
2c292af77e Merge pull request #2680 from acemod/cargoLockedVeh
Disable loading into locked vehicles.
2015-10-04 09:26:53 +02:00
Glowbal
4445ecd7c4 Merge pull request #2581 from acemod/invisibleLadder
Invisible Tactical Ladder
2015-10-04 09:26:34 +02:00
Glowbal
a823eff37f Merge pull request #2674 from acemod/triageCardGameTime
Use ACE_gameTime for triage card
2015-10-04 09:22:18 +02:00
PabstMirror
59da3e1c35 Optimize PFEH Funcs 2015-10-03 23:05:46 -05:00
PabstMirror
c75d219b65 Cleanup Undefined Functions 2015-10-03 21:34:46 -05:00
PabstMirror
7315dd650f Merge branch 'master' into vehDetachLocalfix 2015-10-03 19:44:20 -05:00
PabstMirror
21f35dc7d0 #2664 - Disable loading into locked vehicles. 2015-10-03 19:42:40 -05:00
commy2
f0036fabbb use BIS fnc for time format 2015-10-04 02:15:38 +02:00
commy2
38422e6586 fix missing magazines after certain scenarios 2015-10-04 01:26:38 +02:00
PabstMirror
10950d5fab Merge pull request #2623 from acemod/interactMenuSet
Interact menu settings after init
2015-10-03 12:49:04 -05:00
PabstMirror
12c663978a Merge pull request #2649 from acemod/captiveEvents
Global Event for "CaptiveStatusChange"
2015-10-03 12:47:58 -05:00
PabstMirror
b0b755720c #2672 - Use ACE_gameTime for triage card 2015-10-03 12:28:54 -05:00
gienkov
3d4a37614c Merge remote-tracking branch 'origin/master' into pl-strings 2015-10-03 12:19:48 +02:00
licht-im-Norden87
e056a3b2cd Update README_DE.md 2015-10-03 04:54:10 +02:00
licht-im-Norden87
411ddac3b9 Update README_DE.md 2015-10-03 04:53:00 +02:00
licht-im-Norden87
2afbe36b89 Update README_DE.md 2015-10-03 04:39:22 +02:00
licht-im-Norden87
978d002112 Update README_DE.md 2015-10-03 04:37:28 +02:00
licht-im-Norden87
4d867cb4f7 Update README_DE.md 2015-10-03 04:36:38 +02:00
commy2
94eaeb38cc move variable out of params 2015-10-01 21:34:40 +02:00
commy2
7f1f56c121 fix broken time format for rallypoints, fix #2662 2015-10-01 21:28:00 +02:00
commy2
ea01db4030 Merge pull request #2648 from acemod/340goggles
Code cleanup / refactoring Goggles
2015-10-01 16:54:57 +02:00
licht-im-Norden87
66e8914360 Update stringtable.xml 2015-10-01 04:38:21 +02:00