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

1730 commits

Author SHA1 Message Date
Nikolay Korolev c33b93793f new horn 2020-05-16 14:01:32 +03:00
aap 9558baa353 fixed CText to be 64 bit compatible 2020-05-16 12:52:37 +02:00
aap b21f49ad6b fixed CText to be 64 bit compatible 2020-05-16 12:51:54 +02: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
aap 0c23166318 changed CPedIK names 2020-05-16 10:33:19 +02:00
Nikolay Korolev 9067469f7c more attractor fixes 2020-05-16 11:30:58 +03:00
Nikolay Korolev cf5db73117 a few fixes 2020-05-16 11:22:12 +03:00
Nikolay Korolev 03c4a979c8 removed duplicate code 2020-05-16 10:53:20 +03:00
Nikolay Korolev 5abd466b5d Merge remote-tracking branch 'upstream/miami' into miami 2020-05-16 10:52:58 +03:00
Nikolay Korolev 5491a51daa remove debug 2020-05-16 10:39:18 +03:00
Sergeanur 76dd769085 Merge branch 'master' into miami 2020-05-16 05:07:39 +03:00
Sergeanur ec1b91e527 Remove unused audio enum 2020-05-16 05:06:51 +03:00
Nikolay Korolev a4562c5720 fixed spaces/tabs 2020-05-16 02:15:24 +03:00
Nikolay Korolev f864698696 ped attractors 2020-05-16 02:10: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
erorcun 8ff72f0728
Merge pull request #550 from erorcun/miami 
Weapon layer in Peds
 2020-05-15 21:30:57 +03:00
eray orçunus acd1ea9909 Weapon layer in Peds 2020-05-15 21:21:25 +03:00
aap 1fde2ba468 CPedIK 2020-05-15 19:41:44 +02:00
Nikolay Korolev 09a0207e55 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-14 22:29:23 +03:00
Sergeanur ede6b7db6a Fix compilation 2020-05-14 17:15:26 +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
aap 704a5c158f
Merge pull request #547 from Nick007J/master 
a few bugfixes
 2020-05-14 14:39:23 +02:00
aap c21061a199 fixed RotateTorso 2020-05-14 14:29:39 +02:00
Nikolay Korolev b01987719e
fixed script error 2020-05-14 15:26:59 +03:00
Nikolay Korolev 8e0b132f43 it works differently 2020-05-14 14:03:56 +03:00
Nikolay Korolev 9d4d83db0d some fixes 2020-05-14 14:01:24 +03:00
Nikolay Korolev d031943f2a more pedattractor 2020-05-14 13:46:11 +03:00
aap 9b162554ca fixed skinned cutscene head 2020-05-14 12:32:51 +02:00
aap f5345f59ea blacklist for glfw "joysticks" 2020-05-14 00:09:45 +02: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 94bf7d9ea1 Merge remote-tracking branch 'upstream/master' 2020-05-13 17:34:09 +03:00
Nikolay Korolev 1237941180 fixed traffic lights 2020-05-13 17:33:50 +03:00
Sergeanur 3f1001b86b More save/load alignment fixes 2020-05-13 16:24:00 +03:00
Nikolay Korolev 509d57edcb car control and cranes fixes 2020-05-13 13:29:17 +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
Nikolay Korolev c40fcdf39a
fix shotgun 2020-05-12 22:48:28 +03:00
aap bcd2f8c64c remove debug shit 2020-05-12 20:44:37 +02:00
Nikolay Korolev dc444b9ca0 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-12 20:31:23 +03:00
Nikolay Korolev 180a1dc42b Merge remote-tracking branch 'upstream/master' 2020-05-12 20:23:03 +03:00
Nikolay Korolev 615bd1e878 garages fix 2020-05-12 20:22:35 +03: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
Nikolay Korolev ca6ed7f00f fix garages 2020-05-12 16:21:00 +03:00
Nikolay Korolev 4b566c26a3
fix garages 2020-05-12 14:08:42 +03:00
Nikolay Korolev 1afe36d0d0
fix garages 2020-05-12 14:07:47 +03:00
aap fab453efde fixed bug in cutscene head 2020-05-12 09:45:01 +02:00
Sergeanur 8f1a2825d4 Remove odd calculations for bullet hit smoke 2020-05-12 04:31:11 +03:00
Nikolay Korolev 9647587447 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-12 02:00:26 +03: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
aap ce2071e1e6
Merge pull request #535 from Nick007J/miami 
garages, carctrl, script
 2020-05-11 23:28:52 +02:00
aap 70a8234dad RenderPedCB from VC 2020-05-11 22:24:53 +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
eray orçunus 36e2bc95d3 Fix Windows build and premake 2020-05-11 20:10:01 +03:00
eray orçunus 8a4fa58cd4 Linux build support 2020-05-11 21:00:55 +03:00
aap 95920d54f2 random fixes 2020-05-11 17:04:08 +02:00
aap d4250fc2c7 CRenderer 2020-05-11 17:03:44 +02:00
aap b11715608f few fixes 2020-05-11 09:18:41 +02:00
aap ad90a06a39 little fix for cam 2020-05-11 09:18:21 +02:00
erorcun c66c45f4c8
Merge pull request #509 from Fire-Head/master 
OpenAL update
 2020-05-11 03:23:36 +03:00
Nikolay Korolev 2f085ea5f5 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-11 01:00:50 +03:00
Nikolay Korolev 2f979a8cde some changes 2020-05-11 01:00:41 +03:00
aap 198b80f560 RpAnimBlend and frame updates 2020-05-10 23:47:53 +02:00
aap 9e842f1628 vehicle model descriptions; a bit of heli code 2020-05-10 20:51:29 +02:00
aap 7919b92d28 force load weapons as long as we dont stream em yet 2020-05-10 19:09:49 +02:00
aap d9a8bab631 update file loader for new VC fields 2020-05-10 18:14:14 +02:00
bigbossbro08 bd302ecca1 Merge remote-tracking branch 'upstream/master' 2020-05-10 22:05:45 +06:00
bigbossbro08 b4abb6ddd8 fixed few more typos 2020-05-10 22:04:36 +06:00
bigbossbro08 c798e1bacd Fixed typos and made all assert functions optional 2020-05-10 21:49:33 +06:00
Nikolay Korolev 653d808417 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-10 18:26:13 +03:00
aap 5b605c1271 some fixes and cosmetic changes 2020-05-10 17:09:57 +02:00
aap 0552d49fce CVehicleModelInfo 2020-05-10 17:09:14 +02:00
Nikolay Korolev 00cdcef36a some updates for script 2020-05-10 17:54:13 +03:00
bigbossbro08 af6e132b37 defined out asserts. 2020-05-10 19:54:37 +06:00
Nikolay Korolev 512f5657f7 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-10 15:24:09 +03:00
Nikolay Korolev 61eb361d26 script changes 2020-05-10 15:23:56 +03:00
aap f7aa4e108a added some anim groups 2020-05-10 14:22:22 +02:00
aap f7300c7a27 CPedModelInfo 2020-05-10 13:08:02 +02:00
Nikolay Korolev 4b892e9eb9 fix boats 2020-05-10 13:20:01 +03:00
Nikolay Korolev 662246b9e2 fix boat 2020-05-10 12:56:13 +03:00
Nikolay Korolev 1f3f82eedc Merge remote-tracking branch 'upstream/miami' into miami 2020-05-10 12:37:43 +03:00
aap 58d9e9cd59 CSimpleModelInfo 2020-05-10 11:34:26 +02:00
Nikolay Korolev a827f0dd55 sync with upstream 2020-05-10 12:26:32 +03:00
Nikolay Korolev 2f7d2fa3ad more car control 2020-05-10 12:25:30 +03:00
aap 1b936f6ffb CClumpModelInfo; little fixes 2020-05-10 11:20:27 +02:00
aap f0442960a2 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-05-10 10:04:27 +02:00
aap e9fbd2ccfd CWeaponModelInfo 2020-05-10 10:04:20 +02:00
Sergeanur 35c41208f5 Merge branch 'master' into miami 
# Conflicts:
#	src/animation/AnimManager.cpp
#	src/control/CarCtrl.cpp
#	src/control/Curves.cpp
#	src/core/templates.h
 2020-05-10 01:26:12 +03:00
Sergeanur d9a3533438 Small unification 2020-05-10 01:14:00 +03:00
Nikolay Korolev 9fce6c4ed3 car control fixes 2020-05-09 22:24:31 +03:00
Nikolay Korolev 3de003a8e7 new curves + boat fix 2020-05-09 22:11:40 +03:00
Nikolay Korolev 5fd8eec42c Merge remote-tracking branch 'upstream/miami' into miami 2020-05-09 20:30:05 +03:00
aap c020992e4d back to ped.ifp 2020-05-09 19:29:31 +02:00
Nikolay Korolev 609caad7a4 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-09 20:21:36 +03:00
Nikolay Korolev a55e738dfa ccarctrl big fix 2020-05-09 20:21:13 +03:00
aap f23ecfbc84 accidentally swapped reft and light 2020-05-09 17:29:13 +02:00
aap 97d5698e0c peds starting to work 2020-05-09 17:05:26 +02:00
Sergeanur 28103775ba Place debug menu under ifdef 2020-05-09 16:06:13 +03:00
Sergeanur 1b599b2d35 Fix compilation error 2020-05-09 15:41:00 +03:00
aap 989ded6052 removed cutscene heads 2020-05-09 13:00:39 +02:00
aap 36e1f7b4fb Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-05-09 13:00:07 +02:00
eray orçunus b80c4bae6b Menu map fixes and resizable window on GLFW 2020-05-09 13:58:31 +03:00
aap ea053467b5 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-05-09 12:45:27 +02:00
aap 40cfd0576f
Merge pull request #526 from Nick007J/miami 
GenerateOneRandomCar except bikes
 2020-05-09 12:45:25 +02:00
erorcun ce4996b09c
Merge pull request #527 from erorcun/erorcun 
Menu map fixes and resizable window on GLFW
 2020-05-09 13:44:43 +03:00
eray orçunus f754da272f Menu map fixes and resizable window on GLFW 2020-05-09 13:43:08 +03:00
aap d26ffdd05f fixes for anims 2020-05-09 12:04:48 +02:00
aap e8c0619226 named anim assoc flags 2020-05-09 09:51:31 +02:00
aap 633c2a7aeb Merge branch 'master' of github.com:GTAmodding/re3 2020-05-09 09:50:08 +02:00
aap 3f09ec0744 named anim assoc flags 2020-05-09 09:50:00 +02:00
Sergeanur 4b8d6a3223 Merge branch 'master' into miami 
# Conflicts:
#	src/animation/AnimBlendAssocGroup.cpp
#	src/animation/AnimBlendAssociation.cpp
#	src/animation/AnimManager.cpp
#	src/core/Streaming.cpp
 2020-05-09 02:56:53 +03:00
Sergeanur d686f587cc Merge remote-tracking branch 'origin/master' 2020-05-09 02:51:40 +03:00
Sergeanur e917cd1f46 Fix corona scaling 2020-05-09 02:50:48 +03:00
Nikolay Korolev e30b538cd3 fix 2020-05-09 00:07:35 +03:00
Nikolay Korolev 46d891b745 fix 2020-05-09 00:00:06 +03:00
Nikolay Korolev 3d394c2f95 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-08 23:30:04 +03:00
Nikolay Korolev 7e753c2596 CCarCtrl::GenerateOneRandomCar 2020-05-08 23:29:43 +03:00
aap 10cade9f60 Merge branch 'master' of github.com:GTAmodding/re3 2020-05-08 20:58:48 +02:00
aap f12e76fa13 more small fixes 2020-05-08 20:58:40 +02:00
aap 08de6d487a anims streaming 2020-05-08 20:56:42 +02:00
Nikolay Korolev f902136b6a fix 2020-05-08 18:50:16 +03:00
Nikolay Korolev 75943a57b2 gang 2020-05-08 18:48:44 +03:00
Sergeanur 1ef8d61f36 Merge branch 'master' into miami 2020-05-08 17:49:19 +03:00
Nikolay Korolev 756e4dd068 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-08 17:06:25 +03:00
Nikolay Korolev 6065f5e52b fix 2020-05-08 17:05:54 +03:00
aap 2eee4c5176 most of animation system done; little stuff here and there 2020-05-08 15:59:57 +02:00
Nikolay Korolev c11a20cb4f zone info commands + fix 2020-05-08 16:16:46 +03:00
Sergeanur e0b3418e65 Fix water UV on high FPS and inverted free camera 2020-05-08 14:34:21 +03:00
Nikolay Korolev fb1f51241d
fix 2020-05-08 13:41:28 +03:00
Nikolay Korolev db26700352 final fix 2020-05-08 11:49:40 +03:00
Nikolay Korolev 49cf53644a reasonable spawns 2020-05-08 11:43:27 +03:00
Nikolay Korolev 44c5cdf453 tmp stuff 2020-05-08 11:11:09 +03:00