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
8,692 Commits 73 Branches 88 Tags 752 MiB
8b16912ad7
Commit Graph

7149 Commits

Author SHA1 Message Date
Nicolás Badano
e7ec905892 Cache the units near to the camera instead of the player. 
Works even when no player exists or is somehow viewing the action remotely.
 2015-01-17 23:48:44 -03:00
commy2
8683667d24 add day laser pointer 2015-01-17 23:38:13 +01:00
commy2
fa2acfbb50 vector FOS mode 2015-01-17 22:49:06 +01:00
Nicolás Badano
a1cb57f4db smallarms: port 2015-01-17 18:14:56 -03:00
Nicolás Badano
daec785600 AGM_Smallarms pre CBA 2015-01-17 18:02:03 -03:00
Nicolás Badano
9247bb3411 safemode: port 2015-01-17 17:32:34 -03:00
Nicolás Badano
7c41eb04e9 AGM_SafeMode pre CBA 2015-01-17 17:01:47 -03:00
Nicolás Badano
16be448168 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-01-17 16:05:14 -03:00
Nicolás Badano
fd4a2192e9 map: small fixes 2015-01-17 16:04:48 -03:00
commy2
6658eafe3d vector object height, length mode 2015-01-17 19:25:12 +01:00
Nicolás Badano
9a790a229a Merge branch 'agmMapPort' of github.com:KoffeinFlummi/ACE3 2015-01-17 15:24:46 -03:00
Nicolás Badano
6abc6073e1 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-01-17 15:19:53 -03:00
Nicolás Badano
3fa6f1b0c9 gforces: fix for when there's no player 2015-01-17 15:18:11 -03:00
bux578
68b56d9161 Merge branch 'master' into agmScopesPort 2015-01-17 19:14:33 +01:00
PabstMirror
1d475111e7 Flashbang Icon Name 2015-01-17 12:12:02 -06:00
Nicolás Badano
6bee456aff Merge pull request #24 from KoffeinFlummi/agmGrenadesPort 
Port: AGM Grenades
 2015-01-17 15:05:15 -03:00
commy2
7a6d0eefe3 port weapon select 2015-01-17 18:26:51 +01:00
Thomas Kooi
d3c05209ea Changed loading bar to make use of PFH 2015-01-17 18:21:52 +01:00
Nicolás Badano
c851a14da9 common: added execNextFrame function 2015-01-17 13:56:24 -03:00
Nicolás Badano
4926b6970b fixes typos 2015-01-17 13:45:56 -03:00
Nicolás Badano
f165030e3b common: remove the support for code as string 2015-01-17 12:23:03 -03:00
Thomas Kooi
748f4f30be Removed throw for consistency. Not used anywhere else. 2015-01-17 14:26:50 +01:00
Thomas Kooi
42c90074cb Removed duplicate limitSpeed. Already present in vehicles pbo 2015-01-17 14:20:49 +01:00
Thomas Kooi
cdc2373872 Removed foreachDo 2015-01-17 14:14:12 +01:00
Thomas Kooi
781ebaca95 Changed StateUnconscious to "ACE_isUnconscious" 2015-01-17 14:13:37 +01:00
Thomas Kooi
7345cf91cf Minor code clean up 2015-01-17 13:54:44 +01:00
Thomas Kooi
eaa44fce6f Changed some spawns to call 2015-01-17 13:38:26 +01:00
Thomas Kooi
a8e257f7ab Changed setDead to no longer use spawn. 2015-01-17 13:35:15 +01:00
Thomas Kooi
d42b83947d Fixed script errors in limit speed functions (missing [) 2015-01-17 13:35:03 +01:00
Thomas Kooi
38947ba669 Moved sendDisplay & sendMessage functions to GUI instead of common. 2015-01-17 13:03:51 +01:00
Thomas Kooi
e5579f1c32 Removed spawn usage from limit movement speed functions 2015-01-17 12:53:23 +01:00
Glowbal
041a4fccc5 Removed CSE text 
Changed set count to pushback.
 2015-01-17 12:42:10 +01:00
Glowbal
31f0b80659 Fixed CBA macro mistake 2015-01-17 12:40:06 +01:00
Glowbal
6e4a12ff4d Fixed CBA macro mistake 
Fixed an CBA macro mistake.
 2015-01-17 12:39:33 +01:00
Thomas Kooi
83128ad3d2 Fixed minor issues with unconscious & blackout effect. 
Fixed error in XEH_postInit
 2015-01-17 12:35:59 +01:00
Thomas Kooi
8a61f5fbb5 Changed setUnconsciousState to no longer use spawn. 2015-01-17 12:08:11 +01:00
Thomas Kooi
a77082e4f7 Made functions compatible with removed/renamed functions. 2015-01-17 12:07:41 +01:00
Thomas Kooi
45284c7855 Changed customEventHandler_f to raiseScriptedEvent_f 
Should be replaced by the ACE eventhandler at a later stage.
 2015-01-17 12:07:03 +01:00
Thomas Kooi
6509491c19 Removed duplicate functions 2015-01-17 12:06:03 +01:00
Thomas Kooi
f25766d4e4 Moved effect functions to GUI folder 2015-01-17 12:05:07 +01:00
bux578
79695f00e9 Merge remote-tracking branch 'origin' into agmScopesPort 2015-01-17 09:22:34 +01:00
PabstMirror
1783bf4db6 #49 - targetEvent for flashbang 2015-01-17 00:39:46 -06:00
Nicolás Badano
27bd5c5790 hearing: fixes 2015-01-17 03:20:41 -03:00
PabstMirror
853dfba86a Merge branch 'master' into agmGrenadesPort 2015-01-17 00:15:07 -06:00
Nicolás Badano
a7e016fa8f overheating: change addPerFrameHandler to waitAndExecute 2015-01-17 03:13:05 -03:00
Nicolás Badano
fefb599a55 explosives: change addPerFrameHandler to waitAndExecute 2015-01-17 03:09:51 -03:00
Nicolás Badano
8a397f80ef hearing: change addPerFrameHandler to waitAndExecute 2015-01-17 03:02:52 -03:00
Nicolás Badano
2f4f6f3161 common: add waitAndExecute function 2015-01-17 02:58:24 -03:00
Nicolás Badano
c85db9baf9 hearing: fix PFH in case the game is paused 2015-01-17 02:24:28 -03:00
Nicolás Badano
800e16edc5 explosives: fix timer in case the game pauses 2015-01-17 02:14:09 -03:00
Nicolás Badano
1adbe8c6a9 nightvision: make EH calls traceable 2015-01-17 02:12:37 -03:00
Nicolás Badano
7fd578326f Merge pull request #47 from KoffeinFlummi/agmGForcesPort 
Port: AGM_GForces
 2015-01-17 01:15:52 -03:00
Nicolás Badano
402156aecf gforces: renamed function 2015-01-17 01:09:12 -03:00
PabstMirror
4cc57be48c Cleanup debug 2015-01-16 22:07:53 -06:00
Nicolás Badano
e61b828314 gforces: moved stuff out of config.cpp 2015-01-17 01:01:56 -03:00
Nicolás Badano
43b87cda0b gforces: tweaked based on pilot feedback (https://github.com/KoffeinFlummi/AGM/issues/1774#issuecomment-70341573) 2015-01-17 00:59:45 -03:00
Nicolás Badano
f594198eae gforces: port from AGM 2015-01-16 23:01:41 -03:00
PabstMirror
e260ea5314 Merge branch 'master' into agmMapPort 2015-01-16 19:21:03 -06:00
Nou
82d7f4bd5c Typo! Closes #46 2015-01-16 17:12:37 -08:00
Thomas Kooi
ef4248650e Added CSE gui port, minus the radial and configuration menus. 2015-01-17 00:22:37 +01:00
Thomas Kooi
afc103a946 Added CSE common port. 2015-01-17 00:21:47 +01:00
PabstMirror
2483e8f8d8 Merge branch 'master' into agmMapPort 2015-01-16 17:17:48 -06:00
PabstMirror
89654a42d2 Needs Testing 2015-01-16 17:13:26 -06:00
commy2
7678193ca1 remove obsolete stuff 2015-01-16 23:49:29 +01:00
commy2
cd533abd6f inventoryDisplayLoaded eh 2015-01-16 23:48:30 +01:00
commy2
d66b78bdd5 infoDisplayChanged via addEventHandler 2015-01-16 23:13:51 +01:00
Nicolás Badano
46b25e88c0 respawn: fixed actions and self_actions 2015-01-16 18:23:07 -03:00
Nicolás Badano
4445ec6195 nightvision: fix 2015-01-16 17:57:55 -03:00
Nicolás Badano
4a8e9a65b1 nightvision: Fix #42 2015-01-16 17:56:23 -03:00
Nicolás Badano
7c4af1dc17 nightvision: use ACE events to replace a PFH 2015-01-16 17:25:30 -03:00
Nicolás Badano
5f1a6c40e3 common: raise more local ACE events 2015-01-16 17:16:42 -03:00
Nicolás Badano
9654d3b36d ACE events fixes 2015-01-16 16:30:48 -03:00
Nicolás Badano
26325bb943 Throw the zeusDisplayChanged ACE event 2015-01-16 15:39:38 -03:00
Nicolás Badano
223600e689 Throw the playerVisionModeChanged ACE event 2015-01-16 15:39:19 -03:00
Nicolás Badano
8b3c70a16d Add PFH to throw the playerInventoryChanged ACE event 2015-01-16 15:28:37 -03:00
Nicolás Badano
8467013c1a Moved getAllGear function to common module 2015-01-16 15:24:25 -03:00
Nicolás Badano
7883389a53 Merge branch 'master' of git@github.com:KoffeinFlummi/ACE3.git into agmNightVisionPort 2015-01-16 14:35:52 -03:00
Nicolás Badano
5bea43910d Merge pull request #38 from KoffeinFlummi/aceEvents 
Replace some AGM custom events by ACE events
 2015-01-16 14:20:39 -03:00
Nicolás Badano
78cca3c539 interaction: raise "interactionMenuOpened" ACE event locally 2 2015-01-16 12:45:15 -03:00
Nicolás Badano
00e68c4540 interaction: raise "interactionMenuOpened" ACE event locally 2015-01-16 12:42:48 -03:00
Nicolás Badano
bce84d9a2d respawn: raise "killedByFriendly" ACE event globally 2015-01-16 12:38:43 -03:00
Nicolás Badano
e1b1edc961 noradio: ace local event for playerChanged 2015-01-16 12:14:40 -03:00
Nicolás Badano
34135ffdd4 common: ACE local event for playerChanged 2015-01-16 12:14:18 -03:00
commy2
7cd2bc24c8 port magazinerepack 2015-01-16 15:37:32 +01:00
Nicolás Badano
60270d5415 Change the loop that updates ACE_player from BIS to PFH 2015-01-16 11:30:49 -03:00
Nicolás Badano
cf08d8cfa6 Merge branch 'master' of git@github.com:KoffeinFlummi/ACE3.git 2015-01-16 11:02:30 -03:00
Nicolás Badano
96d78d07b9 Merge branch 'agmNoRadio' of git@github.com:KoffeinFlummi/ACE3.git into agmPortNoRadio 2015-01-16 10:48:16 -03:00
commy2
fac9b2f4f4 menu fixes 2015-01-16 14:35:19 +01:00
commy2
9219909ec7 port vehicles 2015-01-16 14:20:41 +01:00
bux578
b13502c5f9 spaces 2015-01-16 13:20:01 +01:00
bux578
b556097896 cbafyied scopes 
still lots of spawns and waitUntils in there
 2015-01-16 13:15:14 +01:00
PabstMirror
687c7e98aa almost done 2015-01-16 02:13:29 -06:00
PabstMirror
644e61f67e Don't always enable effects when exiting zeus 2015-01-15 22:49:46 -06:00
PabstMirror
4c7877f5a4 Fix QGVAR 2015-01-15 22:43:54 -06:00
PabstMirror
4c5912e2f1 More progress 2015-01-15 22:30:04 -06:00
Nicolás Badano
1f99a4dc4a Merge branch 'agmHearingPort' of git@github.com:KoffeinFlummi/ACE3.git 2015-01-16 01:18:06 -03:00
Nicolás Badano
b60dc8999d Merge branch 'master' of git@github.com:KoffeinFlummi/ACE3.git 2015-01-15 23:38:02 -03:00
Nicolás Badano
886ffacb35 overheating: replace last spawn by a PFH 2015-01-15 23:36:58 -03:00
Nicolás Badano
c8811552c8 overheating: add function headers 2015-01-15 23:36:31 -03:00
commy2
95f550c360 spaces 2015-01-16 02:26:59 +01:00
commy2
18c9c589c8 port reload 2015-01-16 02:25:41 +01:00
Nicolás Badano
9bd5758e40 overheating: replace a spawn by a PFH 2015-01-15 22:00:01 -03:00
commy2
addc7feb40 vector, relative slope distance and relative azimuth + distance modes, spaghetti 2015-01-16 01:48:43 +01:00
Nicolás Badano
577e6c9672 Merge branch 'master' of git@github.com:KoffeinFlummi/ACE3.git 2015-01-15 20:44:53 -03:00
Nicolás Badano
cded65d9a9 resting: changed spawn for PFH, reorganized code 2015-01-15 20:42:46 -03:00
Nicolás Badano
4340becc43 Merge pull request #35 from KoffeinFlummi/agmRestingPort 
AGM resting port
 2015-01-15 19:36:22 -03:00
Nicolás Badano
f9de90c6f9 resting: port 2015-01-15 19:34:35 -03:00
Nicolás Badano
e377cd0229 AGM_Resting pre CBA 2015-01-15 19:07:19 -03:00
PabstMirror
b12844f175 Converted to CBA style 2015-01-15 15:50:48 -06:00
commy2
7785a9df75 changing macros, irl vector guide 2015-01-15 22:32:45 +01:00
Nicolás Badano
9cf9733850 interaction: fixed the modifier key 2015-01-15 17:15:39 -03:00
Nicolás Badano
a4a4ca39f6 explosives: fixed timer #26 2015-01-15 17:06:38 -03:00
Nicolás Badano
f06da9a8c1 explosives: missing include 2015-01-15 16:57:27 -03:00
Nicolás Badano
2091aedcbc Merge branch 'master' of git@github.com:KoffeinFlummi/ACE3.git 2015-01-15 16:13:53 -03:00
Nicolás Badano
1d5201c0d7 explosives: Fix #32 2015-01-15 16:13:12 -03:00
commy2
2eb547a52e some advanced vector modes, macros 2015-01-15 19:01:27 +01:00
Nicolás Badano
d1d12804f4 Merge branch 'master' of git@github.com:KoffeinFlummi/ACE3.git 2015-01-15 14:41:55 -03:00
Nicolás Badano
8f31dea752 common: various fixes. Fix #33 2015-01-15 14:41:22 -03:00
commy2
530e93414a vector height + distance mode 2015-01-15 17:24:19 +01:00
commy2
3e9785e145 vector azimuth+inclination mode 2015-01-15 16:40:06 +01:00
commy2
79426252a1 vector distance + azmimuth mode 2015-01-15 16:21:47 +01:00
PabstMirror
f4c84182d4 Progress on Map 2015-01-15 03:51:18 -06:00
PabstMirror
e52457bfbc AGM Map Base 2015-01-15 02:36:48 -06: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
Nou
5c039a4ffd Variable misnamed for event holder! 2015-01-14 12:55:44 -08:00
PabstMirror
f352b4cdb5 Use new Event Handlers 
from 9a37538d50
 2015-01-14 14:53:09 -06:00
Nou
9a37538d50 More event handler changes! Added removeEventHandler and removeAllEventHandler, changed name from addNetEventHandler to addEventHandler, and added a localEvent function. 2015-01-14 12:44:32 -08:00
PabstMirror
a91b409702 newline 2015-01-14 14:43:43 -06:00
PabstMirror
1d083aa072 Convert Spawned/Sleep 2015-01-14 14:40:37 -06:00
KoffeinFlummi
ccc3b9d076 Port AGM_Recoil 2015-01-14 21:29:35 +01:00
KoffeinFlummi
3a44b58b5f Add PBOPREFIX to inventory 2015-01-14 21:14:53 +01:00
KoffeinFlummi
bda6afabb7 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-01-14 21:11:51 +01:00
KoffeinFlummi
b704ce5cba Merge branch 'agmInventoryPort' 2015-01-14 21:11:31 +01:00
commy2
cbc71329d2 SETPVAR instead of SETGVAR 2015-01-14 21:09:33 +01:00
KoffeinFlummi
d567785518 Change FCS indentation to 4 spaces 2015-01-14 21:07:41 +01:00
KoffeinFlummi
66b33590d5 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-01-14 21:07:08 +01:00
KoffeinFlummi
5c5c49519a Fix vector texture paths; Fix #21 2015-01-14 21:06:45 +01:00
PabstMirror
1927d6ba36 Script Comp Fix 2015-01-14 13:51:03 -06:00
PabstMirror
cedb05f8d9 Key Press 2015-01-14 13:48:08 -06:00
commy2
3bf0b772bb Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-01-14 20:39:18 +01:00
commy2
ddbc54b992 add getVariable, setVariable macros 2015-01-14 20:38:59 +01:00
PabstMirror
614dced0fa DEBUG_SETTINGS in script comps 2015-01-14 12:34:24 -06:00
PabstMirror
e1c08626be Fix Script Comp 2015-01-14 12:28:44 -06:00
PabstMirror
ad47b9a5df fix scriptComponent.hpp 2015-01-14 12:24:09 -06:00
bux578
de8ca47e88 change some core to common 2015-01-14 14:28:04 +01:00
Nicolás Badano
c16c5e756c explosives: fixes 2015-01-14 10:13:04 -03:00
Nicolás Badano
fcbabc1388 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3.git 2015-01-14 10:12:34 -03:00
Nicolás Badano
167497ec2f small fixes for explosives and interaction 2015-01-14 10:11:46 -03:00
PabstMirror
7b49e06b0d Fix config 2015-01-14 05:21:47 -06:00
PabstMirror
9224cd0c2a Work on removing spawned 2015-01-14 05:07:53 -06:00
PabstMirror
19c815f779 Model and Textures 2015-01-14 03:19:25 -06:00
PabstMirror
77065afb02 First Pass 2015-01-14 03:06:47 -06:00
KoffeinFlummi
250050129b CBAify inventory 2015-01-14 09:45:20 +01:00
KoffeinFlummi
4f4c9ab1b4 Move inventory to addons 2015-01-14 09:23:41 +01:00
PabstMirror
7ead73bc1f AGM Grenades Base 2015-01-14 01:55:23 -06:00
PabstMirror
4a0eb2d4ef Interaction paths 2015-01-14 00:48:06 -06:00
commy2
5636721717 try to port that vector 2015-01-14 07:24:17 +01:00
PabstMirror
ece2456773 #15 - updated model (on correct branch) 2015-01-14 00:15:08 -06:00
PabstMirror
00ecb21ad7 #15 oops 2015-01-14 00:02:44 -06:00
PabstMirror
c9e957f9ac #15 - all agm ref in p3d fixed - still bin issues 2015-01-13 23:24:53 -06:00
Nicolás Badano
b868e9a35c interaction: remove stuff from config. cable ties are no longer in interaction. 2015-01-14 01:47:39 -03:00
Nicolás Badano
465ae0bbfe Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3.git 2015-01-14 01:39:12 -03:00
Nicolás Badano
1de58631fb Merge pull request #19 from KoffeinFlummi/agmBackblastPort 
Agm_Backblast port
 2015-01-14 01:36:43 -03:00
Nicolás Badano
3209fea7db backblast: completed port 2015-01-14 01:32:38 -03:00
Nicolás Badano
95ec952acf backblast: initial port 2015-01-14 01:15:58 -03:00
Nicolás Badano
46cb15e831 AGM_Backblast pre CBA 2015-01-14 01:15:06 -03:00
Nicolás Badano
9408363706 Fix interaction and overheating headers 2015-01-14 01:14:47 -03:00
PabstMirror
436815fea3 Paths 2015-01-13 21:45:09 -06:00
PabstMirror
cb9b38bca2 Done I think 2015-01-13 21:36:53 -06:00
commy2
0aa348133d fix target wall texture path 2015-01-14 04:36:33 +01:00
Nicolás Badano
c2fe2ed745 Merge pull request #8 from KoffeinFlummi/agmHearingPort 
AGM hearing port
 2015-01-14 00:32:21 -03:00
Nicolás Badano
40c43944fe hearing: make tinnitus disabable 2015-01-14 00:29:01 -03:00
jaynus
cbee108845 Merge pull request #14 from KoffeinFlummi/agmDisposablesPort 
Port: AGM Disposables
 2015-01-13 19:20:09 -08:00
PabstMirror
d3f5304f62 work 2015-01-13 21:17:34 -06:00
Nicolás Badano
71879acb79 hearing: ups, wrong triangle 2015-01-14 00:13:57 -03:00
Nicolás Badano
0f4d8bc82f Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3.git into agmHearingPort 2015-01-14 00:09:27 -03:00
Nicolás Badano
057be50cf6 hearing: skip first execution of the PFH 2015-01-14 00:08:17 -03:00
PabstMirror
341fb7b86f opps 2015-01-13 21:05:09 -06:00
PabstMirror
bcd4a72013 Base No Radio 2015-01-13 21:04:25 -06:00
commy2
9c99eee461 port ballistics 2015-01-14 04:02:48 +01:00
Nicolás Badano
f082242485 hearing: buggy PFH 2015-01-13 23:34:55 -03:00
Nicolás Badano
cc7d67a150 Merge branch 'agmHearingPort' of https://github.com/KoffeinFlummi/ACE3.git into agmHearingPort 
Conflicts:
	addons/hearing/CfgSounds.hpp
	addons/hearing/CfgWeapons.hpp
	addons/hearing/script_component.hpp
 2015-01-13 23:19:00 -03:00
Nicolás Badano
5e4a78a1bc hearing: replaced spawn by PFH 2015-01-13 23:16:55 -03:00
Nicolás Badano
319e772832 hearing: tweaks 2015-01-13 23:07:50 -03:00
PabstMirror
a78f508551 compiling, still need to test 2015-01-13 20:07:31 -06:00
Nicolás Badano
b9c2af8dfe hearing: final fixes 2015-01-13 23:00:48 -03:00
PabstMirror
2df8f4f1fb Cleanup old AGM 2015-01-13 19:57:15 -06:00
Nicolás Badano
e7c3b0db18 hearing: various fixes 2015-01-13 22:41:53 -03:00
jaynus
01f16be76b Merge pull request #4 from KoffeinFlummi/agmExplosivesPort 
Ported AGM_Explosives to ace.
 2015-01-13 17:41:32 -08:00
PabstMirror
c550d5dab6 remove debug and add sanity checks 2015-01-13 19:38:00 -06:00
jaynus
c85cc6a15e Merge remote-tracking branch 'origin/agmRespawnPort' 2015-01-13 17:33:08 -08:00
jaynus
7622f3daea Fixed and working. 2015-01-13 17:32:27 -08:00
Nicolás Badano
5af4f1ed53 Merge branch 'master' into agmHearingPort 2015-01-13 22:31:06 -03:00
PabstMirror
de51a61180 convert spawn to perFrame 2015-01-13 19:30:25 -06:00
Nicolás Badano
99925a1ef0 Merge branch 'agmOverheatingPort' 2015-01-13 22:29:55 -03:00
Nicolás Badano
0ceefd893a Merge pull request #7 from KoffeinFlummi/agmOverheatingPort 
AGM Overheating port
 2015-01-13 22:28:38 -03:00
Nicolás Badano
d0f56f44ab overheating: final fixes 2015-01-13 22:26:55 -03:00
jaynus
6966700a06 Remove jav debug 2015-01-13 17:21:14 -08:00
jaynus
1f8eac7b11 Merge branch 'master' into agmRespawnPort 2015-01-13 17:12:18 -08:00
jaynus
e1dd6e54c3 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-01-13 16:51:17 -08:00
jaynus
db4f88261d nametags fixed. 2015-01-13 16:47:23 -08:00
commy2
fa4a591fbe add some missing pboprefix 2015-01-14 01:40:11 +01:00
Nicolás Badano
81e603bf35 Merge branch 'master' into agmOverheatingPort 2015-01-13 21:38:57 -03:00
commy2
feb988698f fix auto putting mx sw on back 2015-01-14 01:24:05 +01:00
jaynus
0937de0fa4 Merge branch 'master' into agmNameTagsPort 2015-01-13 16:19:48 -08:00
Nicolás Badano
a97b767283 overheating: ironing out bugs 2015-01-13 21:07:32 -03:00
commy2
bed800daa5 port aircraft 2015-01-14 00:52:37 +01:00
Nou
f275969465 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-01-13 15:27:49 -08:00
Nou
f90b23b4f6 Added network event handlers, ref ticket #12. 2015-01-13 15:27:42 -08:00
Nicolás Badano
67ca93a5f8 Merge branch 'master' into agmOverheatingPort 2015-01-13 20:20:56 -03:00
Nicolás Badano
d4bcc413b0 Replace tags in attach 2015-01-13 20:07:52 -03:00
Nicolás Badano
46cf9a194a Extract stuff out of attach config.cpp 2015-01-13 20:03:12 -03:00
Nicolás Badano
e53ed960dd Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3.git 2015-01-13 20:00:36 -03:00
Nicolás Badano
e090119d82 Tag replacements in attach 2015-01-13 20:00:31 -03:00
Nicolás Badano
e24d6aa42f Fix in interaction menu for attaching 2015-01-13 19:59:16 -03:00
commy2
ee7ae79f15 fix key release issues 2015-01-13 23:54:21 +01:00
PabstMirror
78d9ce6d7d needs testing 2015-01-13 16:53:48 -06:00
Felix Wiegand
da943e7c48 Merge pull request #5 from KoffeinFlummi/agm-fcs-port 
First port of AGM_FireControlSystem
 2015-01-13 22:51:38 +01:00
KoffeinFlummi
c8fd07a5ab Finalize FCS port 2015-01-13 22:51:02 +01:00
Garth L-H de Wet
66eeba7df1 Fixed small errors that expressed themselves when getting explosives in game. 2015-01-13 23:49:27 +02:00
commy2
46a0fc5631 more macros for common 2015-01-13 22:32:56 +01:00
Garth L-H de Wet
0e09d5de67 Added the function's script_component.hpp that includes the correct file. To reduce potential pain areas if a rename occurs. 2015-01-13 23:21:31 +02:00
Garth L-H de Wet
e3466aaf8e Merge branch 'master' into agmExplosivesPort 2015-01-13 23:17:20 +02:00
KoffeinFlummi
2b54f53ff0 Merge branch 'master' into agm-fcs-port 2015-01-13 22:06:30 +01:00
commy2
e071b2f684 fix macros in common' config 2015-01-13 20:56:02 +01:00
bux578
a29c48fd9a Merge remote-tracking branch 'origin' into agmNameTagsPort 2015-01-13 20:14:19 +01:00
bux578
7271e25c56 probably fixing config 2015-01-13 20:12:41 +01:00
PabstMirror
1648def53f first pass 2015-01-13 13:12:37 -06:00
bux578
b8d0f52544 probably fixing config 2015-01-13 20:10:30 +01:00
PabstMirror
629c0f92db Base Port 2015-01-13 12:32:05 -06:00
commy2
b7050a4a92 fixing macros 2015-01-13 19:31:26 +01:00
PabstMirror
20d44e4515 Changed \function scrippComp to link to base 2015-01-13 12:28:45 -06:00
commy2
270ff5535a fix interaction menu 2015-01-13 19:14:34 +01:00
commy2
2336b51e5b fix key input not working 2015-01-13 17:42:56 +01:00
jaynus
cca61e95f8 initial commit. 2015-01-13 08:26:45 -08:00
commy2
039ae01594 fix some sqf errors 2015-01-13 17:08:49 +01:00
commy2
9efc1f9547 fix script errors 2015-01-13 16:38:21 +01:00
bux578
f2ef2fa886 core -> config 2015-01-13 16:32:15 +01:00
bux578
67c3c7e7c3 core -> common 2015-01-13 16:29:35 +01:00
bux578
992b3f721b 4 spaces 2015-01-13 15:39:58 +01:00
bux578
41f843514f 4 spaces 2015-01-13 15:38:17 +01:00
bux578
2074e200d5 icon path fix 2015-01-13 15:33:29 +01:00
bux578
efe68df728 add stringtable 2015-01-13 15:29:55 +01:00
bux578
425be3a6c2 fixes and spaces 2015-01-13 15:28:03 +01:00
bux578
5ffe1fa3e5 Merge remote-tracking branch 'origin' into agmRespawnPort 2015-01-13 15:19:45 +01:00
bux578
cd74a5bb6a change sqf include to hpp 
https://github.com/KoffeinFlummi/ACE3/pull/10#issuecomment-69745232
 2015-01-13 15:17:12 +01:00
bux578
38ed800389 move ui folder, cleanup 2015-01-13 12:30:20 +01:00
bux578
069eb7860a cba'fied nametags 2015-01-13 12:29:13 +01:00
bux578
621625b48d init 2015-01-13 11:59:28 +01:00
Garth L-H de Wet
6d8708618a Wrapped BIS and CBA function calls in CALLSTACK. 
Converted startTimer to CBA's perFrameEventHandler.
 2015-01-13 12:13:43 +02:00
Garth L-H de Wet
43bac209d9 Changed EGVAR to not have spaces in macro call. 2015-01-13 12:12:59 +02:00
bux578
49f01a0fac fix switchUntis 
forgot that little bugger
 2015-01-13 10:53:04 +01:00
PabstMirror
073805148b Replace Spawn/Sleep in attach 2015-01-13 03:06:24 -06:00
PabstMirror
6a204aa7b9 Remove Old toMerge 2015-01-12 23:29:40 -06:00
jaynus
6fbb6672b4 Compile Errors. 2015-01-12 21:16:03 -08:00
jaynus
3fb2a8e245 big code clean up 2015-01-12 21:14:27 -08:00
PabstMirror
c10b12174b Convert while loop to addPerFrameHandler 2015-01-12 23:12:38 -06:00
Nicolás Badano
bf88af1579 hearing: replace some remaining tags 2015-01-13 01:21:49 -03:00
Nicolás Badano
90dc92fb52 Rename earplugs model file 2015-01-13 01:19:41 -03:00
Nicolás Badano
3b34ad06a2 hearing: Rename function files 2015-01-13 01:18:27 -03:00
Nicolás Badano
5d6fd9ab3e CBAfy AGM_Hearing 2015-01-13 01:17:52 -03:00
Nicolás Badano
db7322e50a AGM_Hearing pre CBA 2015-01-13 00:51:09 -03:00
Nicolás Badano
2a2eb38de7 overheating: hard code path to parent script_components 2015-01-13 00:37:53 -03:00
Nicolás Badano
a53a265117 overheating: Replace calls to core for calls to common 2015-01-13 00:30:39 -03:00
Nicolás Badano
1db298722b CBAfy AGM_Overheating 2015-01-13 00:23:14 -03:00
Nicolás Badano
c0df8b7f54 Pre CBA AGM_Overheating 2015-01-12 23:43:38 -03:00
Nou
20cfb69fcf Added DEFUNC, QFUNC, QEFUNC macros. 2015-01-12 18:08:45 -08:00
PabstMirror
72cd691e46 Working NVG 2015-01-12 16:53:19 -06:00
PabstMirror
96110c25e7 AGM - Night Vision First Pass 2015-01-12 16:08:37 -06:00
commy2
cf8259882e formating 2015-01-12 22:34:01 +01:00
Garth L-H de Wet
fe056f10e1 Fixed errors in order to get explosives to load correctly without writing anything to config. 
Will still need further testing once interaction is fully integrated.
 2015-01-12 23:06:32 +02:00
commy2
bdf2351f14 done with ai 2015-01-12 21:56:33 +01:00
commy2
d8aa735c5a fix missileguidance base class issue 2015-01-12 21:45:49 +01:00
Garth L-H de Wet
4926694bda Changed all core external to common as the rename was done. 2015-01-12 22:39:37 +02:00
commy2
35703f3920 inheritance 2015-01-12 21:35:18 +01:00
Garth L-H de Wet
57b766b48b Updated to use CBA's ARR_2 macro. 2015-01-12 22:20:42 +02:00
commy2
72e3d7519b formating 2015-01-12 20:27:43 +01:00
commy2
1ea2afaec5 some macros 2015-01-12 20:11:36 +01:00
jaynus
20fce52f26 Merge pull request #6 from KoffeinFlummi/agmSwitchUnitsPort 
Looks good and CBA-ified all magical-like
 2015-01-12 10:45:17 -08:00
jaynus
cc987c279e Merge pull request #2 from KoffeinFlummi/agmInteractionPort 
Agm interaction port
 2015-01-12 10:44:20 -08:00
commy2
7954988130 rename core to common 2015-01-12 19:22:58 +01:00
Garth L-H de Wet
bfd9aedfa0 Updated pathing for script_component.hpp and updated images to use PATHTOF. 2015-01-12 19:11:43 +02:00
commy2
17c2d90d0e make core work again 2015-01-12 16:08:34 +01:00
bux578
91ba0c6a55 remove temp folder 
didn't mean to push this
 2015-01-12 15:48:32 +01:00
bux578
5da1bdf9c0 finish cba'ing 2015-01-12 15:47:22 +01:00
bux578
07c8b7f4df replace version with macro, add missing params 2015-01-12 15:12:53 +01:00
jodav
7afce2a241 more work 2015-01-12 15:09:07 +01:00
jodav
f3427938b3 init 2015-01-12 14:54:36 +01:00
commy2
4c000ca5fe delete obsolete file 2015-01-12 14:16:09 +01:00
commy2
8bc42eb14f fix some errors in XEH_postInit 2015-01-12 14:12:50 +01:00
Garth L-H de Wet
f5772371bd Added $PBOPREFIX$ for explosives. 2015-01-12 13:42:02 +02:00
PabstMirror
d59b33f697 More Core Stuff 2015-01-12 05:25:34 -06:00
PabstMirror
a9c20dcaf6 COMPILE_FILE macros 2015-01-12 05:14:15 -06:00
KoffeinFlummi
d354f3796f Replace version numbers with macros 2015-01-12 11:52:07 +01:00
KoffeinFlummi
cdf08ee2cd Rename Optics.hpp to CfgOptics.hpp 
That might not be a real class, but it makes it easier to tell config
includes from other files at a glance.
 2015-01-12 11:34:36 +01:00
KoffeinFlummi
2942306e3c Move EHs to seperate file, add preInit for PREPs 2015-01-12 11:33:50 +01:00
KoffeinFlummi
479c4b01e8 Add PBOPREFIX 2015-01-12 11:27:56 +01:00
jodav
c72c51aca0 add script_component.hpp include, add file header 2015-01-12 11:24:58 +01:00
commy2
db48e0c83d merge with master 2015-01-12 11:08:03 +01:00
KoffeinFlummi
7d9b03611a Prefixes 2015-01-12 11:06:27 +01:00
KoffeinFlummi
e02e058ecb First port of AGM_FireControlSystem -> ace_fcs 
Untested
 2015-01-12 11:02:44 +01:00
PabstMirror
e4219d05e3 Compile Fixes 
Same as e3ed811736
 2015-01-12 03:53:02 -06:00
jodav
5871053564 cba'd functions 2015-01-12 10:49:30 +01:00
Garth L-H de Wet
5e67de4d66 Ported AGM_Explosives to ace. 
Marked locations where Scheduled Delay Execution will probably need to be used.
 2015-01-12 11:48:26 +02:00
PabstMirror
d85c05ffe3 syntax fixes 2015-01-12 03:31:31 -06:00
jodav
074acf631b remove " 2015-01-12 10:25:41 +01:00
jodav
8bc6aceeca postCBA 2015-01-12 10:20:50 +01:00
PabstMirror
e3ed811736 Little Fixes to get it compiling 2015-01-12 03:17:29 -06:00
jodav
ff56051a1a fn_ to fnc_ 2015-01-12 10:08:24 +01:00
jodav
c5a42d1187 preCBA 2015-01-12 10:07:03 +01:00
Nicolás Badano
62ff0edb80 Change PREPF to PREP for core 2015-01-12 01:27:21 -03:00
Nicolás Badano
9ce4f585ca Change PREPF to PREP for interaction 2015-01-12 01:26:07 -03:00
Nicolás Badano
f99f1a2791 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3.git into agmInteractionPort 2015-01-12 01:20:39 -03:00
Nicolás Badano
1aa862bc3b Change stringtables and main variables prefixes to ACE 2015-01-12 01:20:02 -03:00
Nicolás Badano
306dce2153 Finnish porting agm_core. Replace all AGM prefixes by ACE, including stringtables and main variables like ACE_player 2015-01-12 01:02:33 -03:00
Nicolás Badano
ee8faadc4b Rename function files 2015-01-11 23:37:56 -03:00
Nou
877fef16be Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-01-11 17:28:45 -08:00
Nou
b3e3a7b926 PBOPREFIX fixes. 2015-01-11 17:28:39 -08:00
commy2
33c94939f3 change tag to ace 2015-01-12 01:43:29 +01:00
commy2
841f7e7d5a more real names in stringtables instead of config 2015-01-12 01:39:47 +01:00
Nou
cdc1f7d3d7 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-01-11 16:04:22 -08: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
commy2
6efe1f9a18 fix updating base class, sort realistic names 2015-01-12 00:57:04 +01:00
Nicolás Badano
6025fc5c57 Macros for the rest of interaction 2015-01-11 20:13:47 -03:00
jaynus
61d7309c9d More macro's and ACRE debug callstack macros added 2015-01-11 14:07:32 -08:00
jaynus
3f0b3022d0 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-01-11 14:04:27 -08:00
jaynus
2222bb721b Add example blank module and EGVAR() QEGVAR() 2015-01-11 14:04:19 -08:00
commy2
1bdb2038eb port ai 2015-01-11 23:01:27 +01:00
commy2
716c77b808 port realistic names 2015-01-11 22:28:38 +01:00
Nicolás Badano
8d1bdd88ff Finish macro work for config 2015-01-11 18:22:47 -03:00
commy2
670a3a687d port thermals 2015-01-11 22:21:16 +01:00
commy2
8cfe073f3a port ragdolls 2015-01-11 22:06:40 +01:00
Nicolás Badano
d405d5920a Macros for interaction keys and conditions 2015-01-11 17:41:04 -03:00
Nicolás Badano
e823e60224 Remove unused code 2015-01-11 17:40:17 -03:00
commy2
f969be6302 trying to fix capitilization 2 2015-01-11 21:39:49 +01:00
commy2
2c1d925dc4 trying to fix captilization 2015-01-11 21:39:01 +01:00
Nicolás Badano
7c7fec0642 Rename function files for attach 2015-01-11 16:56:58 -03:00
Nicolás Badano
8bff5f6ef4 interaction: add script_component, initial CBAfication of config. 2015-01-11 16:50:29 -03:00
Nicolás Badano
17564e483a Unaved macros for attach 2015-01-11 16:34:45 -03:00
Nicolás Badano
6769189e7c AGM_Interaction pre CBA 2015-01-11 16:32:51 -03:00
Nicolás Badano
2452884acb Further macros for attach (EFUNC, EQGVAR). Minor fixes 2015-01-11 16:16:08 -03: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
ab46d7c0c8 attach post CBAify. StackedEventHandlers needs converting to cba_fnc_addPerFrameHandler. 2015-01-11 10:33:44 -08:00
jaynus
fa5098b169 AGM_Attach PRE CBA 2015-01-11 10:26:40 -08:00
jaynus
1e29509b45 Dragon, lasers, air_hud and javelin code. 2015-01-11 10:24:19 -08:00
jaynus
800c150446 Stringified, GVARified, FUNCified 2015-01-11 10:20:14 -08:00
jaynus
9dc020d114 save 2015-01-11 10:06:21 -08:00
jaynus
8dd70e9b22 Initial commit. main, core (not complete) and to-merge. 2015-01-11 08:42:31 -08:00