Commit Graph

7797 Commits

Author SHA1 Message Date
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
4ba0d72bfd #2580 (1) - Fix bandages always created at terrain level. 2015-10-10 23:09:52 -05: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
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
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