mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-11-30 06:15:40 +00:00
Code Issues Projects Releases Wiki Activity
4767 commits 3 branches 0 tags 63 MiB
Commit graph

4767 commits

This branch
This branch
All branches
Author SHA1 Message Date
Fire-Head
efae5d6a69 Merge branch 'lcs' of github.com:Fire-Head/re3 into lcs 2021-01-15 19:13:56 +03:00
Fire-Head
8989b5ea39 Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs 2021-01-15 19:13:05 +03:00
Sergeanur
4bd7bafd7c Merge branch 'miami' into lcs 
# Conflicts:
#	.github/workflows/reLCS_msvc_amd64.yml
#	.github/workflows/reLCS_msvc_x86.yml
#	premake5.lua
#	src/control/Script2.cpp
#	src/control/Script8.cpp
 2021-01-15 17:57:35 +02:00
Sergeanur
19749effce Fix Jumbo Sound reseting when walking 2021-01-15 17:54:21 +02:00
withmorten
d5ce8b1ea3 add the bad crack "features" behind SECUROM define 2021-01-14 23:16:42 +01:00
Filip Gawin
7541fa7cb7 Revert extra checks before autolinking 2021-01-14 22:26:36 +01:00
Filip Gawin
5acbf9ef59 fix 2021-01-14 22:20:40 +01:00
Filip Gawin
1082b13830 RE3_NO_AUTOLINK to CMAKE_NO_AUTOLINK 2021-01-14 22:15:36 +01:00
Filip Gawin
a0a88b4663 Merge branch 'miami' of github.com:GTAmodding/re3 into miami 2021-01-14 22:06:43 +01:00
Filip Gawin
c7b905c0ec More checks before autolinking 2021-01-14 22:06:27 +01:00
Nikolay Korolev
8b6bcef4b7 Merge branch 'lcs' into lcs-dev 2021-01-14 23:21:43 +03:00
Nikolay Korolev
c00ebef329 incoming "fuck" commit 2021-01-14 23:21:17 +03:00
Nikolay Korolev
0b0d286f5c incoming "fuck" commit 2021-01-14 23:15:12 +03:00
shfil
42df203389
Fix(?) 2021-01-14 18:26:51 +01:00
Filip Gawin
70358d90b4 Backport fix from re3 2021-01-14 15:30:33 +01:00
Filip Gawin
57cc70c6af Update FindX files 2021-01-14 15:22:02 +01:00
Filip Gawin
85f93ef135 Get rid of travis 2021-01-14 15:05:49 +01:00
Filip Gawin
40d3a900a0 Fix 2021-01-14 15:05:27 +01:00
Filip Gawin
7c8933f8c4 Port conan to miami 2021-01-14 15:03:54 +01:00
Nikolay Korolev
6a93cc49be fix 2021-01-14 00:15:45 +03:00
Fire-Head
8baa104453 Revert "Revert "Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs"" 
This reverts commit 97c9a4a02c.
 2021-01-13 23:17:53 +03:00
Fire-Head
97c9a4a02c Revert "Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs" 
This reverts commit d63e3f1559, reversing
changes made to ec17355056.
 2021-01-13 23:15:33 +03:00
erorcun
13b52229be hud ammo fix 2021-01-13 23:07:12 +03:00
aap
ab14a0bc61 foobar 2021-01-13 20:40:20 +01:00
aap
3a6935f126 fixed shoot through collision 2021-01-13 20:39:00 +01:00
aap
7994b80dcf fixed weapon LOS check 2021-01-13 20:10:04 +01:00
Nikolay Korolev
9f914dcd10 Merge remote-tracking branch 'upstream/miami' into miami 2021-01-13 22:03:21 +03:00
Nikolay Korolev
daf1de550c fix 2021-01-13 22:02:28 +03:00
Nikolay Korolev
a9ab3ea5b4 fix 2021-01-13 20:55:54 +03:00
Fire-Head
d63e3f1559 Merge branch 'lcs' of https://github.com/GTAmodding/re3 into lcs 2021-01-13 20:18:26 +03:00
Nikolay Korolev
7388cc8a78 Merge branch 'lcs' into lcs-dev 2021-01-13 19:47:00 +03:00
withmorten
d1b2dd2831 remove scriptspath from premake 2021-01-13 14:59:30 +01:00
withmorten
dacd389799 remove scriptspath from premake 2021-01-13 14:49:21 +01:00
aap
361808923a arrest cam fixes 2021-01-13 14:16:38 +01:00
Nikolay Korolev
3e198086e3 some script 2021-01-13 16:01:49 +03:00
shfil
49c8292e48
Fix target's name 2021-01-13 14:00:34 +01:00
Sergeanur
ff057838ec Merge branch 'miami' into lcs 
* miami:
  Fix backface culling of cutscene objects
  more renames
  anim velocity union
  rename m_vehEnterType -> m_vehDoor
  Port cmake improvements to miami
  some loose ends
  move TODO to Readme
  Fix build without FIX_BUGS, divide to 0 fixes
 2021-01-13 14:56:25 +02:00
Sergeanur
0e9a44dd43 Fix backface culling of cutscene objects 2021-01-13 14:55:55 +02:00
aap
ac3ba5b4a6 more renames 2021-01-13 13:41:31 +01:00
aap
2804ad2363 anim velocity union 2021-01-13 13:06:38 +01:00
aap
e3a261d29c rename m_vehEnterType -> m_vehDoor 2021-01-13 13:01:20 +01:00
Filip Gawin
4741afd2cf Port cmake improvements to miami 2021-01-13 12:45:10 +01:00
aap
1b55a9956f some loose ends 2021-01-13 12:31:33 +01:00
erorcun
679755de35
Merge pull request #957 from erorcun/miami 
Fix build without FIX_BUGS, divide to 0 fixes
 2021-01-13 14:03:48 +03:00
erorcun
3553f467b2
move TODO to Readme 2021-01-13 03:50:59 +03:00
erorcun
542a5393ac Fix build without FIX_BUGS, divide to 0 fixes 2021-01-13 03:08:50 +03:00
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