summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Nikolay Korolev2019-06-3037-317/+319
|\
| * Merge pull request #78 from ShFil119/cleanupaap2019-06-3037-317/+319
| |\
| | * Cleanup project a bitFilip Gawin2019-06-3037-317/+319
| * | Merge pull request #77 from Nick007J/masteraap2019-06-3060-53/+844
| |\ \ | | |/ | |/|
* | | Reactivated Store(Restore)StuffIn(From)Mem, fixed bugsNikolay Korolev2019-06-307-38/+42
| |/ |/|
* | PlayBackThisFrameInterpolation and all it required...Nikolay Korolev2019-06-3058-11/+662
* | ProcessCarUpdateNikolay Korolev2019-06-296-37/+146
* | CReplay::PlaybackThisFrame + fixesNikolay Korolev2019-06-293-7/+38
|/
* fixaap2019-06-291-1/+1
* fix hud render states; bug in coronasaap2019-06-294-717/+709
* Merge pull request #71 from ShFil119/audio2aap2019-06-295-12/+5891
|\
| * Implement the rest of GetXTalkSfxFilip Gawin2019-06-292-265/+2238
| * Implement some GetXTalkSfx methodsFilip Gawin2019-06-295-223/+612
| * fixes for AudioManager::GetPhraseFilip Gawin2019-06-293-15/+267
| * AudioManager::GetPhraseFilip Gawin2019-06-293-3/+3268
* | Merge pull request #72 from Nick007J/masteraap2019-06-296-10/+164
|\ \ | |/ |/|
| * fixNikolay Korolev2019-06-291-1/+1
| * fixNikolay Korolev2019-06-291-2/+0
| * Fixed mergeNikolay Korolev2019-06-291-1/+0
| * Merged with upstreamNikolay Korolev2019-06-2920-70/+248
| |\ | |/ |/|
* | fixaap2019-06-291-1/+1
* | missed two lines in CCollisionaap2019-06-291-0/+4
* | Merge branch 'master' of github.com:GTAmodding/re3aap2019-06-291-12/+12
|\ \
| * \ Merge pull request #70 from Nick007J/masteraap2019-06-291-12/+12
| |\ \
* | | | miscellaneous, mostly world relatedaap2019-06-2920-69/+244
|/ / /
| | * more replay stuff, bug fixNikolay Korolev2019-06-293-13/+63
| | * RetrievePedAnimationNikolay Korolev2019-06-291-0/+41
| | * ProcessPedUpdateNikolay Korolev2019-06-297-6/+73
| |/
| * Changed to actual crimes namesNikolay Korolev2019-06-291-12/+12
|/
* forgot the actual file...aap2019-06-281-0/+212
* PS2-like MatFX from skygfxaap2019-06-282-0/+4
* island load screen, some more CTextaap2019-06-284-8/+72
* fixed CFileMgr, the craziest bug i ever hadaap2019-06-284-8/+5
* misc stuff, mostly collisionaap2019-06-2816-45/+388
* Merge pull request #67 from gennariarmando/masteraap2019-06-281-38/+23
|\
| * Little ops._AG2019-06-281-2/+2
| * Some Hud.cpp fixes._AG2019-06-281-38/+23
* | Merge pull request #68 from erorcun/erorcunaap2019-06-287-23/+166
|\ \ | |/ |/|
| * Footstepseray orçunus2019-06-287-23/+166
* | CHud cleanup: fixes and cosmetic treatmentaap2019-06-284-216/+233
* | CStreaming DONEaap2019-06-2811-34/+334
* | Merge pull request #59 from Nick007J/masteraap2019-06-282-0/+144
|\ \ | |/ |/|
| * Changed save/load in CGangNikolay Korolev2019-06-272-24/+35
| * fixed newlineNikolay Korolev2019-06-271-1/+1
| * Merge remote-tracking branch 'upstream/master'Nikolay Korolev2019-06-274-27/+234
| |\
| * | Added GangsNikolay Korolev2019-06-272-0/+133
* | | Merge pull request #62 from erorcun/erorcunaap2019-06-272-13/+11
|\ \ \
| * | | Several little mistakes in CPederay orçunus2019-06-272-13/+11
* | | | CStreaming almost doneaap2019-06-2710-66/+421
|/ / /
* | | started filling debug menuaap2019-06-2710-12/+187
* | | Merge pull request #61 from gennariarmando/masteraap2019-06-272-72/+164
|\ \ \
| * | | Finished Hud.cpp_AG2019-06-272-72/+164
* | | | Merge pull request #60 from erorcun/erorcunaap2019-06-273-6/+6
|\ \ \ \
| * \ \ \ Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-06-274-27/+234
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Fix 3 bugseray orçunus2019-06-273-6/+6
| * | | | Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-06-2636-68/+825
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-06-264-16/+61
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-06-262-112/+309
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-06-2610-691/+792
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-06-2519-498/+2545
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge pull request #57 from gennariarmando/masteraap2019-06-274-65/+115
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Reverted Pad.cpp to previous state._AG2019-06-271-10/+14
| * | | | | | | Update Wanted.cpp_AG2019-06-265-79/+125
| | |_|_|_|/ / | |/| | | | |
* | | | | | | yet more CStreamingaap2019-06-274-27/+234
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge pull request #48 from Nick007J/masteraap2019-06-2636-68/+825
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fixed autobuildNikolay Korolev2019-06-261-1/+1
| * | | | | Fixed merge errorsNikolay Korolev2019-06-264-4/+4
| * | | | | Merge with upstreamNikolay Korolev2019-06-2650-677/+4811
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | blaaap2019-06-261-1/+1
* | | | | | some more CStreaming + fixes by erorcunaap2019-06-264-16/+61
| |_|_|_|/ |/| | | |
* | | | | CStreaming streamsaap2019-06-262-112/+309
| |_|_|/ |/| | |
* | | | fixed bug in CPedaap2019-06-261-3/+3
* | | | Merge pull request #51 from gennariarmando/masteraap2019-06-268-668/+773
|\ \ \ \
| * | | | Little fix #52._AG2019-06-253-26/+27
| * | | | Better organization for Frontend.cpp_AG2019-06-258-668/+772
| | |_|/ | |/| |
* | | | CPed cleanupaap2019-06-261-18/+14
* | | | Merge pull request #50 from erorcun/erorcunaap2019-06-261-50/+50
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix car animations & M16 bugeray orçunus2019-06-251-50/+50
* | | | fixed PedTypeaap2019-06-261-2/+2
| |/ / |/| |
* | | Frontend clean upaap2019-06-252-76/+185
* | | Merge pull request #49 from gennariarmando/masteraap2019-06-2519-498/+2436
|\ \ \ | |/ / |/| |
| * | Initial commit for Frontend._AG2019-06-2519-498/+2436
|/ /
* | Merge pull request #43 from erorcun/erorcunaap2019-06-2414-40/+789
|\ \
| * | CPed, CVehicle, mostly entering/exiting careray orçunus2019-06-2414-40/+789
* | | replaced some ctors; made PreRender call game functionaap2019-06-245-5/+11
* | | fixed bug in CPlaceableaap2019-06-241-40/+31
* | | more CStreamingaap2019-06-243-51/+747
|/ /
* | more Radar codeaap2019-06-234-40/+352
* | some Radar and Hud cleanup; fix in Physicalaap2019-06-239-169/+181
| * More replay stuffNikolay Korolev2019-06-2536-51/+719
| * CReplay::StorePedAnimationNikolay Korolev2019-06-232-24/+68
| * Merge remote-tracking branch 'upstream/master'Nikolay Korolev2019-06-236-22/+20
| |\ | |/ |/|
* | fixed key binding, head shots, freezesaap2019-06-236-22/+20
| * StorePedUpdateNikolay Korolev2019-06-233-4/+71
|/
* Fixed little bug in Radar.cpp._AG2019-06-221-3/+3
* Merge pull request #29 from erorcun/erorcunaap2019-06-225-29/+361
|\
| * Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-06-221-0/+1
| |\
| * \ Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcuneray orçunus2019-06-229-111/+676
| |\ \
| * | | Shotgun fix, CPed, CWeaponInfoeray orçunus2019-06-225-29/+361
* | | | Merge pull request #30 from gennariarmando/masteraap2019-06-225-24/+142
|\ \ \ \
| * | | | More CRadar stuff._AG2019-06-225-24/+142
| | |_|/ | |/| |
* | | | Merge pull request #32 from Nick007J/masteraap2019-06-2213-8/+531
|\ \ \ \ | |/ / / |/| | |
| * | | attempt to fix build errorNikolay Korolev2019-06-222-11/+3
| * | | fixed tabNikolay Korolev2019-06-221-3/+3
| * | | fixed typesNikolay Korolev2019-06-221-22/+22
| * | | fixNikolay Korolev2019-06-221-2/+2
| * | | tabifyNikolay Korolev2019-06-225-117/+117
| * | | Fixed types in BulletTrace.hNikolay Korolev2019-06-221-3/+3
| * | | Fixed types in Pickup.hNikolay Korolev2019-06-221-4/+4
| * | | Added newlines at end of fileNikolay Korolev2019-06-225-5/+5
| * | | Delete .gitignoreКоролев Николай Николаевич2019-06-221-8/+0
| * | | First commit of replay systemNikolay Korolev2019-06-2214-8/+542
| * | | First commit of replay systemNikolay Korolev2019-06-221-0/+5
* | | | blaaap2019-06-221-0/+1
| |_|/ |/| |
* | | Merge pull request #28 from gennariarmando/masteraap2019-06-214-96/+193
|\ \ \
| * | | Clean up_AG2019-06-212-14/+20
| * | | Update Radar.cpp_AG2019-06-204-92/+183
* | | | more CStreaming; fixed CFileLoaderaap2019-06-214-9/+465
* | | | Merge pull request #26 from erorcun/erayaap2019-06-2112-26/+637
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix throwable weaponseray orçunus2019-06-201-2/+3
| * | | Merge branch 'master' of git://github.com/GTAmodding/re3 into erayeray orçunus2019-06-2011-57/+466
| |\ \ \ | | | |/ | | |/|
| * | | Big CPed updateeray orçunus2019-06-2012-26/+636
* | | | added some World definesaap2019-06-211-6/+18
| |/ / |/| |
* | | Merge pull request #27 from gennariarmando/masteraap2019-06-205-39/+78
|\ \ \ | | |/ | |/|
| * | Code clean up._AG2019-06-205-39/+78
|/ /
* / started CStreamingaap2019-06-206-18/+388
|/
* Merge pull request #25 from gennariarmando/masteraap2019-06-2016-260/+839
|\
| * Fix bug in templates.h, again._AG2019-06-201-2/+2
| * Update Radar.cpp_AG2019-06-204-16/+87
| * Update CRadar.cpp, CHud.cpp, CDraw.cpp fixed bug in templates.h._AG2019-06-2016-258/+766
|/
* finally finished CVehicleModelInfoaap2019-06-205-9/+46
|\
| * implemented cHandlingDataMgraap2019-06-198-5/+457
* | typo in visibility pluginsaap2019-06-201-1/+1
* | implemented cHandlingDataMgraap2019-06-208-5/+457
|/
* implemented CObjectDataaap2019-06-1910-23/+153
* implemented CPedStatsaap2019-06-194-11/+190
* finished CPedTypeaap2019-06-194-22/+232
* some CPed flags named from SAaap2019-06-192-11/+11
* cleanup on CPed and CPedTypeaap2019-06-196-121/+151
* Merge pull request #22 from erorcun/masteraap2019-06-196-24/+166
|\
| * CPed merge fixeseray orçunus2019-06-186-108/+96
| * Merge branch 'master' of git://github.com/GTAmodding/re3eray orçunus2019-06-1861-58/+2147
| |\ | |/ |/|
* | silly mistake in CFileLoaderaap2019-06-181-2/+2
* | finished CFileLoader, except a crash!aap2019-06-1817-13/+345
* | fixed anim bugaap2019-06-172-2/+2
* | forgot main.haap2019-06-171-0/+14
* | Merge pull request #24 from gennariarmando/masteraap2019-06-171-1/+1
|\ \
| * \ Merge branch 'master' of https://github.com/gennariarmando/re3_AG2019-06-177-7/+613
| |\ \
| | * \ Merge pull request #1 from GTAmodding/master_AG2019-06-177-7/+613
| | |\ \
| * | | | Fixed health icon._AG2019-06-171-1/+1
| |/ / /
* | | | Merge branch 'master' of github.com:GTAmodding/re3aap2019-06-177-7/+613
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #23 from Fire-Head/masteraap2019-06-177-7/+613
| |\ \ \
| | * | | CdStream RwFreeAlign/RwMallocAlignFire-Head2019-06-177-7/+613
| | * | | Merge pull request #8 from GTAmodding/masterFire_Head2019-06-1780-714/+3839
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Merge pull request #7 from GTAmodding/masterFire_Head2019-06-137-6/+369
| | |\ \ \
* | | | | | first part of CFileLoaderaap2019-06-1741-45/+1182
|/ / / / /
| | | | * CPed fixeseray orçunus2019-06-184-33/+31
| | | | * CPed::Avoid and needed changeseray orçunus2019-06-174-6/+162
| |_|_|/ |/| | |
* | | | Merge pull request #20 from gennariarmando/masteraap2019-06-1717-191/+292
|\ \ \ \ | | |_|/ | |/| |
| * | | Update HUD stuff, bug and format fixes._AG2019-06-1717-191/+292
|/ / /
* | | fixed rebind bugFire_Head2019-06-171-1/+1
* | | got rid of upper case typesaap2019-06-1749-708/+701
* | | updated guidelinesaap2019-06-161-4/+37
* | | some more cleanupaap2019-06-165-56/+44
* | | Merge pull request #16 from erorcun/masteraap2019-06-169-17/+371
|\ \ \
| * | | Delete duplicate enumeray orçunus2019-06-163-183/+9
| * | | Merge branch 'master' of git://github.com/GTAmodding/re3eray orçunus2019-06-1637-91/+2629
| |\ \ \ | |/ / / |/| | |
* | | | fix the cleanup...aap2019-06-162-39/+41
* | | | some cleanupaap2019-06-165-167/+167
* | | | Merge pull request #17 from gennariarmando/masteraap2019-06-1635-55/+2619
|\ \ \ \
| * | | | Changes for the pull request._AG2019-06-161-3/+3
| * | | | Updates Draw.cpp, MusicManager.cpp._AG2019-06-1611-21/+561
| * | | | New updates for Hud.cpp and more._AG2019-06-1528-37/+2061
* | | | | Merge branch 'master' of github.com:GTAmodding/re3aap2019-06-152-3/+3
|\| | | |
| * | | | Merge pull request #15 from ShFil119/patch-1aap2019-06-131-1/+1
| |\ \ \ \
| | * | | | Fix value of CReplay modeFilip Gawin2019-06-131-1/+1
| |/ / / /
* | | | | silly mistake in txd storeaap2019-06-152-2/+7
| | * | | CPed fixes and needed functions for further commitseray orçunus2019-06-166-69/+330
| | * | | More CPed functions and minor fixeseray orçunus2019-06-154-11/+201
| | * | | Fix duplicate code for PedNodeeray orçunus2019-06-142-19/+2
| | * | | Some CPed functionserorcun2019-06-144-4/+131
| |/ / /
| * | | Merge pull request #14 from ShFil119/patch-1aap2019-06-131-2/+2
|/| | |
| * | | Fix typo in link to appveyor's accountFilip Gawin2019-06-131-2/+2
|/ / /
* | | Merge pull request #13 from ShFil119/CIdebugaap2019-06-133-10/+16
|\ \ \
| * | | CI add debug modeFilip Gawin2019-06-133-10/+16
| | |/ | |/|
* / | finished some classesaap2019-06-137-6/+85
|/ /
* | implemented GTA stream read functionsaap2019-06-137-6/+369
* | Merge pull request #12 from Fire-Head/masteraap2019-06-1326-137/+2230
|\|
| * Update Pad.cppFire_Head2019-06-131-4/+4
| * Update CutsceneMgr.hFire_Head2019-06-131-2/+0
| * Merge branch 'master' into masterFire_Head2019-06-1338-55/+534
| |\ | |/ |/|
* | silly mistakeaap2019-06-131-1/+1
* | fixed CFileMgr somewhat; still issues when loading savesaap2019-06-137-21/+22
* | implemented CutsceneObject; little fixesaap2019-06-1212-12/+137
* | implemented CCutsceneHead and dependenciesaap2019-06-1221-20/+374
| * Update Replay.hFire_Head2019-06-131-0/+1
| * Merge branch 'master' of github.com:Fire-Head/re3Fire-Head2019-06-1317-59/+405
| |\
| | * Merge pull request #6 from GTAmodding/masterFire_Head2019-06-1217-59/+407
| | |\ | |_|/ |/| |
* | | Merge branch 'master' into masterFire_Head2019-06-123-3/+245
|\ \ \ | | |/ | |/|
* | | implemented CTimeCycleaap2019-06-129-5/+248
* | | added NodeName pluginaap2019-06-123-4/+65
* | | little cleanupaap2019-06-125-50/+60
* | | updated READMEaap2019-06-121-0/+32
| | * CPad doneFire-Head2019-06-1327-135/+2232
| |/
| * CameraCreate cosmetic fixFire-Head2019-06-121-30/+30
| * CameraCreate/CameraDestroy/CameraSize doneFire-Head2019-06-123-3/+243
| * Merge pull request #5 from GTAmodding/masterFire_Head2019-06-122-8/+18
| |\ | |/ |/|
* | fixed debugmenuaap2019-06-122-8/+18
* | Merge pull request #11 from Fire-Head/masteraap2019-06-123-175/+175
|\|
| * Merge pull request #4 from GTAmodding/masterFire_Head2019-06-1213-25/+258
| |\ | |/ |/|
* | Merge pull request #9 from ShFil119/COnscreenTimeraap2019-06-1211-23/+255
|\ \
| * | Add NUMONSCREENTIMERENTRIES in config.hFilip Gawin2019-06-123-18/+19
| * | RE more stuff from COnscreenTimerFilip Gawin2019-06-128-11/+232
| * | Add GetTranslatedName to CZoneFilip Gawin2019-06-112-2/+12
* | | animation fixesaap2019-06-122-2/+3
| | * Merge pull request #3 from GTAmodding/masterFire_Head2019-06-1225-2/+3162
| | |\ | |_|/ |/| |
* | | added animation system (with skin support for now)aap2019-06-1123-2/+3075
* | | Merge branch 'master' of github.com:GTAmodding/re3aap2019-06-1110-111/+1147
|\ \ \
| * \ \ Merge pull request #8 from Fire-Head/masteraap2019-06-116-35/+872
| |\ \ \ | | |/ / | |/| |
| * | | Merge pull request #7 from Fire-Head/masterFire_Head2019-06-035-76/+275
| |\ \ \
* | | | | added CDirectoryaap2019-06-032-0/+87
|/ / / /
| | | * tmpFire-Head2019-06-113-175/+175
| | |/
| | * premake: disabled SAFESEHFire-Head2019-06-061-0/+1
| | * VK_LEFT fixFire-Head2019-06-051-0/+1
| | * win.cpp/skeleton.cpp doneFire-Head2019-06-051-34/+34
| | * input done, fixed cheats inputFire-Head2019-06-055-31/+866
| |/
| * added NO_MOVIESFire-Head2019-06-035-31/+45
| * Merge pull request #2 from GTAmodding/masterFire_Head2019-06-0224-18/+250
| |\ | |/ |/|
* | added CPhysical flags from Nickaap2019-06-022-8/+8
* | added some small bits and stubsaap2019-06-0222-10/+242
* | Merge pull request #6 from Fire-Head/masteraap2019-06-021-3/+5
|\ \
| | * gamestates fixed, mpeg now workingFire-Head2019-06-023-46/+231
| |/
| * mouse fixedFire-Head2019-06-021-3/+5
| * Merge pull request #1 from GTAmodding/masterFire_Head2019-06-022-3/+4
| |\ | |/ |/|
* | fixed mergeaap2019-06-022-3/+4
* | Merge pull request #5 from Fire-Head/masteraap2019-06-02237-452/+258828
|\|
| * Merge branch 'master' into masterFire_Head2019-06-0224-46/+1505
| |\ | |/ |/|
* | implemented splashes; fixed zonesaap2019-06-0114-91/+241
* | added CPointLightsaap2019-06-015-3/+366
* | more RW lightsaap2019-06-013-2/+174
* | added CCoronasaap2019-06-0111-4/+782
* | Merge pull request #4 from Fire-Head/masteraap2019-05-3119-333/+2423
|\ \
| | * skeleton updated, windows specific stuff addedFire-Head2019-06-02237-452/+258832
| |/
| * rw skeletonFire-Head2019-05-3119-333/+2423
|/
* more high level functionsaap2019-05-3128-24/+415
* CCredits name cleanupaap2019-05-312-391/+391
* Merge branch 'master' of github.com:GTAmodding/re3aap2019-05-319-15/+39
|\
| * Merge pull request #3 from Fire-Head/masteraap2019-05-309-15/+39
| |\
| | * fixed CParticle crash && RandTableFire-Head2019-05-309-15/+39
| |/
* / added CCreditsaap2019-05-314-0/+529
|/
* added CTextaap2019-05-306-1/+260
* implemented some higher level functions; added lots of stubs; switched top and bottom in CRectaap2019-05-3065-157/+779
* fixed ped statesaap2019-05-301-3/+6
* added CMBluraap2019-05-309-7/+301
* added CAntennasaap2019-05-304-0/+167
* clean upaap2019-05-3020-301/+114
* Merge pull request #2 from Fire-Head/masteraap2019-05-2924-125/+3152
|\
| * fix2Fire-Head2019-05-291-2/+2
| * fixFire-Head2019-05-292-3/+3
| * Updates, CTimer startedFire-Head2019-05-2916-35/+336
| * Particle, ParticleMgr doneFire-Head2019-05-2914-121/+2847
* | implemented some of CCam and dependenciesaap2019-05-2913-42/+1367
|/
* more CVehicleModelInfoaap2019-05-284-2/+237
* implemented bits of CWorldaap2019-05-2815-44/+915
* implemented CFileMgr (barf)aap2019-05-244-1/+330
* updated READMEaap2019-05-221-0/+6
* Merge branch 'master' of github.com:GTAmodding/re3aap2019-05-222-1/+22
|\
| * Merge pull request #1 from ShFil119/appveyoraap2019-05-202-1/+22
| |\
| | * Store artifactsFilip Gawin2019-05-191-0/+2
| | * AppVeyorFilip Gawin2019-05-192-1/+20
| |/
* | added CFontaap2019-05-226-19/+656
* | finished CSprite(2d)aap2019-05-215-192/+730
|/
* CPhysical almost doneaap2019-05-1912-60/+804
* more work on CPhysicalaap2019-05-18106-103/+57865
* fixed pathfindaap2019-05-171-14/+17
* reversed CPhysical::ProcessShiftSectorListaap2019-05-1710-7/+235
* renames and a fixaap2019-05-153-98/+97
* first commitaap2019-05-15116-0/+15132