mirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2024-10-18 22:11:05 +00:00
Code Issues Projects Releases Wiki Activity
5391 commits 3 branches 0 tags 56 MiB
Commit graph

5391 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nikolay Korolev c5af250959 debug func 2021-08-08 23:48:07 +03:00
Nikolay Korolev 729ef37040 merge 2021-08-08 17:44:38 +03:00
Nikolay Korolev e17504a36a Merge branch 'master' into miami 2021-08-08 17:43:07 +03:00
Nikolay Korolev 4673f509f6 Revert "small fix" 
This reverts commit bd96584433.
 2021-08-08 17:42:32 +03:00
Nikolay Korolev 35dd465c19 Revert "small fix" 
This reverts commit bd96584433.
 2021-08-08 17:41:35 +03:00
Nikolay Korolev 7b9d8c5a1f merge 2021-08-08 17:36:08 +03:00
Nikolay Korolev 8d9508bda4 Merge branch 'master' into miami 2021-08-08 17:34:28 +03:00
Nikolay Korolev bd96584433 small fix 2021-08-08 17:34:03 +03:00
Nikolay Korolev 68db861c45 merge 2021-08-08 17:29:57 +03:00
Nikolay Korolev 873840a6a5 merge 2021-08-08 17:19:49 +03:00
Nikolay Korolev 947f67dfb7 small fix 2021-08-08 17:17:20 +03:00
Nikolay Korolev 478bdcc1ca merge 2021-08-08 17:14:21 +03:00
Nikolay Korolev 63046894b0 small refactoring 2021-08-08 16:57:37 +03:00
Nikolay Korolev 74f00c3c63 merge 2021-08-08 15:46:47 +03:00
Nikolay Korolev 668311a444 Merge branch 'master' into miami 2021-08-08 15:44:18 +03:00
Nikolay Korolev 15f770531c fixed tab 2021-08-08 15:42:44 +03:00
Nikolay Korolev 88b4c7b50b merge 2021-08-08 15:34:02 +03:00
Nikolay Korolev 9cc1201892 merge 2021-08-08 13:38:21 +03:00
Nikolay Korolev e6b1a0691b lcs bridge 2021-08-08 13:08:47 +03:00
Nikolay Korolev 0c4ab5b609 disable mission replay for lcs 2021-08-08 10:51:04 +03:00
Nikolay Korolev 2672504e8a more cherry-pick fix 2021-08-07 20:40:27 +03:00
Nikolay Korolev a7e86e0510 cherrypick fixes 2021-08-07 20:40:18 +03:00
Nikolay Korolev 827f0ffbb6 move debug 2021-08-07 20:35:01 +03:00
Nikolay Korolev 883e8390c9 move debug script stuff to a separate file 2021-08-07 20:26:33 +03:00
Nikolay Korolev c69edce800 mission replay 2021-08-07 20:24:01 +03:00
Nikolay Korolev 747705d430 lcs specific hack 2021-08-07 20:03:45 +03:00
Nikolay e947081622
Merge pull request #1266 from Nick007J/miami 
Mission replay
 2021-08-07 18:47:28 +03:00
aap 1cfd4f741e
Merge pull request #1276 from aap/lcs 
CPhysical almost done
 2021-08-04 13:56:22 +02:00
aap bec1cbc1cb CVehicle fixes and cleanup 2021-08-04 13:54:26 +02:00
aap 4f461bd7be CVehicle fixes and cleanup 2021-08-04 13:54:04 +02:00
Nikolay Korolev 80d00fe31a more cherry-pick fix 2021-08-03 22:20:14 +03:00
Nikolay Korolev 6fbb7da82d cherrypick fixes 2021-08-03 22:14:58 +03:00
Nikolay Korolev 5a22896197 move debug 2021-08-03 21:53:45 +03:00
Nikolay Korolev 8bcbee4ea7 move debug script stuff to a separate file 2021-08-03 21:53:42 +03:00
Nikolay Korolev 5999ddc76d Merge remote-tracking branch 'upstream/miami' into miami 2021-08-03 21:44:18 +03:00
aap 0338d4c393 CPhysical almost done 2021-08-02 20:05:39 +02:00
aap 4a047f56bc CPhysical fixes and cleanup 2021-08-02 20:02:57 +02:00
aap 09748d094a CPhysical fixes and cleanup 2021-08-02 20:02:35 +02:00
erorcun ae1deb2209
Merge pull request #1267 from erorcun/miami 
Add ped&car density sliders, fix peds don't spawn
 2021-08-02 18:23:06 +03:00
Sergeanur cb5586e658
Merge pull request #1268 from Nick007J/master 
move debug stuff to a separate file
 2021-08-02 15:06:40 +03:00
Sergeanur 865ce46fdb Fix waypoint disappearing after each save 2021-08-02 14:26:00 +03:00
Nikolay Korolev 2b99f2634b sync 2021-08-01 14:00:16 +03:00
Nikolay Korolev 6d7dec96af move debug script stuff to a separate file 2021-08-01 13:58:15 +03:00
erorcun 418bf3ab69 Fix R* optimization that prevents peds to spawn 2021-08-01 13:56:24 +03:00
erorcun 192190769d Add ped and car density slider to menu, remove dumb collision "optimization" 2021-08-01 13:56:09 +03:00
Nikolay Korolev 1479093d33 Merge remote-tracking branch 'upstream/miami' into miami 2021-08-01 12:54:20 +03:00
Nikolay Korolev 70080f1fdb mission replay 2021-08-01 12:54:05 +03:00
erorcun 0542b1bd4d Fix radio scroll when player controls disabled 2021-07-31 23:03:59 +03:00
erorcun e80cbf8bb2 Fix radio scroll when player controls disabled 2021-07-31 22:57:54 +03:00
Sergeanur a481b900b9 Merge branch 'miami' into lcs 
# Conflicts:
#	src/control/CarCtrl.cpp
#	src/modelinfo/MloModelInfo.cpp
#	src/modelinfo/MloModelInfo.h
#	src/renderer/Renderer.cpp
#	src/rw/VisibilityPlugins.cpp
#	src/rw/VisibilityPlugins.h
 2021-07-31 20:43:52 +03:00