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,709 Commits 73 Branches 88 Tags 752 MiB
98f6bb3589
Commit Graph

7709 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SzwedzikPL
98f6bb3589 Merge branch 'master' of https://github.com/acemod/ACE3 into interactions_lamps 
Conflicts:
	addons/cargo/CfgVehicles.hpp
	addons/interaction/CfgVehicles.hpp
	addons/interaction/XEH_preInit.sqf
	addons/interaction/stringtable.xml
 2015-10-15 11:49:08 +02:00
PabstMirror
cb65a67a3e Merge pull request #2745 from acemod/fixChairsOverWater 
Use AGL for sitting setPos
 2015-10-14 13:19:54 -05:00
PabstMirror
f7fe0c08e0 #2391 - Use AGL for sitting setPos 2015-10-14 11:15:44 -05:00
PabstMirror
733c695c41 Merge pull request #2736 from acemod/mapEffectsTrippleHead 
Map effects / flashlights for TrippleHead
 2015-10-14 10:46:38 -05:00
Glowbal
1242cc8349 Merge pull request #2737 from acemod/revert-backslash 
Revert the backslash in sqf validator
 2015-10-12 21:31:31 +02:00
Glowbal
3e4906fa7e Revert the backslash in sqf validator 
- Use a forward slash in path for travis to work properly
 2015-10-12 21:29:50 +02:00
PabstMirror
5d76395914 #2734 - Map effects / flashlights for TrippleHead 2015-10-12 11:27:38 -05:00
PabstMirror
7062f60f0a Fix UBC from #2726 2015-10-12 01:07:20 -05:00
Glowbal
acd9cc33d7 Merge pull request #2714 from jonpas/updateReadme 
Update README.md files
 2015-10-11 23:26:33 +02:00
Glowbal
ecafbb0242 Merge pull request #2733 from jonpas/fixSQFvalidatorWithoutPythonArg 
Add shebang line to specify python version to SQF validator
 2015-10-11 23:24:49 +02:00
jonpas
d926a4a52a Add shebang line to specify python version to SQF validator and replace slash with backslash 2015-10-11 23:20:56 +02:00
Glowbal
2856cee261 Merge pull request #2732 from acemod/improve-sqf-validator 
Improve sqf validator
 2015-10-11 20:49:54 +02:00
Glowbal
b524c28d53 Improved output text 
- Capitalized SQF everywhere
- Break checked files and errors into multiple lines
- Add a break by line between reported errors and result
- Fix incorrect report message for semi-columns
- Change excessive usage of # prints on start
 2015-10-11 18:31:39 +02:00
Glowbal
d6ab43d77e Possible fix for travis build failure 2015-10-11 17:35:55 +02:00
Glowbal
afb28d01ea Improve sqf validator 
- fix not all string cases were caught
- add basic semi column validation after code blocks
- Improve print output
- Fix a dot in file path when reporting an error
 2015-10-11 17:25:53 +02:00
Glowbal
dba074ab7d Merge pull request #2731 from acemod/ci-slack-notfications 
Add slack notification for ace3public dev channel
 2015-10-11 15:27:46 +02:00
Glowbal
51c4b2b895 Fix formatting of script 2015-10-11 15:26:06 +02:00
Glowbal
fe7f8e66f7 Add slack notification for ace3public dev channel 2015-10-11 15:23:22 +02:00
Glowbal
4b827e6b03 Merge pull request #2692 from acemod/deploy-master-only 
Run the travis deploy on master only
 2015-10-11 15:08:21 +02:00
Glowbal
8e9c2754fd Change translation guide link in translations issue to markdown 
- Change from @Jonpas
 2015-10-11 15:01:31 +02:00
Glowbal
33be10126e Improve travis yml 
- Add slack integration
- Change the deploy.py to only run on pushes to the master branch
- Change email notifications to only mail once on failure
 2015-10-11 15:01:02 +02:00
Glowbal
1e26fee3ba Merge pull request #2683 from acemod/commonCleanupX 
Common cleanup x
 2015-10-11 12:15:27 +02:00
Glowbal
a91aad6bf4 Merge pull request #2398 from alganthe/contributing.md 
contributing.md added
 2015-10-11 12:08:33 +02:00
Glowbal
9c9eec4ce0 Merge pull request #2399 from alganthe/readme_update 
updated readme.md
 2015-10-11 12:08:16 +02:00
Glowbal
8db8e87c53 Merge pull request #2560 from acemod/lockingMissles 
#2349 - Don't disable locking for base RocketPods
 2015-10-11 12:06:11 +02:00
Glowbal
94ed78a173 Merge pull request #2578 from alganthe/strings_fix 
PAK and Surgical Kit strings normalized inside modules.
 2015-10-11 12:05:11 +02:00
PabstMirror
60ef413050 Merge pull request #2726 from acemod/makePalletsBig 
Cargo: Make "Supply Box" pallets heavy
 2015-10-10 11:27:42 -05:00
PabstMirror
53f833b68c #2702 - Cargo: Make "Supply Box" pallets heavy 2015-10-10 00:19:09 -05:00
PabstMirror
af8b869c04 Merge pull request #2721 from jonpas/licenseSpellingFix 
Fix spelling of separate in LICENSE
 2015-10-09 13:58:51 -05:00
jonpas
15cba66b9b Fix spelling of separate in LICENSE 2015-10-09 20:49:23 +02:00
jonpas
36895d2e30 Update more version numbers 2015-10-09 00:23:36 +02:00
jonpas
e5a7516ec1 Non-English as well 2015-10-08 23:54:44 +02:00
jonpas
01a39e7db5 Update badges 2015-10-08 23:53:21 +02:00
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
jonpas
7258bc5efc Fix link in deploy tool 2015-10-08 17:55:54 +02: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