a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-24 02:10:01 +00:00
Code Issues Projects Releases Wiki Activity
2230 commits 4 branches 2 tags 50 MiB
Commit graph

2230 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sergeanur d9a3533438 Small unification 2020-05-10 01:14:00 +03:00
Sergeanur 0b64436f5f
Merge pull request #529 from Nick007J/master 
car control fixes
 2020-05-10 01:08:38 +03:00
Nikolay Korolev 9fce6c4ed3 car control fixes 2020-05-09 22:24:31 +03:00
aap e4683a3074
Merge pull request #528 from Nick007J/miami 
car control, curves, fixes
 2020-05-09 21:18:00 +02: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
aap 87ea37248f
Merge pull request #524 from Nick007J/miami 
gangs
 2020-05-08 18:32:32 +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
aap 78ca912434
Merge pull request #522 from Nick007J/miami 
zone info commands + fix
 2020-05-08 15:19:55 +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
aap 2171ebe2da
Merge pull request #521 from Nick007J/miami 
miami car control init
 2020-05-08 11:04:00 +02:00
Nikolay Korolev db26700352 final fix 2020-05-08 11:49:40 +03:00
Nikolay Korolev 09dc1f9e1e Merge remote-tracking branch 'upstream/miami' into miami 2020-05-08 11:44:21 +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