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

704 commits

Author SHA1 Message Date
aap 8a90e32f1b
Merge pull request #564 from Xinerki/miami 
fix audio menu crash
 2020-05-19 13:26:43 +02:00
aap 6b0b984909
Merge pull request #561 from Nick007J/miami 
script revision
 2020-05-19 13:26:21 +02:00
Xinerki ffd175c705 fix frontend control config menu a little 
thank erorcun
 2020-05-19 14:23:59 +03:00
Xinerki 12b48edada fix audio menu crash 2020-05-19 14:07:24 +03:00
aap 53cdf6ab41 HandlingMgr 2020-05-19 13:07:12 +02:00
aap 401e45d63e
Merge pull request #563 from Xinerki/miami 
match frontend to vc more; isolate crgba
 2020-05-19 12:50:47 +02:00
Xinerki 9e14e8553f match frontend to vc more; isolate crgba 2020-05-19 13:47:55 +03:00
aap 9d16df5aa8
Merge pull request #562 from Xinerki/miami 
Load VC frontend textures and use some
 2020-05-19 10:41:17 +02:00
aap 62db8cd9b0 finished CFileLoader; some COcclusion stubs 2020-05-19 10:23:08 +02:00
Xinerki d425358181 Load VC frontend textures and use some 2020-05-19 10:07:15 +03:00
Nikolay Korolev 6510b15704 script revision 2020-05-19 01:49:09 +03:00
aap 2d4861454c
Merge pull request #557 from Nick007J/miami 
script and script stubs
 2020-05-18 13:08:24 +02:00
aap 8f9ce275c8
Merge pull request #558 from Sergeanur/VC/text 
CText
 2020-05-18 13:07:59 +02:00
Sergeanur af22bb1495 CText 2020-05-18 01:28:40 +03:00
Nikolay Korolev fd2948f045 sync with upstream 2020-05-17 23:32:32 +03:00
aap 13903d7c46 radar sprites 2020-05-17 22:21:39 +02: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
aap 8a7210cad1
Merge pull request #555 from erorcun/miami 
Weapon fixes and thingies
 2020-05-17 20:20:14 +02:00
eray orçunus 84f8312b86 Weapon fixes and thingies 2020-05-17 21:01:52 +03:00
aap a0703fd9e1 loading screens 2020-05-17 19:45:21 +02:00
Nikolay Korolev b587d835e8 more script stuff 2020-05-16 23:06:33 +03:00
Nikolay Korolev e3291b0cb1 gangs, script and replay fixes 2020-05-16 17:00:40 +03:00
Nikolay Korolev 4defd8b75c minimal weather stuff + multiple bugfixes 2020-05-16 13:31:23 +03:00
Nikolay Korolev 21329b8440 sync with upstream 2020-05-16 01:50:45 +03:00
Nikolay Korolev 08b2138c7e ped attractors done 2020-05-16 01:49:30 +03:00
eray orçunus acd1ea9909 Weapon layer in Peds 2020-05-15 21:21:25 +03:00
Nikolay Korolev 09a0207e55 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-14 22:29:23 +03:00
Sergeanur 24875f34d0 Merge branch 'master' into miami 
# Conflicts:
#	src/modelinfo/ClumpModelInfo.cpp
 2020-05-14 17:05:42 +03:00
shfil 7036e80fc6
Fix calloc in CdStreamPosix 2020-05-13 17:48:07 +02:00
Nikolay Korolev d426588496 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-13 17:55:12 +03:00
Nikolay Korolev 81ea6f0258 ped attractor: start 2020-05-13 11:38:05 +03:00
Sergeanur 7aeac06fdb Redoing some pool reading for better alignment 2020-05-13 05:31:14 +03:00
Sergeanur 4ac53960f5 Changing save/load for CPlayerInfo because of alignment crap 2020-05-13 03:43:20 +03:00
Filip Gawin a0b3117ee4 Revert to memcpy 2020-05-13 02:01:42 +02: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
aap bcd2f8c64c remove debug shit 2020-05-12 20:44:37 +02:00
aap 98a233da43 little fixes to CClouds; disabled object clipping for SA cam 2020-05-12 16:36:23 +02:00
aap 40829b5242 CClouds; disabled object clipping for SA cam 2020-05-12 16:27:39 +02:00
erorcun 5f40f06bf0
Merge pull request #533 from erorcun/master 
Linux build support
 2020-05-12 00:33:13 +03:00
aap ce2071e1e6
Merge pull request #535 from Nick007J/miami 
garages, carctrl, script
 2020-05-11 23:28:52 +02:00
aap 0eb5f93e96 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-05-11 22:21:26 +02:00
aap 6e4710b717 CVisibilityPlugins 2020-05-11 22:21:18 +02: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