Commit Graph

5619 Commits

Author SHA1 Message Date
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
erorcun
a844cbbc3d hud ammo fix 2021-01-13 23:16:25 +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
erorcun
011a9cc775 Merge branch 'master' of https://github.com/GTAmodding/re3 2021-01-13 16:54:45 +03:00
erorcun
7f15e11b1b fix save loading, hopefully 2021-01-13 16:54:36 +03:00
withmorten
dacd389799 remove scriptspath from premake 2021-01-13 14:49:21 +01:00
withmorten
e8727cf4a1
remove scriptspath from premake 2021-01-13 14:34:58 +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
6aab948be2 more renames 2021-01-13 13:41:24 +01:00
aap
2804ad2363 anim velocity union 2021-01-13 13:06:38 +01:00
aap
083aa700e9 anim velocity union 2021-01-13 13:06:31 +01:00
aap
e3a261d29c rename m_vehEnterType -> m_vehDoor 2021-01-13 13:01:20 +01:00
aap
7c3e43aa2e rename m_vehEnterType -> m_vehDoor 2021-01-13 13:01:11 +01:00
erorcun
d88a3cf558 Merge branch 'master' of https://github.com/GTAmodding/re3 2021-01-13 14:49:15 +03: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
shfil
b9dc81d600
Update README.md 2021-01-13 12:22:55 +01:00
erorcun
57201187de Fix build without FIX_BUGS, divide to 0 fixes 2021-01-13 14:22:31 +03:00
Filip Gawin
4097c20bdd Make cmake files more generic 2021-01-13 12:15:22 +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
aap
fb1bd1a5bd fix !FREE_CAM build 2021-01-13 10:48:55 +01:00
erorcun
4837969e09
Update README.md 2021-01-13 05:05:19 +03:00
shfil
ef0b2291a0
Typo 2021-01-13 02:39:53 +01:00
shfil
29172e9ee2
Update README.md 2021-01-13 02:38:50 +01:00
shfil
66b8c870f4
Update README.md 2021-01-13 02:35:05 +01: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
withmorten
6103677914 more securom fixes 2021-01-13 00:28:07 +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
005ddf26c1
Merge pull request #954 from withmorten/master
move stuff back into class; securom comments
2021-01-13 00:21:20 +01:00
withmorten
232d990e6d move stuff back into class; securom comments 2021-01-13 00:18:58 +01:00