summaryrefslogtreecommitdiffstats
path: root/src (unfollow)
Commit message (Expand)AuthorFilesLines
2019-08-10More CCarCtrlNikolay Korolev3-2/+84
2019-08-09finished CPathFindaap10-134/+1057
2019-08-08Pedseray orçunus4-9/+541
2019-08-06Minor fixesNikolay Korolev1-19/+21
2019-08-06CCarCtrl::GenerateOneRandomVehicle!Nikolay Korolev16-8/+599
2019-08-05fixed COMMAND_ADD_BLIP_FOR_COORD_OLDNikolay Korolev1-0/+1
2019-08-05CPed part 218eray orçunus3-68/+656
2019-08-04implemented CHeliaap15-52/+1187
2019-08-03fixed collisionNikolay Korolev1-1/+1
2019-08-03A fix and a function made me notice iteray orçunus2-1/+36
2019-08-03fixed heading calculationNikolay Korolev1-8/+4
2019-08-03RunningScript, part 4, plus some fixesNikolay Korolev14-28/+534
2019-08-02fixFire-Head1-18/+4
2019-08-02sampman doneFire-Head13-406/+2876
2019-08-02some CPed cleanupaap2-102/+73
2019-08-02The Pedseray orçunus10-28/+547
2019-07-31implemented CPlaneaap9-40/+1048
2019-07-29restore original shadows fadingFire-Head1-17/+3
2019-07-29Peds and fixeseray orçunus4-25/+252
2019-07-28Address fixeray orçunus1-1/+1
2019-07-28Peds, mainly audioeray orçunus3-27/+359
2019-07-28ped chat fixNikolay Korolev1-1/+1
2019-07-28fixed phonesNikolay Korolev2-2/+4
2019-07-28CAutomobile::PreRender; whole class finishedaap18-38/+764
2019-07-28fix debug messageNikolay Korolev1-1/+0
2019-07-28fixed wantedNikolay Korolev1-0/+3
2019-07-28fixed cargen loadNikolay Korolev1-2/+2
2019-07-27cargen + some scriptNikolay Korolev13-6/+667
2019-07-27fixed intro skipNikolay Korolev1-2/+2
2019-07-27renamed flag to R* nameaap3-9/+9
2019-07-27CAutomobile::Render; moved some math code into .cppaap4-123/+379
2019-07-26fixed CAutomobile bugaap2-6/+6
2019-07-26CAutomobile effect stuffaap9-40/+222
2019-07-26fixed bridgeNikolay Korolev1-1/+1
2019-07-26fixed wantedNikolay Korolev1-5/+5
2019-07-26CAutomobile::FireTruckControl and HydraulicControlaap12-20/+373
2019-07-26fight fixNikolay Korolev1-2/+2
2019-07-26fixed remoteNikolay Korolev3-3/+3
2019-07-25Ped & fixes, including peds dive into danger fixeray orçunus10-137/+876
2019-07-25Running script part 3Nikolay Korolev19-21/+758
2019-07-25implemented CAutomobile::TankControlaap6-10/+125
2019-07-25fixed dinputaap3-33/+44
2019-07-24fixed buoyancy; implemented CAutomobile::ProcessBuoyancyaap6-23/+146
2019-07-24updateFire-Head7-41/+20
2019-07-24shadows doneFire-Head20-60/+2412
2019-07-23implemented cBuoyancyaap5-2/+243
2019-07-23bit more CAutomobileaap9-18/+219
2019-07-21Try to fix rpg bugFilip Gawin1-3/+1
2019-07-21Fix setting sampleIndexFilip Gawin1-2/+2
2019-07-20CPed continues, including some fixeseray orçunus6-28/+507
2019-07-20fix door issueNikolay Korolev1-1/+1
2019-07-20added CPool<cAudioScriptObject, cAudioScriptObject>Nikolay Korolev4-1/+17
2019-07-20fixed script issuesNikolay Korolev2-9/+11
2019-07-20fixed replayNikolay Korolev2-26/+26
2019-07-20premake and appveyor updateThirteenAG1-4/+4
2019-07-20one more fixaap1-1/+1
2019-07-20couple of fixesaap9-24/+22
2019-07-20fix crashNikolay Korolev1-0/+2
2019-07-19fixes for #142Filip Gawin4-5/+5
2019-07-19fixed references leakNikolay Korolev1-1/+1
2019-07-19More audio scriptFilip Gawin3-46/+549
2019-07-19more audio processFilip Gawin6-105/+1137
2019-07-19ProcessActiveQueuesFilip Gawin4-121/+510
2019-07-19ComputeDopplerEffectedFrequencyFilip Gawin13-279/+1383
2019-07-19fixed dodo bugaap1-1/+3
2019-07-19implemented col line renderingaap14-22/+354
2019-07-19CAutomobile ctor, car spawner, fixesaap10-50/+232
2019-07-19*cough*aap1-1/+1
2019-07-19fixed eventlist bugaap1-1/+1
2019-07-18CAutomobile damageaap6-23/+323
2019-07-18CAutomobile::ProcessControl doneaap12-11/+239
2019-07-18Wanted changes in PlayerPed/PedModelInfoeray orçunus4-28/+26
2019-07-18fixed car AI bugNikolay Korolev1-0/+1
2019-07-18The Peds, mainly dying/injuringeray orçunus11-201/+852
2019-07-17more CAutomobile::ProcessControlaap17-37/+605
2019-07-17Fixed Bridgeguard31-24/+25
2019-07-17Fluffguard36-8/+917
2019-07-17dodo crash fixNikolay Korolev1-0/+1
2019-07-17renamed some variables and added files; more CAutomobile::ProcessControlaap20-45/+213
2019-07-17fix fixNikolay Korolev1-1/+1
2019-07-17script fix, bomb fix, flying components fixNikolay Korolev5-4/+8
2019-07-16more fixes; started CAutomobile::ProcessControlaap9-79/+350
2019-07-16fixed mergeaap1-2/+1
2019-07-15fixNikolay Korolev1-1/+2
2019-07-15Phone, World, Pederay orçunus16-82/+676
2019-07-15testNikolay Korolev2-5/+5
2019-07-15fixNikolay Korolev1-2/+1
2019-07-14fixed arithmeticsNikolay Korolev1-16/+64
2019-07-14fixed copsNikolay Korolev5-2/+8
2019-07-14RunningScript 2. So far with bugs (cops not caring, errors in arithmetical opcodes)Nikolay Korolev11-16/+337
2019-07-14started making frontend accurate to gameaap6-431/+411
2019-07-14Partial RunningScript part2Nikolay Korolev16-6/+584
2019-07-13fixed policeDontCareNikolay Korolev1-0/+2
2019-07-12little change to aspect ratio definesaap1-1/+4
2019-07-12more CWanted; added CEventListaap13-90/+667
2019-07-11Frontend fixes._AG3-229/+234
2019-07-11CAutomobile::ProcessControlInputsaap7-8/+154
2019-07-11fixfixfixFire-Head2-68/+0
2019-07-11waterupdFire-Head2-1/+1
2019-07-11water fixFire-Head1-28/+28
2019-07-11WaterLevel doneFire-Head8-12/+1464
2019-07-11WaterLevel doneFire-Head8-12/+1459
2019-07-10tried to fix CMenuManager::Process but still issuesaap1-56/+60
2019-07-10Fix CPhone crash, more functionseray orçunus2-4/+112
2019-07-10and of course the last commit didnt fix everythingaap19-36/+40
2019-07-10added wrappers around math functionsaap31-191/+204
2019-07-10Phone start, ped spinning and cop car fix, and some love to CPederay orçunus7-9/+191
2019-07-10fixed COMMAND_IS_PLAYER_IN_AREA_3Daap1-2/+2
2019-07-10fixed some stuff in frontend, badly broke others; disabled reversed frontend for the momentaap6-203/+323
2019-07-10CVehicle::ProcessWheelaap3-48/+158
2019-07-10More frontend inputs._AG9-92/+305
2019-07-09more CVehicleaap10-30/+278
2019-07-09fixNikolay Korolev1-0/+1
2019-07-09RunningScript: 1/12Nikolay Korolev7-4/+715
2019-07-09yet more CAutomobileaap17-23/+201
2019-07-09more CAutomobileaap17-36/+395
2019-07-08One driver owns all the cars fixeray orçunus1-0/+1
2019-07-08more CAutomobileaap18-34/+475
2019-07-08little changes; one more function of CAutomobileaap9-103/+138
2019-07-08cleaned up patching of virtual functions; started CAutomobileaap64-279/+772
2019-07-07Added script commandsNikolay Korolev2-0/+1159
2019-07-07More scriptNikolay Korolev3-7/+93
2019-07-07Darkel is bored._AG1-1/+2
2019-07-07More scriptsNikolay Korolev3-26/+114
2019-07-07implemented CDooraap6-19/+177
2019-07-07IntoTheScripts!Nikolay Korolev5-55/+466
2019-07-07Fix reverse warn and air brakesFilip Gawin2-11/+165
2019-07-07cAudioManager::InitialiseFilip Gawin6-6/+167
2019-07-07cleanup AudioManagerFilip Gawin1-7/+3
2019-07-07blah_AG2-3/+3
2019-07-07the great reorganizationaap149-22/+21
2019-07-07finished CPhysicalaap3-11/+55
2019-07-07made code use TimeStepIn(Milli)Seconds; purged unnecessary inlinesaap11-112/+114
2019-07-07Lil update._AG3-97/+115
2019-07-07General fixeseray orçunus4-27/+19
2019-07-06some work on vehiclesaap9-227/+243
2019-07-06Added CUpsideDownCarCheck and CStuckCarCheckNikolay Korolev4-8/+163
2019-07-06misc classes finishedaap13-4/+374
2019-07-06CBridgeguard36-7/+185
2019-07-06CPed...eray orçunus6-63/+540
2019-07-05finished CDamageManageraap4-102/+383
2019-07-05implemented some CVehicle functionsaap9-59/+502
2019-07-04fixed rand (thanks nick)aap3-7/+3
2019-07-04Darkel/Wanted update._AG16-24/+531
2019-07-04More AudioManagerFilip Gawin5-972/+1080
2019-07-04Little fixeseray orçunus1-3/+3
2019-07-04Even more CPederay orçunus10-57/+705
2019-07-04RandomDisplacementFilip Gawin2-0/+21
2019-07-04RequireDigitalHandleFilip Gawin4-5/+30
2019-07-04ReleaseDigitalHandleFilip Gawin4-45/+65
2019-07-04PlayerJustGotInCarFilip Gawin2-2/+12
2019-07-04CreateEntityFilip Gawin2-7/+33
2019-07-04Introduce totalAudioEntitiesFilip Gawin1-4/+8
2019-07-04SetEntityStatusFilip Gawin2-0/+10
2019-07-04PreTerminateGameSpecificShutdownFilip Gawin2-0/+35
2019-07-04DestroyEntityFilip Gawin2-0/+20
2019-07-04PostTerminateGameSpecificShutdownFilip Gawin2-2/+10
2019-07-04SetDynamicAcousticModelingStatusFilip Gawin2-3/+9
2019-07-04IsAudioInitialisedFilip Gawin2-0/+9
2019-07-04GenerateIntegerRandomNumberTableFilip Gawin2-0/+9
2019-07-04Fixed type of m_ItemToFlashNikolay Korolev2-2/+2
2019-07-04Script stuff + bug fixesNikolay Korolev16-15/+288
2019-07-03Update Frontend._AG24-194/+1444
2019-07-03fixed boat renderingaap1-9/+12
2019-07-03fixed car colour texture bugaap1-0/+1
2019-07-03cleaned up to be closer to original gameaap10-134/+172
2019-07-02Revert "Implemented frontend inputs."aap24-1488/+126
2019-07-02Fix address of IsPedHeadAbovePosFilip Gawin1-1/+1
2019-07-02Check if address is used twiceFilip Gawin2-17/+33
2019-07-02Removed macros from Pad.cpp:_AG2-35/+136
2019-07-02Implemented frontend inputs._AG25-125/+1386
2019-07-02Kangaroo cheat and bug fixeseray orçunus8-37/+70
2019-07-01CPed fixeseray orçunus3-55/+39
2019-07-01More CPederay orçunus13-62/+608
2019-06-30Completed CReplayNikolay Korolev4-1/+63
2019-06-30little cleanupaap8-35/+27
2019-06-30Changed CReplay::Display slightlyNikolay Korolev1-8/+13
2019-06-30Added camera funcs to ReplayNikolay Korolev2-11/+239
2019-06-30finished CEntityaap27-76/+665
2019-06-30Implement GetSpecialCharacterTalkSfxFilip Gawin3-9/+213
2019-06-30More replay functions, also removed pool iteration errorNikolay Korolev5-15/+112
2019-06-30Reactivated Store(Restore)StuffIn(From)Mem, fixed bugsNikolay Korolev7-38/+42
2019-06-30PlayBackThisFrameInterpolation and all it required...Nikolay Korolev58-11/+662
2019-06-30Cleanup project a bitFilip Gawin34-314/+318
2019-06-29ProcessCarUpdateNikolay Korolev6-37/+146
2019-06-29CReplay::PlaybackThisFrame + fixesNikolay Korolev3-7/+38
2019-06-29fixaap1-1/+1
2019-06-29fix hud render states; bug in coronasaap4-717/+709
2019-06-29fixNikolay Korolev1-1/+1
2019-06-29fixNikolay Korolev1-2/+0
2019-06-29Fixed mergeNikolay Korolev1-1/+0
2019-06-29more replay stuff, bug fixNikolay Korolev3-13/+63
2019-06-29RetrievePedAnimationNikolay Korolev1-0/+41
2019-06-29Implement the rest of GetXTalkSfxFilip Gawin2-265/+2238
2019-06-29Implement some GetXTalkSfx methodsFilip Gawin5-223/+612
2019-06-29fixes for AudioManager::GetPhraseFilip Gawin3-15/+267
2019-06-29AudioManager::GetPhraseFilip Gawin3-3/+3268
2019-06-29ProcessPedUpdateNikolay Korolev7-6/+73
2019-06-29fixaap1-1/+1
2019-06-29missed two lines in CCollisionaap1-0/+4
2019-06-29miscellaneous, mostly world relatedaap20-69/+244
2019-06-29Changed to actual crimes namesNikolay Korolev1-12/+12
2019-06-28forgot the actual file...aap1-0/+212
2019-06-28PS2-like MatFX from skygfxaap2-0/+4
2019-06-28island load screen, some more CTextaap4-8/+72
2019-06-28fixed CFileMgr, the craziest bug i ever hadaap4-8/+5
2019-06-28misc stuff, mostly collisionaap16-45/+388
2019-06-28Footstepseray orçunus7-23/+166
2019-06-28Little ops._AG1-2/+2
2019-06-28Some Hud.cpp fixes._AG1-38/+23
2019-06-28CHud cleanup: fixes and cosmetic treatmentaap4-216/+233
2019-06-28CStreaming DONEaap11-34/+334
2019-06-27Changed save/load in CGangNikolay Korolev2-24/+35
2019-06-27CStreaming almost doneaap10-66/+421
2019-06-27Several little mistakes in CPederay orçunus2-13/+11
2019-06-27started filling debug menuaap10-12/+187
2019-06-27Finished Hud.cpp_AG2-72/+164
2019-06-27Reverted Pad.cpp to previous state._AG1-10/+14
2019-06-27Fix 3 bugseray orçunus3-6/+6
2019-06-27fixed newlineNikolay Korolev1-1/+1
2019-06-27Added GangsNikolay Korolev2-0/+133
2019-06-27yet more CStreamingaap4-27/+234
2019-06-26Update Wanted.cpp_AG4-78/+124
2019-06-26fixed autobuildNikolay Korolev1-1/+1
2019-06-26Fixed merge errorsNikolay Korolev4-4/+4
2019-06-26blaaap1-1/+1
2019-06-26some more CStreaming + fixes by erorcunaap4-16/+61
2019-06-26CStreaming streamsaap2-112/+309
2019-06-26fixed bug in CPedaap1-3/+3
2019-06-26CPed cleanupaap1-18/+14
2019-06-26fixed PedTypeaap1-2/+2
2019-06-25Little fix #52._AG3-26/+27
2019-06-25Better organization for Frontend.cpp_AG8-668/+772
2019-06-25Fix car animations & M16 bugeray orçunus1-50/+50
2019-06-25Frontend clean upaap2-76/+185
2019-06-25Initial commit for Frontend._AG19-498/+2436
2019-06-25More replay stuffNikolay Korolev36-51/+719
2019-06-24CPed, CVehicle, mostly entering/exiting careray orçunus14-40/+789
2019-06-24replaced some ctors; made PreRender call game functionaap5-5/+11
2019-06-24fixed bug in CPlaceableaap1-40/+31
2019-06-24more CStreamingaap3-51/+747
2019-06-23more Radar codeaap4-40/+352
2019-06-23some Radar and Hud cleanup; fix in Physicalaap9-169/+181
2019-06-23CReplay::StorePedAnimationNikolay Korolev2-24/+68
2019-06-23fixed key binding, head shots, freezesaap6-22/+20
2019-06-23StorePedUpdateNikolay Korolev3-4/+71
2019-06-22Fixed little bug in Radar.cpp._AG1-3/+3
2019-06-22attempt to fix build errorNikolay Korolev2-11/+3
2019-06-22fixed tabNikolay Korolev1-3/+3
2019-06-22fixed typesNikolay Korolev1-22/+22
2019-06-22fixNikolay Korolev1-2/+2
2019-06-22tabifyNikolay Korolev5-117/+117
2019-06-22Fixed types in BulletTrace.hNikolay Korolev1-3/+3
2019-06-22Fixed types in Pickup.hNikolay Korolev1-4/+4
2019-06-22Added newlines at end of fileNikolay Korolev5-5/+5
2019-06-22First commit of replay systemNikolay Korolev13-8/+539
2019-06-22More CRadar stuff._AG5-24/+142
2019-06-22blaaap1-0/+1
2019-06-22Shotgun fix, CPed, CWeaponInfoeray orçunus5-29/+361
2019-06-21more CStreaming; fixed CFileLoaderaap4-9/+465
2019-06-21Clean up_AG2-14/+20
2019-06-21added some World definesaap1-6/+18
2019-06-20Fix throwable weaponseray orçunus1-2/+3
2019-06-20Update Radar.cpp_AG4-92/+183
2019-06-20Big CPed updateeray orçunus12-26/+636
2019-06-20Code clean up._AG5-39/+78
2019-06-20started CStreamingaap6-18/+388
2019-06-20Fix bug in templates.h, again._AG1-2/+2
2019-06-20Update Radar.cpp_AG4-16/+87
2019-06-20Update CRadar.cpp, CHud.cpp, CDraw.cpp fixed bug in templates.h._AG16-258/+766
2019-06-20typo in visibility pluginsaap1-1/+1
2019-06-20implemented cHandlingDataMgraap8-5/+457
2019-06-19implemented cHandlingDataMgraap8-5/+457
2019-06-19implemented CObjectDataaap10-23/+153
2019-06-19implemented CPedStatsaap4-11/+190
2019-06-19finished CPedTypeaap4-22/+232
2019-06-19some CPed flags named from SAaap2-11/+11
2019-06-19cleanup on CPed and CPedTypeaap6-121/+151
2019-06-18CPed merge fixeseray orçunus6-108/+96
2019-06-18CPed fixeseray orçunus4-33/+31
2019-06-18silly mistake in CFileLoaderaap1-2/+2
2019-06-18finished CFileLoader, except a crash!aap17-13/+345
2019-06-17fixed anim bugaap2-2/+2
2019-06-17forgot main.haap1-0/+14
2019-06-17first part of CFileLoaderaap41-45/+1182
2019-06-17Fixed health icon._AG1-1/+1
2019-06-17CdStream RwFreeAlign/RwMallocAlignFire-Head7-7/+613
2019-06-17CPed::Avoid and needed changeseray orçunus4-6/+162
2019-06-17Update HUD stuff, bug and format fixes._AG15-184/+278
2019-06-17fixed rebind bugFire_Head1-1/+1
2019-06-17got rid of upper case typesaap48-706/+701
2019-06-16some more cleanupaap5-56/+44
2019-06-16Delete duplicate enumeray orçunus3-183/+9
2019-06-16fix the cleanup...aap2-39/+41
2019-06-16CPed fixes and needed functions for further commitseray orçunus6-69/+330
2019-06-16some cleanupaap5-167/+167
2019-06-16Changes for the pull request._AG1-3/+3
2019-06-16Updates Draw.cpp, MusicManager.cpp._AG11-21/+561
2019-06-15More CPed functions and minor fixeseray orçunus4-11/+201
2019-06-15silly mistake in txd storeaap2-2/+7
2019-06-15New updates for Hud.cpp and more._AG28-37/+2061
2019-06-14Fix duplicate code for PedNodeeray orçunus2-19/+2
2019-06-14Some CPed functionserorcun4-4/+131
2019-06-13Fix value of CReplay modeFilip Gawin1-1/+1
2019-06-13finished some classesaap7-6/+85
2019-06-13implemented GTA stream read functionsaap6-6/+365
2019-06-13Update Pad.cppFire_Head1-4/+4
2019-06-13Update CutsceneMgr.hFire_Head1-2/+0
2019-06-13Update Replay.hFire_Head1-0/+1
2019-06-13CPad doneFire-Head27-135/+2232
2019-06-13silly mistakeaap1-1/+1
2019-06-13fixed CFileMgr somewhat; still issues when loading savesaap7-21/+22
2019-06-12implemented CutsceneObject; little fixesaap12-12/+137
2019-06-12implemented CCutsceneHead and dependenciesaap21-20/+374
2019-06-12CameraCreate cosmetic fixFire-Head1-30/+30
2019-06-12CameraCreate/CameraDestroy/CameraSize doneFire-Head3-3/+243
2019-06-12implemented CTimeCycleaap9-5/+248
2019-06-12added NodeName pluginaap3-4/+65
2019-06-12little cleanupaap5-50/+60
2019-06-12fixed debugmenuaap2-8/+18
2019-06-12Add NUMONSCREENTIMERENTRIES in config.hFilip Gawin3-18/+19
2019-06-12animation fixesaap1-1/+2
2019-06-12RE more stuff from COnscreenTimerFilip Gawin8-11/+232
2019-06-11Add GetTranslatedName to CZoneFilip Gawin2-2/+12
2019-06-11tmpFire-Head3-175/+175
2019-06-11added animation system (with skin support for now)aap22-2/+3073
2019-06-05VK_LEFT fixFire-Head1-0/+1
2019-06-05win.cpp/skeleton.cpp doneFire-Head1-34/+34
2019-06-05input done, fixed cheats inputFire-Head5-31/+866
2019-06-03added CDirectoryaap2-0/+87
2019-06-03added NO_MOVIESFire-Head5-31/+45
2019-06-02gamestates fixed, mpeg now workingFire-Head3-46/+231
2019-06-02added CPhysical flags from Nickaap2-8/+8
2019-06-02added some small bits and stubsaap22-10/+242
2019-06-02mouse fixedFire-Head1-3/+5
2019-06-02fixed mergeaap2-3/+4
2019-06-02skeleton updated, windows specific stuff addedFire-Head23-452/+2845
2019-06-01implemented splashes; fixed zonesaap14-91/+241
2019-06-01added CPointLightsaap5-3/+366
2019-06-01more RW lightsaap3-2/+174
2019-06-01added CCoronasaap11-4/+782
2019-05-31rw skeletonFire-Head18-333/+2422
2019-05-31more high level functionsaap28-24/+415
2019-05-31CCredits name cleanupaap2-391/+391
2019-05-31added CCreditsaap4-0/+529
2019-05-30fixed CParticle crash && RandTableFire-Head6-11/+24
2019-05-30added CTextaap6-1/+260
2019-05-30implemented some higher level functions; added lots of stubs; switched top and bottom in CRectaap65-157/+779
2019-05-30fixed ped statesaap1-3/+6
2019-05-30added CMBluraap9-7/+301
2019-05-30added CAntennasaap4-0/+167
2019-05-30clean upaap17-301/+109
2019-05-29fix2Fire-Head1-2/+2
2019-05-29fixFire-Head2-3/+3
2019-05-29Updates, CTimer startedFire-Head16-35/+336
2019-05-29implemented some of CCam and dependenciesaap12-42/+1365
2019-05-29Particle, ParticleMgr doneFire-Head14-121/+2847
2019-05-28more CVehicleModelInfoaap4-2/+237
2019-05-28implemented bits of CWorldaap15-44/+915
2019-05-24implemented CFileMgr (barf)aap4-1/+330
2019-05-22added CFontaap6-19/+656
2019-05-21finished CSprite(2d)aap5-192/+730
2019-05-19CPhysical almost doneaap12-60/+804
2019-05-18more work on CPhysicalaap8-99/+397
2019-05-17fixed pathfindaap1-14/+17
2019-05-17reversed CPhysical::ProcessShiftSectorListaap10-7/+235
2019-05-15renames and a fixaap3-98/+97