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

4321 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sergeanur
94f25a429f Merge remote-tracking branch 'origin/miami' into lcs 
* origin/miami:
  more securom fixes
  move stuff back into class; securom comments
  More font fixes
  fix
  fix CreateInstance virtual overload order
  escalator fix
  ProcessWheel bug
 2021-01-13 02:08:13 +02:00
Fire-Head
ec17355056 Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs 2021-01-13 02:55:47 +03:00
withmorten
5d4917a5d7
Merge pull request #956 from withmorten/miami 
more securom fixes
 2021-01-13 00:32:39 +01:00
withmorten
e122a75dd2 more securom fixes 2021-01-13 00:28:51 +01:00
withmorten
2b91af4493
Merge pull request #955 from withmorten/miami 
move stuff back into class; securom comments
 2021-01-13 00:22:51 +01:00
withmorten
232d990e6d move stuff back into class; securom comments 2021-01-13 00:18:58 +01:00
Sergeanur
92b1e8ab75 More font fixes 2021-01-13 01:01:04 +02:00
Nikolay Korolev
4505b8795a fix 2021-01-13 01:37:25 +03:00
Nikolay Korolev
a7ad2a7e1a sync with lcs-dev 2021-01-13 01:36:01 +03:00
Nikolay Korolev
510ad223f0 Script4.cpp 2021-01-13 01:34:49 +03:00
aap
b2ee24b549 fix CreateInstance virtual overload order 2021-01-12 23:33:44 +01:00
aap
b407f6a011 fix CreateInstance virtual overload order 2021-01-12 23:32:45 +01:00
aap
d68d1d9999 escalator fix 2021-01-12 23:29:53 +01:00
aap
faab9f4aa4 escalator fix 2021-01-12 23:28:13 +01:00
Fire-Head
39dd219fbc Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs 2021-01-13 01:18:58 +03:00
Fire-Head
660d040531 assert, temp fixes 2021-01-13 01:06:22 +03:00
aap
2088dfb3b3 ProcessWheel bug 2021-01-12 23:02:32 +01:00
aap
8858df2185 ProcessWheel bug 2021-01-12 22:58:50 +01:00
Fire-Head
3e6016dc6e Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs 2021-01-13 00:11:15 +03:00
Fire-Head
096db533a6 rem gMakeResources 2021-01-13 00:09:40 +03:00
Fire-Head
3648ef4687 lcs particle 2021-01-13 00:07:24 +03:00
Sergeanur
f73e870bde Merge remote-tracking branch 'origin/miami' into lcs 
* origin/miami:
  bug of the decade
  big oof
  colmodel fix
 2021-01-12 22:29:50 +02:00
aap
0afa027ab4 bug of the decade 2021-01-12 21:28:13 +01:00
Nikolay Korolev
e6aa9f9d4e big oof 2021-01-12 20:56:49 +03:00
Nikolay Korolev
6cfc61ac0e big oof 2021-01-12 20:54:52 +03:00
Nikolay Korolev
1c3f3c1842 script4 2021-01-12 20:52:31 +03:00
aap
55320a03f1 little cleanup of vehicle rendering 2021-01-12 14:07:24 +01:00
aap
9b2037419f mobile vehicle rendering 2021-01-12 13:41:29 +01:00
aap
99a6976f53 colmodel fix 2021-01-12 12:42:29 +01:00
Sergeanur
8888ee3974
Merge pull request #948 from Sergeanur/lcsPR/CutsceneMgr 
CutsceneMgr done + use original VB audio + make interiors visible + use hashed model info names a bit
 2021-01-12 13:22:44 +02:00
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
Sergeanur
3e6eea25b3 More fix 2021-01-12 02:15:44 +02:00
Sergeanur
2ce6e59d9b PLAY_ANNOUNCEMENT 2021-01-11 23:55:45 +02:00
Sergeanur
132a710a0a Case sensitive my ass 2021-01-11 23:50:56 +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
Sergeanur
a223157000 CutsceneMgr done + use original VB audio + make interiors visible + use hashed model info names a bit 2021-01-11 19:53:15 +02:00