mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-11-26 21:13:44 +00:00
Code Issues Projects Releases Wiki Activity
2560 commits 3 branches 0 tags 63 MiB
Commit graph

357 commits

Author SHA1 Message Date
aap
647fd951ec more CBike 2020-06-05 00:24:42 +02:00
aap
95e96c86a1 minor stuff 2020-06-04 17:39:26 +02:00
aap
3e36428568 more CBike and fixes 2020-06-04 17:38:41 +02:00
eray orçunus
016ebc0b00 fixes, mostly from miami 2020-06-04 06:03:12 +03:00
Sergeanur
a6e4619378 Revert "fix accident~" 
This reverts commit 04de93796b.
 2020-06-04 04:42:42 +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
eray orçunus
5dc410a999 Peds, eSound and PedState enum, fixes 2020-06-03 17:01:11 +03:00
aap
c498af29aa get rid of III code 2020-06-03 09:24:26 +02:00
aap
04de93796b fix accident~ 2020-06-03 09:24:02 +02:00
aap
ad03d9543b Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-06-03 08:26:33 +02:00
aap
b73e42346e forgot the fucking file 2020-06-03 08:26:24 +02:00
Sergeanur
509ca11d76 Merge remote-tracking branch 'origin/master' into miami 
# 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
 2020-06-03 01:24:08 +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
aap
06c761e9ac few bike things 2020-06-02 15:26:11 +02:00
aap
575c5466df renamed a vehicle thing 2020-06-02 14:38:57 +02:00
aap
dbeaafbe99 initial CBike struct 2020-06-02 14:38:30 +02:00
aap
fdf8f35049 CTimer fix 2020-06-01 20:51:18 +02:00
aap
de1018d7a6 gravity 2020-06-01 10:56:15 +02:00
aap
bae3a3e72f fixed to CAutomobile and friends 2020-05-31 17:45:26 +02:00
aap
21ce0a4b28 CAutomobile done 2020-05-31 17:05:59 +02:00
aap
00dc86917e some more CAutomobile 2020-05-31 17:05:59 +02:00
aap
c1e13177a1 some CAutomobile 2020-05-31 17:05:59 +02:00
aap
0bc6eef55d bla 2020-05-27 22:34:10 +02:00
aap
2a1b9281e4 automobile fixes 2020-05-27 22:32:57 +02: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
aap
d71cbae9df CVehicle loose ends 2020-05-27 07:43:38 +02:00
Fire-Head
6a32981ba5 VC CParticle done 2020-05-27 02:16:31 +03:00
aap
4f1ce8bd42 added some unused enums 2020-05-26 20:44:03 +02:00
Sergeanur
0ce2af7a0d Merge remote-tracking branch 'origin/master' into miami 
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/control/Garages.cpp
#	src/core/SurfaceTable.cpp
#	src/core/SurfaceTable.h
#	src/core/World.cpp
#	src/core/main.cpp
#	src/modelinfo/PedModelInfo.cpp
#	src/peds/Ped.cpp
#	src/render/Timecycle.cpp
#	src/vehicles/Automobile.cpp
#	src/vehicles/Automobile.h
#	src/vehicles/Heli.cpp
#	src/vehicles/Vehicle.cpp
#	src/weapons/Weapon.cpp
#	src/weapons/WeaponInfo.h
 2020-05-26 17:24:47 +03:00
Nikolay Korolev
f40677c7a4 fixed crash 2020-05-26 16:17:40 +03:00
aap
314e56b7b9 fix2 2020-05-26 12:11:04 +02:00
aap
7e5dde1f1a eSurfaceType 2020-05-26 11:37:46 +02:00
aap
d8528ebbbe eSurfaceType 2020-05-26 11:34:20 +02:00
Nikolay Korolev
15a99da50e cranes fix 2020-05-25 23:34:47 +03:00
aap
3c3b1aadc0 small fixes 2020-05-25 20:36:23 +02:00
aap
7bf8337854 CVehicle 2020-05-25 18:33:34 +02:00
aap
3fdd352ca2 CVehicle fixes 2020-05-24 15:14:56 +02: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
6a7bd0e330 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-24 00:19:25 +03:00
Sergeanur
88b6168f1c Merge branch 'master' into miami 
# 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
 2020-05-23 21:14:16 +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
5357957fe1 Compatibility with VC weapon.dat + new shotguns 2020-05-23 16:53:20 +03:00
Nikolay Korolev
100e59886d
cranes fix 2020-05-23 16:14:39 +03:00
aap
9313bfa155 skeleton typos 2020-05-23 11:34:48 +02:00
aap
e2d3ef449c skeleton typos 2020-05-23 11:34:40 +02:00
aap
a1e4b15bcc Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-05-22 23:58:59 +02:00
aap
21071edbfe fixes for CPhysical and friends 2020-05-22 14:34:44 +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
aap
71b9b2ecf9
Merge pull request #572 from erorcun/miami 
Fixes for melees and various things
 2020-05-20 19:55:05 +02:00
eray orçunus
2ab3fb5dd0 Fixes for melees and various things 2020-05-20 20:21:27 +03:00
Sergeanur
c53b23cff0 Merge remote-tracking branch 'origin/master' into miami 
# Conflicts:
#	src/core/Radar.h
#	src/core/World.cpp
#	src/core/config.h
#	src/entities/Entity.cpp
#	src/modelinfo/ModelIndices.h
#	src/modelinfo/PedModelInfo.cpp
#	src/peds/Population.cpp
#	src/render/Clouds.cpp
#	src/render/Hud.cpp
#	src/vehicles/HandlingMgr.h
 2020-05-20 14:39:36 +03:00
aap
fd4cd3e8f1
Merge pull request #569 from aap/miami 
CEntity and friends
 2020-05-20 12:41:12 +02:00
Nikolay Korolev
fec0028e12 sync with upstream 2020-05-19 23:27:41 +03:00
aap
bdbe5d1080 CEntity and friends 2020-05-19 20:56:42 +02:00
Nikolay Korolev
41d7b3244b Merge remote-tracking branch 'upstream/miami' into miami 2020-05-19 20:54:10 +03:00
Nikolay Korolev
4c822e8375 script revision 2020-05-19 20:54:05 +03:00
eray orçunus
99574ebfc6 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-05-19 17:46:18 +03:00
eray orçunus
a6972714b7 Melee weapons(half-working), Ped and Hud bits 2020-05-19 17:43:16 +03:00
aap
6b0b984909
Merge pull request #561 from Nick007J/miami 
script revision
 2020-05-19 13:26:21 +02:00
aap
0d0f4da27a little cleanup of handlingmgr 2020-05-19 13:09:20 +02:00
aap
53cdf6ab41 HandlingMgr 2020-05-19 13:07:12 +02:00
Nikolay Korolev
a27fc8d9d9 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-19 01:49:51 +03:00
Nikolay Korolev
6510b15704 script revision 2020-05-19 01:49:09 +03:00
aap
abd230dcdd some less certainly fps fixes 2020-05-18 22:52:35 +02:00
aap
2588e69849 some less certainly fps fixes 2020-05-18 16:55:38 +02:00
aap
68f1c03a85 fixes for braking and cloud rotation at high fps 2020-05-18 16:43:40 +02:00
aap
9b09aa3384 fixes for braking and cloud rotation at high fps 2020-05-18 16:40:30 +02:00
Nikolay Korolev
5ab2c85e97 some debug changes 2020-05-18 00:34:24 +03:00
Nikolay Korolev
3cc20d7962 sync with upstream 2020-05-17 21:48:12 +03:00
Nikolay Korolev
a5b84eb9fe full script basic support 2020-05-17 21:43:11 +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
Nikolay Korolev
c33b93793f new horn 2020-05-16 14:01:32 +03:00
Nikolay Korolev
6556cb0db9 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-16 13:40:00 +03:00
Nikolay Korolev
4defd8b75c minimal weather stuff + multiple bugfixes 2020-05-16 13:31:23 +03:00
aap
9dc5dca209 remove some unneeded plane paths for the moment; also different exe icon 2020-05-16 11:34:51 +02:00
eray orçunus
acd1ea9909 Weapon layer in Peds 2020-05-15 21:21:25 +03:00
Sergeanur
24875f34d0 Merge branch 'master' into miami 
# Conflicts:
#	src/modelinfo/ClumpModelInfo.cpp
 2020-05-14 17:05:42 +03:00
aap
41e9754338 fixed hanging boot 2020-05-14 15:05:23 +02:00
aap
2fb4305a73 fixed hanging boot 2020-05-14 15:03:13 +02:00
Nikolay Korolev
9d4d83db0d some fixes 2020-05-14 14:01:24 +03:00
Nikolay Korolev
509d57edcb car control and cranes fixes 2020-05-13 13:29:17 +03:00
Sergeanur
7c2b9478d5 Merge branch 'master' into miami 
# 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
 2020-05-13 00:55:52 +03:00
Sergeanur
33dfaf7da1 Merge remote-tracking branch 'origin/master' into miami 
# Conflicts:
#	premake5.lua
#	src/core/ZoneCull.cpp
#	src/core/Zones.cpp
#	src/objects/CutsceneHead.cpp
#	src/render/Clouds.cpp
 2020-05-13 00:27:15 +03:00
Filip Gawin
c2ac6b3759 Fix linux warnings 2020-05-12 23:18:54 +02:00
Nikolay Korolev
3e64274f6b more script 2020-05-12 01:59:35 +03:00
erorcun
5f40f06bf0
Merge pull request #533 from erorcun/master 
Linux build support
 2020-05-12 00:33:13 +03:00
Nikolay Korolev
9b23e33c36 sync with upstream 2020-05-11 21:21:09 +03:00
Sergeanur
5f1c3fa208 Merge remote-tracking branch 'origin/miami' into miami 2020-05-11 21:07:36 +03:00
Sergeanur
0aa7f13c32 Merge branch 'master' into miami 
# Conflicts:
#	src/animation/AnimBlendAssociation.h
#	src/animation/AnimBlendClumpData.h
#	src/animation/AnimManager.h
#	src/animation/FrameUpdate.cpp
#	src/control/AutoPilot.h
#	src/control/PathFind.h
#	src/core/PlayerInfo.h
#	src/entities/Building.h
#	src/entities/Dummy.h
#	src/entities/Entity.h
#	src/entities/Physical.h
#	src/entities/Treadable.h
#	src/modelinfo/BaseModelInfo.h
#	src/modelinfo/ClumpModelInfo.cpp
#	src/modelinfo/ClumpModelInfo.h
#	src/modelinfo/PedModelInfo.h
#	src/modelinfo/SimpleModelInfo.h
#	src/modelinfo/TimeModelInfo.h
#	src/modelinfo/VehicleModelInfo.h
#	src/objects/CutsceneHead.h
#	src/objects/CutsceneObject.h
#	src/objects/DummyObject.h
#	src/objects/Object.h
#	src/peds/DummyPed.h
#	src/peds/PedIK.cpp
#	src/rw/VisibilityPlugins.cpp
#	src/vehicles/Automobile.h
#	src/vehicles/Boat.h
#	src/vehicles/Heli.h
#	src/vehicles/Plane.h
#	src/vehicles/Train.h
#	src/vehicles/Vehicle.h
 2020-05-11 21:07:12 +03:00
Nikolay Korolev
5f5babe7fe Merge remote-tracking branch 'upstream/miami' into miami 2020-05-11 21:05:01 +03:00
Nikolay Korolev
8fae2dcc26 garages + script 2020-05-11 21:04:35 +03:00
eray orçunus
8a4fa58cd4 Linux build support 2020-05-11 21:00:55 +03:00
aap
d4250fc2c7 CRenderer 2020-05-11 17:03:44 +02:00
aap
b11715608f few fixes 2020-05-11 09:18:41 +02:00