summaryrefslogtreecommitdiffstats
path: root/src/skel (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into miamiSergeanur2020-07-131-0/+9
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/CarAI.cpp # src/control/Phones.cpp # src/control/Phones.h # src/control/Record.cpp # src/control/Restart.cpp # src/control/Script.cpp # src/core/Collision.cpp # src/core/Frontend.cpp # src/core/Frontend.h # src/core/Game.h # src/core/Streaming.cpp # src/core/TempColModels.cpp # src/core/Wanted.cpp # src/core/Zones.cpp # src/core/config.h # src/core/main.cpp # src/core/re3.cpp # src/entities/Entity.cpp # src/entities/Physical.cpp # src/extras/frontendoption.cpp # src/modelinfo/ModelInfo.cpp # src/modelinfo/PedModelInfo.cpp # src/peds/CivilianPed.cpp # src/peds/CopPed.cpp # src/peds/EmergencyPed.cpp # src/peds/Ped.cpp # src/peds/Ped.h # src/peds/Population.cpp # src/render/Renderer.cpp # src/save/GenericGameStorage.cpp # src/skel/win/win.cpp # src/vehicles/Automobile.cpp # src/vehicles/Boat.cpp # src/vehicles/Boat.h # src/vehicles/Vehicle.cpp
| * Remove console and fix stheray orçunus2020-07-042-1/+5
| |
| * Re-enable console for debugging frontenderay orçunus2020-07-032-2/+7
| |
* | Frontend: Stats, Briefs, gta_vc.set, slider ranges, fixeseray orçunus2020-07-062-4/+12
| |
* | Fix glfw.cppFilip Gawin2020-06-291-5/+5
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-06-292-19/+359
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/audio/AudioLogic.cpp # src/audio/soundlist.h # src/control/Script.cpp # src/control/ScriptCommands.h # src/core/Cam.cpp # src/core/Camera.cpp # src/core/Camera.h # src/core/Frontend.cpp # src/core/Frontend.h # src/core/Game.cpp # src/core/MenuScreens.cpp # src/core/Pad.cpp # src/core/Pad.h # src/core/config.h # src/entities/Entity.cpp # src/render/Credits.cpp # src/render/Fluff.cpp # src/render/Hud.cpp # src/render/MBlur.cpp # src/render/Timecycle.cpp # src/skel/glfw/glfw.cpp # src/skel/win/win.cpp # src/text/Text.cpp
| * update glfw.cppFire-Head2020-06-292-7/+201
| |
| * menu fixesFire-Head2020-06-291-1/+2
| |
| * Merge branch 'master' into ps2menuFire_Head2020-06-295-26/+26
| |\
| * | mips overdoseFire-Head2020-06-271-20/+165
| | |
* | | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-06-031-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/GameLogic.cpp # src/control/PathFind.cpp # src/control/RoadBlocks.cpp # src/control/Script.cpp # src/control/Script.h # src/core/Frontend.cpp # src/core/Frontend.h # src/core/MenuScreens.cpp # src/core/TempColModels.cpp # src/core/config.h # src/core/re3.cpp # src/modelinfo/SimpleModelInfo.cpp # src/modelinfo/VehicleModelInfo.cpp # src/modelinfo/VehicleModelInfo.h # src/render/Skidmarks.h # src/render/WaterLevel.cpp # src/save/GenericGameStorage.h # src/vehicles/Automobile.cpp # src/vehicles/Automobile.h # src/vehicles/DamageManager.cpp # src/vehicles/Vehicle.cpp # src/vehicles/Vehicle.h
| * | Frontend customization functions, freecam toggle, minor thingseray orçunus2020-05-281-1/+1
| | |
* | | Merge branch 'master' into miamiSergeanur2020-05-231-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # premake5.lua # src/control/Script.cpp # src/core/SurfaceTable.cpp # src/core/config.h # src/entities/Physical.cpp # src/entities/Physical.h # src/objects/Object.h # src/skel/skeleton.h # src/vehicles/Vehicle.h
| * | skeleton typosaap2020-05-235-25/+25
| |/
* | skeleton typosaap2020-05-235-21/+21
| |
* | Merge pull request #574 from Xinerki/miamierorcun2020-05-221-0/+10
|\ \ | | | | | | many additions
| * | focus loss improvementXinerki2020-05-211-2/+5
| | | | | | | | | | | | for u aap
| * | scuffed InitAfterFocusLoss implementationXinerki2020-05-211-0/+7
| | |
* | | VC CMenuManager struct, ctor etc.eray orçunus2020-05-222-27/+27
|/ /
* | remove some unneeded plane paths for the moment; also different exe iconaap2020-05-163-1/+1
| |
* | Merge branch 'master' into miamiSergeanur2020-05-141-1/+14
|\| | | | | | | | | # Conflicts: # src/modelinfo/ClumpModelInfo.cpp
| * blacklist for glfw "joysticks"aap2020-05-141-1/+14
| |
* | Merge branch 'master' into miamiSergeanur2020-05-121-1/+1
|\| | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/control/Garages.cpp # src/core/FileLoader.cpp # src/core/Streaming.cpp # src/core/Zones.cpp # src/core/Zones.h # src/render/Renderer.cpp # src/rw/VisibilityPlugins.cpp
| * Fix linux warningsFilip Gawin2020-05-121-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into miamiSergeanur2020-05-128-99/+334
|\| | | | | | | | | | | | | | | | | # Conflicts: # premake5.lua # src/core/ZoneCull.cpp # src/core/Zones.cpp # src/objects/CutsceneHead.cpp # src/render/Clouds.cpp
| * Fix Windows build and premakeeray orçunus2020-05-114-11/+16
| |
| * Linux build supporteray orçunus2020-05-117-91/+321
| |
| * Menu map fixes and resizable window on GLFWeray orçunus2020-05-091-3/+5
| |
| * reverting fuckupaap2020-05-061-0/+2
| |
| * updated librwaap2020-05-061-2/+0
| |
* | Menu map fixes and resizable window on GLFWeray orçunus2020-05-091-3/+5
| |
* | most of animation system done; little stuff here and thereaap2020-05-082-0/+8
| |
* | VC vehicles just barely working nowaap2020-05-071-2/+0
|/
* Screen mode selector and persistent map target fixeray orçunus2020-05-012-55/+68
|
* improved video modes for glfwaap2020-04-301-40/+146
|
* implemented improved video modes for win.cppaap2020-04-291-5/+108
|
* removed cpuid stuff from glfw as they caused a crash by clobbering registers. what to do about win.cpp?aap2020-04-281-79/+0
|
* Merge pull request #489 from Nick007J/masterNikolay Korolev2020-04-261-2/+7
|\ | | | | 1.1 patch stuff + flying controls
| * Merge remote-tracking branch 'upstream/master'Nikolay Korolev2020-04-251-0/+8
| |\
| * | more 1.1 patchNikolay Korolev2020-04-241-2/+7
| | |
* | | fixes for glfwaap2020-04-261-15/+16
| | |
* | | Remove struct workaround in CControllerConfigManagerSergeanur2020-04-261-1/+0
| | |
* | | Initial GLFW supporteray orçunus2020-04-266-48/+1723
| |/ |/|
* | implemented skinned peds, no cutscene hands yetaap2020-04-241-0/+8
|/
* Crossplatform work continueseray orçunus2020-04-225-8/+159
|
* Remove patchesSergeanur2020-04-173-96/+5
|
* rem refsFire-Head2020-04-174-22/+15
|
* Default native resolution mode and small camera fixesSergeanur2020-04-151-4/+25
|
* (PS2) TheGame/main/GameInit/SystemInit, ProcessSlowModeFire-Head2020-04-091-7/+7
|
* CShotInfo, CWanted done, Frontend fixeray orçunus2020-03-291-6/+0
|
* Limit frontend FPS to 100eray orçunus2020-03-281-1/+7
|
* WaterCannon done, resource icoFire-Head2020-03-282-1/+12
|
* Fixes for Serge's reviewFilip Gawin2020-03-221-2/+2
|
* cMusicManagerSergeanur2020-02-071-1/+1
|
* Implemented faststrcmp, faststricmp, strcasecmpSergeanur2019-10-301-0/+7
|
* Small CPad fixesSergeanur2019-10-291-6/+6
|
* Merge branch 'master' into masterFire_Head2019-10-273-35/+52
|\
| * ControllerConfig doneFire-Head2019-10-273-35/+52
| | | | | | | | Fix Cam enum
* | Audio stuff moved around, removed MusicManager dependencies, eMusicMode used for ChangeMusicModeSergeanur2019-10-262-2/+3
|/
* More more more audioFilip Gawin2019-08-271-1/+1
|
* AnimViewer!eray orçunus2019-08-154-11/+48
|
* Merge branch 'master' of github.com:Fire-Head/re3Fire-Head2019-08-021-30/+41
|\
| * fixed dinputaap2019-07-251-30/+41
| |
* | sampman doneFire-Head2019-08-021-0/+0
|/
* Merge pull request #153 from ThirteenAG/masteraap2019-07-201-4/+4
|\ | | | | premake and appveyor update
| * premake and appveyor updateThirteenAG2019-07-201-4/+4
| |
* | couple of fixesaap2019-07-201-1/+1
|/
* and of course the last commit didnt fix everythingaap2019-07-101-1/+1
|
* added wrappers around math functionsaap2019-07-101-5/+5
|
* Update Frontend._AG2019-07-031-0/+4
|
* cleaned up to be closer to original gameaap2019-07-032-29/+17
|
* Revert "Implemented frontend inputs."aap2019-07-022-12/+4
|
* Implemented frontend inputs._AG2019-07-022-4/+12
| | | | Fixed #66 and few other stuff.
* Cleanup project a bitFilip Gawin2019-06-302-101/+101
|
* misc stuff, mostly collisionaap2019-06-281-9/+2
|
* Initial commit for Frontend._AG2019-06-252-2/+6
| | | | | | Bug fixes: fix #40, fix #39, fix #38, fix #37, fix #21. Code organization and cleanup...
* first part of CFileLoaderaap2019-06-171-0/+1
|
* got rid of upper case typesaap2019-06-172-32/+32
|
* Merge branch 'master' into masterFire_Head2019-06-131-0/+7
|\
| * fixed CFileMgr somewhat; still issues when loading savesaap2019-06-131-0/+7
| |
* | CPad doneFire-Head2019-06-131-2/+2
|/
* tmpFire-Head2019-06-112-175/+173
|
* 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-053-31/+864
|
* added NO_MOVIESFire-Head2019-06-031-0/+11
|
* gamestates fixed, mpeg now workingFire-Head2019-06-021-43/+147
|
* mouse fixedFire-Head2019-06-021-3/+5
|
* fixed mergeaap2019-06-021-2/+3
|
* skeleton updated, windows specific stuff addedFire-Head2019-06-028-305/+2541
|
* rw skeletonFire-Head2019-05-315-0/+1618