a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-11-06 05:35:55 +00:00
Code Issues Projects Releases Wiki Activity
3128 commits 4 branches 2 tags 50 MiB
Commit graph

447 commits

Author SHA1 Message Date
eray orçunus f40f44b14e Peds, Hud, CFO 1/2, fixes - including zone names 2020-07-22 15:19:22 +03:00
eray orçunus 4cf6024cdb cosmetic changes 2020-07-21 20:22:52 +03:00
eray orçunus 6dbc0c7dda a cute mistake 2020-07-21 06:41:41 +03:00
eray orçunus 70df13f9d3 Fixes from miami 2020-07-20 22:47:41 +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 67a3c7d2ee VC fighting, Peds, many fixes including ghost bikes 2020-07-09 17:01:07 +03:00
eray orçunus ceb1defc4e fixes from master, menu helper text 2020-07-04 23:50:43 +03:00
aap 2c50cf8ac6
Merge pull request #648 from Nick007J/miami 
ice cream attractor + bike respray
 2020-07-04 21:24:23 +02:00
eray orçunus 1cea84d2b1 Remove console and fix sth 2020-07-04 16:01:07 +03:00
eray orçunus 716740f918 Peds & fixes 2020-07-04 15:31:28 +03:00
eray orçunus 15548758ac Bettah car enter canceling, fix CFO crash, ped objs. renaming 2020-07-03 16:51:33 +03:00
Nikolay Korolev 48ebbb7292 ice cream attractor + bike respray 2020-07-03 11:08:19 +03:00
eray orçunus c4cd210ae0 Disable VC_PED_PORTS, better cancellable car enter, weapon and cops fixes 2020-07-02 16:01:42 +03:00
erorcun eda50bc32b
Restored beta police system(disabled), fixes from miami, debug info for CFO crash (#639) 2020-07-01 15:28:43 +03:00
aap 592a6aef0b
Merge pull request #638 from erorcun/miami 
CWanted, anim fix, ped objs renaming, remove III beta features
 2020-06-25 15:15:01 +02:00
aap 2b21f92347 rename attractor flag to type 2020-06-25 15:13:33 +02:00
aap cafe4d6f0c rename attractor flag to type 2020-06-25 15:13:08 +02:00
eray orçunus f3ed6659c3 CWanted, anim fix, ped objs renaming, remove III beta features 2020-06-22 04:20:56 +03:00
eray orçunus d6a853bd60 killing peds increase chaos level 2020-06-20 22:44:31 +03:00
eray orçunus cc60ad1946 ducking & anim fix 2020-06-20 20:26:27 +03:00
eray orçunus 2d2833f2e4 more weapon fixes 2020-06-20 17:30:28 +03:00
eray orçunus fd3cd2c26a Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-06-20 16:23:42 +03:00
eray orçunus 0625954bb7 Ducking, shooting vehicle occupants and weapon fixes 2020-06-20 16:23:32 +03:00
aap c5205a89ee CCamera done 2020-06-20 14:54:11 +02:00
eray orçunus e44704dc82 Ped, Weapon and fixes 2020-06-17 21:24:59 +03:00
erorcun d322a8033e
Merge branch 'miami' into miami 2020-06-16 23:02:21 +03:00
aap 7ceedc1d47 CCam done 2020-06-16 13:54:18 +02:00
eray orçunus 3a600b4684 Bike anim. fix 2020-06-16 00:20:08 +03:00
aap dc7d4e1134 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-06-15 22:51:47 +02:00
eray orçunus c4e129509b Peds & fixes continues 2020-06-15 23:43:20 +03:00
aap 62024217b7 more CCam 2020-06-15 20:50:01 +02:00
erorcun f64d3ad7de
Merge pull request #631 from erorcun/miami 
Peds, mission switcher & fixes
 2020-06-14 22:59:02 +03:00
eray orçunus db6110e996 Peds, mission switcher & fixes 2020-06-14 22:57:26 +03:00
majestic 015921522d fixed condition in CBoat::ProcessControl and changed enum 2020-06-14 07:53:45 -07:00
aap c7a32bb83d some camera code 2020-06-14 09:36:30 +02:00
Nikolay Korolev f78f707935 script fix 2020-06-13 02:02:59 +03:00
majestic 2cc8ecbb90 removed extern from RwImVertexIndex SmokeTrailIndices and additional rotational variables for minigun 2020-06-11 01:36:45 -07:00
majestic 94e3c30054 original multiplying rotational cords for minigun 2020-06-11 00:59:23 -07:00
majestic 669db1a293 minigun rotation fix 2020-06-10 23:26:51 -07:00
eray orçunus dba2b052a6 Peds, bike center of mass and reversing fixes 2020-06-09 01:29:55 +03:00
eray orçunus e07b6fdce7 Message box, letterbox and ped attaching 2020-06-07 21:44:54 +03:00
Nikolay Korolev 1748aabd69 fix 2020-06-07 18:19:44 +03:00
Nikolay Korolev d0213e466c more script commands 2020-06-07 15:49:25 +03:00
eray orçunus de4323f949 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-06-07 12:46:15 +03:00
eray orçunus d1a02e6ddc New ped objectives 2020-06-07 12:45:53 +03:00
Sergeanur 1c01899799 Merge branch 'master' into miami 
# Conflicts:
#	src/control/Garages.cpp
#	src/core/Frontend.cpp
#	src/peds/PlayerPed.cpp
#	src/render/Hud.cpp
#	src/vehicles/Train.cpp
 2020-06-07 04:15:10 +03:00
aap 5711159e68 CBike done 2020-06-07 00:01:59 +02:00
eray orçunus db9057f5a8 fix 2020-06-06 22:24:30 +03:00
eray orçunus 096ecc1d14 Some wait states 2020-06-06 22:16:59 +03:00
eray orçunus fc0498b3a8 CFont crash workaround 2020-06-06 19:25:37 +03:00
eray orçunus 4e4a3489ef Use KnockOffRider 2020-06-06 17:19:36 +03:00
Nikolay Korolev e099aaaa6b minor fixes 2020-06-06 16:36:26 +03:00
Nikolay Korolev 3f26250d73 fixing some uninitialized stuff 2020-06-06 13:31:09 +03:00
Sergeanur afa4fa6510 Merge branch 'master' into miami 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/AudioSamples.h
#	src/audio/soundlist.h
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/MenuScreens.cpp
#	src/peds/Ped.cpp
#	src/peds/PlayerPed.cpp
#	src/render/Hud.cpp
#	src/vehicles/Vehicle.h
 2020-06-06 08:42:58 +03:00
eray orçunus f045ce4386 Bike riding anims, SA bike/heli cam 2020-06-05 23:13:34 +03:00
aap 98de658c8f
Merge pull request #619 from ShFil119/heads 
Fix collision with peds heads
 2020-06-05 13:43:07 +02:00
Nikolay Korolev d325a3d247 basic bike support in traffic, script and car gen; some heli AI 2020-06-05 11:22:15 +03:00
eray orçunus 016ebc0b00 fixes, mostly from miami 2020-06-04 06:03:12 +03:00
Sergeanur 07c6752cf7 Merge branch 'master' into miami 
# Conflicts:
#	src/peds/Ped.cpp
 2020-06-04 05:10:50 +03:00
Sergeanur 2578880e1c PedChat & PedDebug 2020-06-04 05:04:00 +03:00
Sergeanur 07d336ddf0 Merge branch 'master' into miami 
# Conflicts:
#	src/peds/Ped.cpp
#	src/peds/Ped.h
 2020-06-04 04:32:49 +03:00
Sergeanur 12717917cc Restore original logic of CPed::WanderRange 2020-06-04 04:31:04 +03:00
aap e1201fc6e2 fixed CPed::AddInCarAnims 2020-06-03 16:55:23 +02:00
eray orçunus 5dc410a999 Peds, eSound and PedState enum, fixes 2020-06-03 17:01:11 +03:00
aap 2ca3c50463 some CBike code; vehicle cleanup 2020-06-02 23:35:20 +02:00
aap 04a91761df some vehicle cleanup 2020-06-02 23:34:53 +02:00
Filip Gawin 5d90e4b2f0 Fix collision with peds heads 2020-06-01 22:10:11 +02:00
eray orçunus abef04c637 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-06-01 18:35:04 +03:00
aap 25273485d9 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-06-01 18:05:24 +02:00
eray orçunus d930a25d94 DrawStandardMenus, VC menu array and minor fixes 2020-06-01 18:32:34 +03:00
Nikolay Korolev c1c163d78c game logic 2020-05-31 20:59:01 +03:00
aap 21ce0a4b28 CAutomobile done 2020-05-31 17:05:59 +02:00
eray orçunus 529cec5653 R to freeroam, idle anims, weapon and cam enum fix 2020-05-29 22:05:33 +03:00
Fire_Head e4649b41e1
Merge pull request #2 from GTAmodding/miami 
Miami
 2020-05-27 21:51:40 +03:00
Fire-Head 63d0bdc863 VC Water 2020-05-27 21:50:01 +03:00
Sergeanur 408faf8a66 Support of original mp3/wav/adf 2020-05-27 03:29:54 +03:00
aap 800d706935
Merge pull request #588 from blingu/miami 
fixed compiler errors
 2020-05-26 11:39:16 +02:00
aap 7e5dde1f1a eSurfaceType 2020-05-26 11:37:46 +02:00
aap d8528ebbbe eSurfaceType 2020-05-26 11:34:20 +02:00
aap 0b8f045d36
Merge pull request #586 from aap/miami 
CVehicle
 2020-05-26 11:25:23 +02:00
aap 3c3b1aadc0 small fixes 2020-05-25 20:36:23 +02:00
aap 7bf8337854 CVehicle 2020-05-25 18:33:34 +02:00
blingu 55ece14f42
Update CopPed.cpp 2020-05-24 17:36:37 +02:00
nrb d59862eb5e fixed compiler errors 2020-05-24 17:27:12 +02:00
Nikolay Korolev 6235e2140e fixed filename 2020-05-24 17:23:14 +03:00
eray orçunus 14755a4ff4 all my fixes live in exes 2020-05-24 16:41:29 +03:00
aap 19a0c8b462
Merge pull request #583 from erorcun/miami 
Menu borders and weapon fixes
 2020-05-24 10:47:17 +02:00
eray orçunus 4870d9a31b Menu borders and weapon fixes 2020-05-24 03:05:48 +03:00
Nikolay Korolev 2966be41ba Merge remote-tracking branch 'upstream/miami' into miami 2020-05-23 20:07:30 +03:00
Nikolay Korolev 607175f02a set pieces 2020-05-23 20:06:52 +03:00
eray orçunus c3b41d79a2 Cleanup and one needed function 2020-05-23 18:04:33 +03:00
eray orçunus 5357957fe1 Compatibility with VC weapon.dat + new shotguns 2020-05-23 16:53:20 +03:00
Nikolay Korolev b9115b4429 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-23 01:43:17 +03:00
Nikolay Korolev 7bf561d440 some fixes 2020-05-23 01:43:12 +03:00
aap a1e4b15bcc Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-05-22 23:58:59 +02:00
aap a53ca58e56 CPhysical 2020-05-22 14:27:16 +02:00
Nikolay Korolev 864847a6fe new script commands - mostly stubs 2020-05-22 02:42:04 +03:00
Nikolay Korolev 7e5342e9f0 script revision 2020-05-21 11:22:25 +03:00
eray orçunus 2ab3fb5dd0 Fixes for melees and various things 2020-05-20 20:21:27 +03:00