Commit Graph

239 Commits

Author SHA1 Message Date
commy2
b1f79f0383 fix broken log warning macro 2015-09-21 21:39:45 +02:00
commy2
8503d15c9b more common code cleanup 2015-09-21 18:37:19 +02:00
esteldunedain
a621a0c693 Fixes to spanish translations 2015-09-18 13:36:57 -03:00
esteldunedain
3422f5a7f1 Merge branch 'master' of https://github.com/Legolasindar/ACE3 into spanish-translation
Conflicts:
	addons/medical/stringtable.xml
	addons/repair/stringtable.xml
2015-09-18 13:20:22 -03:00
ViperMaul
c748e56f4a bump v3.3.1.2 2015-09-16 11:42:01 -07:00
ViperMaul
e78b59c28a bump to 3.3.1.1 2015-09-16 05:09:48 -07:00
Ivan Navarro Cabello
463e21dd91 330 2015-09-16 12:40:30 +02:00
ViperMaul
8330aadb6f bump version to 3.3.1 2015-09-15 17:56:57 -07:00
Glowbal
c6c51af548 Updated build version 2015-09-15 21:13:36 +02:00
Alessandro Foresi
89eb98a248 Added: IT more translation, medic partial
Fixed: dup entries (from gienkov)
2015-09-12 23:16:57 +02:00
Glowbal
f60954a49b increased build number (3.3.0.1) 2015-09-10 22:18:13 +02:00
KoffeinFlummi
63c2712360 Merge branch 'release' into portuguese 2015-09-10 21:59:30 +02:00
KoffeinFlummi
c2ffe7cad0 Merge branch 'release' into russian 2015-09-10 21:05:32 +02:00
KoffeinFlummi
a5621604fd Merge branch 'release' into czech 2015-09-10 20:51:33 +02:00
Glowbal
6a31140f7d Version 3.3.0 2015-09-08 19:38:52 +02:00
ViperMaul
2fc35338d5 Build number for Release Candidate 2015-09-06 21:37:20 -07:00
Jonathan Pereira
7147891710 Added latest ACE3 PT-BR translations 2015-09-05 15:12:31 -03:00
kaban
08b7110e58 Russian Translations - Update 2015-09-03 04:54:52 +03:00
kaban
91cae690c0 Russian Translations - Update 2015-09-03 03:36:15 +03:00
ProfessorCZ
44fa520bdd Czech Translations - Update 2015-09-03 01:20:24 +02:00
commy2
5e68486233 high command module breaks ace, fix #2134 2015-09-01 10:06:01 +02:00
Glowbal
b968a32ea2 Merge pull request #2260 from acemod/updateMainConfig
Update Main Config File
2015-08-30 00:37:46 +02:00
ViperMaul
a86ff93c16 Merge pull request #2052 from MikeMatrix/logMacros
ACE specific logging macros
2015-08-26 21:52:20 -07:00
Michael Braun
93106697ab Added debug log macros 2015-08-27 06:21:02 +02:00
ViperMaul
5ea98143e2 Merge pull request #2211 from jonpas/integrateAsdg
Integrated ASDG JR Optional
2015-08-26 17:53:32 -07:00
Michael Braun
9ca19def70 Added autoformatting variations for log macros 2015-08-26 17:09:31 +02:00
Michael Braun
fd204d972d Fixed issue with ERROR conflicting with log level input 2015-08-26 16:45:28 +02:00
Michael Braun
5f6584ba3f Added Log format macros for use with not printing it to the log. 2015-08-26 15:53:03 +02:00
Michael Braun
a17d94c213 Removed semicolon of log macro 2015-08-26 14:12:17 +02:00
Michael Braun
5a0e95dcf0 Simplified log macros 2015-08-26 14:04:17 +02:00
jokoho48
8d29170551 fixing Spelling Issues
Change from DEBUG_SETTINGS_CORE to DEBUG_SETTINGS_MAIN
2015-08-25 19:33:10 +02:00
jokoho48
2af486ab6b Update Main Config File 2015-08-25 18:34:10 +02:00
gienkov
1bbf721ef6 main translation 2015-08-21 23:51:48 +02:00
jonpas
9fd155f3ec Integrated ASDG JR Optional 2015-08-19 17:11:15 +02:00
jonpas
b627e32a00 Added shared logistics categories 2015-08-19 16:54:44 +02:00
Michael Braun
da97472600 Added ace specific logging methods 2015-08-07 12:56:10 +02:00
ViperMaul
78d4da85cd Updated version to 3.2.2 2015-08-04 21:36:03 -07:00
Glowbal
02cfbeda8c Updated version to 3.2.1 2015-08-01 12:10:42 +02:00
PabstMirror
ceb12662e0 Version To 3.2.0 2015-07-27 02:05:58 -05:00
SzwedzikPL
6569fe1d62 macro_addbackpack 2015-07-25 13:13:31 +02:00
jonpas
01ba50bbb2 Fixed ELSTRING macro typo 2015-07-13 22:12:54 +02:00
ViperMaul
394bcafc4a Set version to 3.1.2 2015-06-18 15:49:27 -07:00
ViperMaul
bab33bfbe2 Bump the build number from 0 to 1 2015-06-17 08:15:19 -07:00
ViperMaul
47ef53201a Set version number to 3.1.1 2015-06-16 22:41:04 -07:00
ViperMaul
4c572ef298 Set version number to 3.1.0 2015-06-13 13:46:24 -07:00
jonpas
e7cfda5c77 Added Macro Guard to string macros 2015-06-04 22:46:06 +02:00
jonpas
763cb07629 Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
jonpas
a99c02ff02 Added ESTRING and ECSTRING for external module references 2015-05-27 22:02:03 +02:00
jonpas
600fe61f72 Added STRING and CSTRING Macros 2015-05-27 17:10:34 +02:00
KoffeinFlummi
f16f282abd Merge remote-tracking branch 'origin/release' into master-fix
Conflicts:
	addons/medical/functions/fnc_handleDamage.sqf
	extensions/common/p3d/animation.cpp
	extensions/common/p3d/compressed.cpp
	extensions/common/p3d/compressed.hpp
	extensions/common/pbo/archive.cpp
	extensions/common/pbo/search.cpp
	extensions/common/pbo/search.hpp
	extensions/common/shared.hpp
	extensions/common/simplepipe_win32.cpp
	extensions/common/simplepipe_win32.hpp
	extensions/common/simulation/object.cpp
	extensions/common/simulation/object.hpp
	extensions/common/targetver.h
	extensions/common/vector.hpp
2015-05-20 19:31:55 +02:00
ViperMaul
0a743d847c Set version number to 3.0.1 2015-05-18 15:42:53 -07:00
jaynus
d972f14649 Merge pull request #1092 from acemod/superTime
ACE_time variables for accurate purposeful time use
2015-05-12 19:34:20 -07:00
ViperMaul
ab580dd1c7 Set version number to 3.0.0.3 2015-05-12 07:08:45 -07:00
jaynus
c39b5931c7 ACE tickTime based on ACE_time. 2015-05-10 07:56:14 -07:00
jaynus
e1c3c40cdd I need more coffee. this should be more accurate. 2015-05-10 07:50:58 -07:00
jaynus
318b2437f9 Applied virtual time acceleration to the master ACE_time. Created ACE_tickTime macro, to provide same-frame millisecond resolution. 2015-05-10 07:42:53 -07:00
KoffeinFlummi
97a9bffe98 Set version number to 3.0.0.2 2015-05-02 00:49:43 +02:00
PabstMirror
f0477b8e95 Make PARAM/Explode_X faster
skips the IS_ARRAY check normaly found in EXPLODE_1_SYS
2015-04-25 10:25:08 -05:00
esteldunedain
3ee18f9a3a Readd CfgModuleCategories.hpp 2015-04-12 11:06:25 -03:00
esteldunedain
e7f9245d7e ACE_Main major cleanup 2015-04-12 10:54:18 -03:00
PabstMirror
c511431e61 Fix encoding problem
Not sure why, but it was decoding the \a's: Warning:
z\ace\addons\main\config.cpp Line 556: ['MAIN',_this] execVM
'\zceddons\mainbout.sqf';-NOGIT
2015-04-09 17:17:33 -05:00
PabstMirror
007e4fc234 Merge pull request #274 from KoffeinFlummi/142requiredaddons
1.42 ensure ace is loaded after marksmen configs
2015-04-08 13:21:33 -05:00
jaynus
1bb6be5654 Cleaning up of all tabs in source code files. 2015-04-06 09:22:43 -07:00
jaynus
d81d1b3176 Added: ACE Event stack debugging output, use DEBUG_EVENTS in main\script_debug
Added: PFH Perfcounter tracking+output, use ENABLE_PERFORMANCE_COUNTERS in main\script_debug and then call ace_common_fnc_dumpPerformanceCounters
2015-04-02 16:05:21 -07:00
commy2
33f0ff9b82 1.42 ensure ace is loaded after marksmen configs 2015-03-29 14:19:01 +02:00
commy2
1d4249a825 macros 2015-03-21 21:51:27 +01:00
commy2
efb3657da3 drag boxes 2015-03-16 14:31:16 +01:00
jaynus
59db61e192 Performance counter macros 2015-03-10 12:59:40 -07:00
PabstMirror
93d889031f 1.40 Changes In Config Inhertiance (RC) 2015-02-28 19:06:17 -06:00
commy2
e72742da31 add macros for transport cargo config 2015-02-14 08:26:30 +01:00
KoffeinFlummi
c407553d49 Add remaining READMEs, add helper script 2015-01-26 14:34:48 +01:00
Nicolás Badano
4a29f6a3c3 Set wind and rain syncing. Change ACE_wind from macro to global variable 2015-01-20 23:17:09 -03:00
commy2
7785a9df75 changing macros, irl vector guide 2015-01-15 22:32:45 +01:00
commy2
2eb547a52e some advanced vector modes, macros 2015-01-15 19:01:27 +01:00
commy2
bc43ee5136 get the vector to work, wip 2015-01-15 07:18:57 +01:00
Nou
d281caffbe Added ACRE2's hash and hash lists. 2015-01-14 13:29:52 -08:00
commy2
cbc71329d2 SETPVAR instead of SETGVAR 2015-01-14 21:09:33 +01:00
commy2
ddbc54b992 add getVariable, setVariable macros 2015-01-14 20:38:59 +01:00
commy2
270ff5535a fix interaction menu 2015-01-13 19:14:34 +01:00
jaynus
3fb2a8e245 big code clean up 2015-01-12 21:14:27 -08:00
Nou
20cfb69fcf Added DEFUNC, QFUNC, QEFUNC macros. 2015-01-12 18:08:45 -08:00
commy2
72e3d7519b formating 2015-01-12 20:27:43 +01:00
PabstMirror
e3ed811736 Little Fixes to get it compiling 2015-01-12 03:17:29 -06:00
Nou
59685f53e7 Changed PREP macro to use CBA function caching and our folder structure, removed PREPF macro to follow normal PREP CBA standard. Changed examples to match (also changed a few caps in paths, and the required addons to match ACE). 2015-01-11 16:04:14 -08:00
jaynus
61d7309c9d More macro's and ACRE debug callstack macros added 2015-01-11 14:07:32 -08:00
jaynus
2222bb721b Add example blank module and EGVAR() QEGVAR() 2015-01-11 14:04:19 -08:00
jaynus
ef2ed3444a Final CBA. Includes with PREPF() for functions\ file preperation w/ CBA. Also included script_component across addon for macro definitions. 2015-01-11 10:44:03 -08:00
jaynus
1e29509b45 Dragon, lasers, air_hud and javelin code. 2015-01-11 10:24:19 -08:00
jaynus
8dd70e9b22 Initial commit. main, core (not complete) and to-merge. 2015-01-11 08:42:31 -08:00