Commit Graph

5482 Commits

Author SHA1 Message Date
e9689a0a07 Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
#	src/core/re3.cpp
2021-01-23 17:54:46 +02:00
770456d0c8 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2021-01-23 16:50:55 +03:00
1b32840424 No more resetting bindings for joypad, create .ini at the first start, joystick hotplug for Linux 2021-01-23 16:18:19 +03:00
defbb01aaa Merge remote-tracking branch 'origin/lcs' into lcs
* origin/lcs:
  Remove size assert
  Add TXD mid field
  Enable GTA_BRIDGE
  LCS model indices
2021-01-23 15:14:24 +02:00
904090cbb6 Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts:
#	src/modelinfo/BaseModelInfo.cpp
2021-01-23 15:14:15 +02:00
4bde3366c1 Merge pull request #980 from Sergeanur/lcsMID
LCS model indices
2021-01-23 15:09:54 +02:00
cfac29b0ef Remove restrictions in CGame::Process 2021-01-23 15:09:34 +02:00
45c2488e36 Migrate from old .ini to new .ini 2021-01-23 16:04:19 +03:00
73f1340afb Store all settings in .INI 2021-01-23 15:59:38 +03:00
3326603265 added some missing functions 2021-01-23 15:33:01 +03:00
b5c4866964 added some missing functions 2021-01-23 15:32:07 +03:00
35258b9b9c added some missing functions 2021-01-23 15:29:00 +03:00
aap
f6fb473cf9 revert accident 2021-01-23 12:59:52 +01:00
aap
a22b6168c6 wrong path node array 2021-01-23 12:50:46 +01:00
aap
2814f2e8cf wrong path node array 2021-01-23 12:49:54 +01:00
aap
20bcd4bd69 colstore done 2021-01-23 12:40:23 +01:00
552497d71b fix 2021-01-23 14:11:57 +03:00
8d0100f100 Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-23 12:54:27 +03:00
a105003a7a I hate GetATanOfXY 2021-01-23 12:54:08 +03:00
e03aaec030 Add (Don't) walk lights 2021-01-23 04:07:50 +02:00
0aad73f4a1 Remove size assert 2021-01-23 03:39:24 +02:00
2650fa9a92 VANILLA_BUILD fixes 2021-01-23 02:17:28 +01:00
3565f179af Add TXD mid field 2021-01-23 03:12:01 +02:00
b35b0c598d Enable GTA_BRIDGE 2021-01-23 03:09:15 +02:00
6b54d04bfc LCS model indices 2021-01-23 02:56:48 +02:00
10120eb12f Merge pull request #979 from erorcun/miami
Includes overhaul, fix some compiler warnings
2021-01-23 03:34:15 +03:00
f85b5e99ed Includes overhaul, fix some compiler warnings 2021-01-23 03:23:16 +03:00
965a3d6eec Merge remote-tracking branch 'upstream/lcs' into lcs 2021-01-23 02:36:34 +03:00
917cf44def script coronas 2021-01-23 02:36:13 +03:00
c884edd923 cSmallHeap 2021-01-23 00:03:12 +02:00
6f4e2ab491 get rid of unsupported LIBRW in config.h 2021-01-22 22:47:29 +01:00
5988c0e95a fix tabs in crossplatform 2021-01-22 22:01:00 +01:00
fd461ca702 Merge branch 'master' of https://github.com/GTAmodding/re3 2021-01-22 23:59:19 +03:00
0ea72af60c Peds reporting to phone changes for GTA3D 2021-01-22 23:58:57 +03:00
6118ed89bb Merge pull request #978 from erorcun/master
No more resetting bindings for joypad, create .ini at the first start…
2021-01-22 23:54:32 +03:00
226e3b83da No more resetting bindings for joypad, create .ini at the first start, joystick hotplug for Linux 2021-01-22 23:43:49 +03:00
f6c846d27a fix 2021-01-22 21:27:18 +01:00
3b4e79f073 small fix regarding codewarrior and AUDIO_MSS 2021-01-22 21:10:49 +01:00
2e5898490c cw: remove extras folder 2021-01-22 20:44:11 +01:00
d58f090198 fix RW33 build, undef ANISOTROPIC_FILTERING for vanilla build 2021-01-22 20:33:29 +01:00
e9adf8162b fix 2021-01-22 19:59:27 +01:00
a034661bc9 Merge branch 'master' of github.com:GTAmodding/re3 2021-01-22 19:55:07 +01:00
609cad506f Better output for validating size assert 2021-01-22 19:54:43 +01:00
950a3e82c1 cw: fix linking order 2021-01-22 19:35:24 +01:00
bdb216bf7c fix 2021-01-22 20:59:57 +03:00
e019bd91fd Reenable PS2_AUDIO_PATHS 2021-01-22 19:46:50 +02:00
ea916b6ae5 Merge remote-tracking branch 'origin/miami' into lcs
* origin/miami:
  fix config.h
  small premake fix
2021-01-22 19:45:58 +02:00
cc6d5374d5 fix config.h 2021-01-22 18:41:58 +01:00
ba0b06f268 small premake fix 2021-01-22 16:40:17 +01:00
1d3e84b712 small premake fix 2021-01-22 16:39:28 +01:00