crt0mega/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2021-09-07 08:09:38 +00:00
Code Issues Projects Releases Wiki Activity
4,087 Commits 3 Branches 0 Tags 79 MiB
cb4b4d584c
Commit Graph

4087 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sergeanur
cb4b4d584c Merge branch 'miami' into lcs 
# Conflicts:
#	src/control/Script.cpp
#	src/control/Script3.cpp
#	src/extras/custompipes_d3d9.cpp
#	src/extras/custompipes_gl.cpp
 2021-01-12 12:55:07 +02:00
withmorten
75367e714a premake: add startrpoject; add lto option; fix copying of binary to gamedir; update premake5.exe 
# Conflicts:
#	premake5.lua
 2021-01-12 12:43:42 +02:00
Nikolay Korolev
167a841010 Merge branch 'lcs-dev' into lcs 2021-01-12 12:17:22 +03:00
Nikolay Korolev
2736c3a9d1 fix 2021-01-12 12:16:52 +03:00
Sergeanur
7e888a6379 Fix collective commands 2021-01-12 02:29:10 +02:00
Sergeanur
dcb4eedeb0 Fix collective commands 2021-01-12 02:28:08 +02:00
aap
afcb794d59
Merge pull request #947 from withmorten/miami 
fix CPed struct, GetWantedLevel
 2021-01-11 22:46:06 +01:00
aap
6ef3b8c458
Merge pull request #949 from majesticCoding/lcs 
unused CFerryDoor
 2021-01-11 22:45:10 +01:00
Nikolay Korolev
daf5cfe425 Merge remote-tracking branch 'upstream/miami' into miami 2021-01-12 00:43:45 +03:00
Nikolay Korolev
42e4e7c063 fix 2021-01-12 00:43:26 +03:00
Nikolay Korolev
7496a463d4 Merge branch 'lcs-dev' into lcs 2021-01-12 00:42:44 +03:00
Nikolay Korolev
091b40cb39 script3.cpp 2021-01-12 00:42:11 +03:00
majestic
0f0812618a unused CFerryDoor 2021-01-11 12:47:09 -08:00
aap
383142bcbe some useless code 2021-01-11 20:20:08 +01:00
Fire-Head
f728c58383 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2021-01-11 21:10:28 +03:00
Fire-Head
e2095bf70b fix explosion jet 2021-01-11 21:10:24 +03:00
Nikolay Korolev
c7052b3d6f fuck 2021-01-11 20:51:18 +03:00
withmorten
4a8a1af885 fix CPed struct, GetWantedLevel 2021-01-11 18:43:04 +01:00
majestic
0345861b5f Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs 2021-01-11 08:10:11 -08:00
Nikolay Korolev
4422a3df23 Merge branch 'lcs-dev' into lcs 2021-01-11 17:26:17 +03:00
Nikolay Korolev
a214d0ed4c fix 2021-01-11 17:25:51 +03:00
Nikolay Korolev
81b5e66dd4 fixes 2021-01-11 17:18:25 +03:00
Nikolay Korolev
625376f0d3 500-599 2021-01-11 17:14:56 +03:00
majestic
8f925a2e84 Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs 2021-01-10 18:43:24 -08:00
Nikolay Korolev
cf11b32849 of course 2021-01-11 02:43:57 +03:00
Nikolay Korolev
53a99cb9ee script2 2021-01-11 02:35:03 +03:00
erorcun
b5711b21dc Automobile: fix 2021-01-11 01:10:24 +03:00
Sergeanur
585300cd33 More font fix 2021-01-10 22:37:11 +02:00
majestic
7d877ab488 Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs 2021-01-10 12:20:19 -08:00
Nikolay Korolev
642970df95 Merge branch 'lcs-dev' into lcs 2021-01-10 22:58:43 +03:00
Nikolay Korolev
75d1715442 script file 1 done (hopefully) 2021-01-10 22:58:06 +03:00
Fire-Head
adc7127055 fix pickup coronas 2021-01-10 22:24:21 +03:00
aap
ca64363899 debugmenu vehicle spawn list 2021-01-10 19:58:58 +01:00
majestic
0508a62c91 Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs 2021-01-10 10:47:25 -08:00
aap
93ea98520b mobile building rendering 2021-01-10 19:45:58 +01:00
aap
ebca91e0d0 update librw 2021-01-10 18:43:44 +01:00
shfil
c3b6e9da43
Fix linux build 2021-01-10 17:14:33 +01:00
majestic
5256f1c967 Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs 2021-01-10 05:43:26 -08:00
aap
c631e6c61c env map tweaks 2021-01-10 14:32:37 +01:00
majestic
5fe6c2dcb4 Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs 2021-01-10 04:20:18 -08:00
aap
453405f131 dont render untextured world 2021-01-10 13:05:34 +01:00
aap
0ee87d7b46 env map rendering 2021-01-10 11:59:57 +01:00
Nikolay
b0e395e853
Merge pull request #942 from majesticCoding/lcs 
just original marker's colors
 2021-01-10 13:44:40 +03:00
Seemann
ad7855f995 Update command definitions 2021-01-10 12:27:51 +03:00
Nikolay
d90de7f13c
Merge pull request #943 from x87/miami 
Update command definitions
 2021-01-10 12:25:18 +03:00
majestic
9f288fc16f Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs 2021-01-09 21:32:38 -08:00
Seemann
c2265e29d2 Update command definitions 2021-01-09 23:59:47 -05:00
Nikolay Korolev
1b3047c812 Merge branch 'lcs-dev' into lcs 2021-01-09 22:24:52 +03:00
Nikolay Korolev
f5b97f1e8a can finish first mission 2021-01-09 22:24:18 +03:00
aap
d3aa8a118c fix rendering; update librw 2021-01-09 19:45:19 +01:00