a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-11-10 21:29:16 +00:00
Code Issues Projects Releases Wiki Activity
3795 commits 4 branches 2 tags 50 MiB
Commit graph

52 commits

Author SHA1 Message Date
Nikolay Korolev 8d1996833b merge attempt 2020-12-19 03:21:04 +03:00
Sergeanur cfda5eb148 PlayerInfo functions reordered into original order, FindPlayer... functions moved to PlayerInfo, improved CVector <-> RwV3d conversion, small fixes 2020-12-18 02:58:09 +02:00
Sergeanur e9a5670348 PlayerInfo functions reordered into original order, FindPlayer... functions moved to PlayerInfo, improved CVector <-> RwV3d conversion, small fixes 2020-12-18 02:57:54 +02:00
Sergeanur f76dfaee82 Use SetPedState 2020-12-15 05:11:02 +02:00
Sergeanur 963e85f047 Fix 2020-08-24 23:01:51 +03:00
eray orçunus f403a63a5c Wheelie opcode 2020-08-14 18:54:01 +03:00
eray orçunus b54bb62c94 Stats(except displaying), PlayerInfo, marker fix 2020-08-14 01:14:04 +03:00
Sergeanur d0f5464200 Merge branch 'master' into miami 
# 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
 2020-07-13 18:10:17 +03:00
Sergeanur 841fa5155c Rename LEVEL_NONE to LEVEL_GENERIC 2020-07-13 17:43:09 +03:00
eray orçunus 15548758ac Bettah car enter canceling, fix CFO crash, ped objs. renaming 2020-07-03 16:51:33 +03:00
Sergeanur b26eec5daf Merge remote-tracking branch 'origin/master' into miami 
# 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
 2020-06-29 12:56:50 +03:00
eray orçunus f3ed6659c3 CWanted, anim fix, ped objs renaming, remove III beta features 2020-06-22 04:20:56 +03:00
Nikolay Korolev 7a71a47f74 updated player control names 2020-06-21 16:00:17 +03:00
eray orçunus d6a853bd60 killing peds increase chaos level 2020-06-20 22:44:31 +03:00
eray orçunus 016ebc0b00 fixes, mostly from miami 2020-06-04 06:03:12 +03:00
eray orçunus 5dc410a999 Peds, eSound and PedState enum, fixes 2020-06-03 17:01:11 +03:00
Nikolay Korolev c1c163d78c game logic 2020-05-31 20:59:01 +03:00
Nikolay Korolev 864847a6fe new script commands - mostly stubs 2020-05-22 02:42:04 +03:00
Nikolay Korolev 6510b15704 script revision 2020-05-19 01:49:09 +03:00
Nikolay Korolev 3cc20d7962 sync with upstream 2020-05-17 21:48:12 +03:00
eray orçunus 84f8312b86 Weapon fixes and thingies 2020-05-17 21:01:52 +03:00
Nikolay Korolev b587d835e8 more script stuff 2020-05-16 23:06:33 +03:00
Sergeanur 24875f34d0 Merge branch 'master' into miami 
# Conflicts:
#	src/modelinfo/ClumpModelInfo.cpp
 2020-05-14 17:05:42 +03:00
Sergeanur 4ac53960f5 Changing save/load for CPlayerInfo because of alignment crap 2020-05-13 03:43:20 +03:00
aap 05a1d64fbb VC vehicles just barely working now 2020-05-07 11:33:20 +02:00
Sergeanur e9b334d7bf More use of GetModelIndex 2020-05-05 14:48:35 +03:00
Sergeanur 84c9484e55 SetPosition, final part 2020-05-05 04:45:18 +03:00
Sergeanur 7d758f3a9f Adding getters and setters for type and status 2020-04-30 16:45:45 +03:00
Filip Gawin 370c4e48cd Try to build with mingw 2020-04-20 18:18:46 +02:00
erorcun 0f07a323c9
Merge pull request #474 from Nick007J/master 
Bug fixes, mostly replay; added RegisterReference for player ped pointer
 2020-04-19 16:56:39 +03:00
eray orçunus 1ffc37735e Struct cleanup, various fixes, enable PS2 rand 2020-04-19 16:44:35 +03:00
Nikolay Korolev c4cd45d47c replays bug fix 2020-04-18 23:50:37 +03:00
Filip Gawin d6314f9564 Revert "Part one" 
This reverts commit 63951d9b95.
 2020-04-18 12:29:28 +02:00
Filip Gawin 63951d9b95 Part one 2020-04-17 19:30:57 +02:00
Sergeanur 599164006a Remove patches 2020-04-17 16:31:11 +03:00
aap 34349c4df2 normalized line endings to LF 2020-04-09 20:50:24 +02:00
eray orçunus 112685ebac CCopPed done and #include cleanup 2020-03-28 18:52:25 +03:00
eray orçunus 934e9db4fc CPopulation done, CCopPed and fixes 2020-03-12 00:48:33 +03:00
eray orçunus a718e699ad Fixes and cleanup 2020-03-02 03:06:52 +03:00
Nikolay Korolev 1ba696f5fc some changes 2020-02-23 13:12:44 +03:00
erorcun d75b9b8257
CPlayerPed continues (#294) 2020-01-23 23:21:50 +03:00
Nikolay Korolev a19a6a7c0f fixed vehicle enter crash 2020-01-01 15:59:08 +03:00
eray orçunus 6cbf1db519 CPlayerInfo done 2019-12-16 07:48:44 +03:00
eray orçunus dad7782ff0 CPhone, CPlayerInfo, CFire, CWorld 2019-12-06 00:55:23 +03:00
Nikolay Korolev d579ee1b64 script 500-599 plus bugfix 2019-10-22 00:39:59 +03:00
Sergeanur 69963cea68 Full CGameLogic 2019-10-08 17:13:23 +03:00
Sergeanur 5854016ec5 PlayerSkin 2019-09-28 21:49:41 +03:00
eray orçunus 14c7c1d7ca World and Peds 2019-09-12 03:46:15 +03:00
Nikolay Korolev 5acce16261 Running script part 3 2019-07-25 23:34:29 +03:00
_AG 5b04393bb4 More frontend inputs. 2019-07-10 10:03:06 +02:00