a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 19:40:00 +00:00
Code Issues Projects Releases Wiki Activity
2052 commits 4 branches 2 tags 50 MiB
Commit graph

2052 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Sergeanur a483243c52 Merge remote-tracking branch 'origin/master' into miami 
# Conflicts:
#	src/core/FileLoader.cpp
 2020-05-08 00:58:39 +03:00
Nikolay Korolev b99346e6ca sync with upstream 2020-05-07 23:22:15 +03:00
Nikolay Korolev 2dc818e4d2 intermediate changes 2020-05-07 23:21:36 +03:00
aap a8f1505517 small fixes 2020-05-07 21:56:09 +02:00
aap c715569d1d CBaseModelInfo done 2020-05-07 21:55:54 +02:00
aap f80474f590 little script change 2020-05-07 18:08:17 +02:00
aap 19b21cafcd CZoneInfo mostly done; not its dependencies 2020-05-07 17:53:38 +02:00
aap 3ae10c93ac Merge branch 'master' of github.com:GTAmodding/re3 2020-05-07 17:31:32 +02:00
Nikolay Korolev 5780b4503e sync with upstream 2020-05-07 16:59:40 +03:00
Nikolay Korolev 40888e9486 car control and friends 2020-05-07 16:57:49 +03:00
aap 8bb22b2ad8 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-05-07 14:41:43 +02:00
aap 6a7d08ecc2 some quick cosmetic fixes 2020-05-07 14:41:35 +02:00
Sergeanur f13c4e6aca Merge branch 'master' into miami 2020-05-07 14:49:29 +03:00
Sergeanur 0b848bc147 Fix looping collision sound 2020-05-07 14:48:53 +03:00
aap 54662674e6 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-05-07 13:38:22 +02:00
aap dbbf390983 use water color and new water texture 2020-05-07 13:38:14 +02:00
Sergeanur 7dc649ede6 Merge branch 'master' into miami 2020-05-07 14:32:41 +03:00
Sergeanur 1ac6bea590 Fix GetDistanceSquared 2020-05-07 14:32:00 +03:00
Sergeanur ed1bb7236f Fixed arguments for sound collisions 2020-05-07 14:10:56 +03:00
aap 5c30b3a188 got rid of superfluous enum; update librw 2020-05-07 12:48:57 +02:00
aap f5c0bf3b60 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2020-05-07 12:48:57 +02:00
aap 152c7c452c few changes for vehicle model info 2020-05-07 12:48:09 +02:00
Sergeanur bef436400d Merge remote-tracking branch 'origin/master' into miami 
# Conflicts:
#	src/modelinfo/ModelIndices.h
 2020-05-07 13:42:50 +03:00
aap aff89c6f5c typo 2020-05-07 11:47:08 +02:00
aap 05a1d64fbb VC vehicles just barely working now 2020-05-07 11:33:20 +02:00
aap 876e402d1e dont hardcode first vehicle ID; little fix for roadblocks 2020-05-07 09:38:07 +02:00
Fire-Head 875c77e8b1 oal update 2020-05-07 10:13:59 +03:00
Fire-Head 35da74e0b4 rem mpg123_pre header 2020-05-07 09:35:34 +03:00