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

2093 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
shfil
3eeb963df5
Merge pull request #538 from ShFil119/revert 
Revert to memcpy
 2020-05-13 02:03:16 +02: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
shfil
bd8a0e7305
Merge pull request #537 from ShFil119/linux_warns 
Fix linux warnings
 2020-05-12 23:42:52 +02: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