Nikolay Korolev
|
4d06271a29
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-06 15:30:56 +03:00 |
|
aap
|
600cbee7d4
|
Merge branch 'miami' of github.com:GTAmodding/re3 into miami
|
2020-05-06 14:28:05 +02:00 |
|
aap
|
13c24a310d
|
little cworld bugfix
|
2020-05-06 14:27:57 +02:00 |
|
aap
|
7c356b08e6
|
little cworld bugfix
|
2020-05-06 14:27:41 +02:00 |
|
Nikolay Korolev
|
8c036ec671
|
sync with master
|
2020-05-06 14:42:41 +03:00 |
|
Sergeanur
|
c0488d9ecf
|
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/control/Script.cpp
# src/core/FileLoader.cpp
# src/core/User.cpp
# src/core/ZoneCull.cpp
# src/core/Zones.cpp
# src/core/Zones.h
# src/entities/Entity.cpp
|
2020-05-06 14:10:52 +03:00 |
|
aap
|
e0568a19d5
|
new zone stuff
|
2020-05-06 12:23:57 +02:00 |
|
aap
|
cbfc45b3f7
|
some work on zones
|
2020-05-06 12:23:26 +02:00 |
|
Nikolay Korolev
|
98177f27ba
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-06 11:38:02 +03:00 |
|
aap
|
31f9bb566b
|
implemented most of timecycle and mblur
|
2020-05-06 00:53:26 +02:00 |
|
Nikolay Korolev
|
a7036475c3
|
not needed
|
2020-05-06 01:16:54 +03:00 |
|
Nikolay Korolev
|
e5da4c2b4d
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-06 01:11:18 +03:00 |
|
Nikolay Korolev
|
0b104a59fe
|
script colstore stuff
|
2020-05-06 01:11:06 +03:00 |
|
aap
|
68d3ea9c42
|
getting the vice city map to work
|
2020-05-05 23:27:43 +02:00 |
|
Nikolay Korolev
|
35bf340401
|
colstore support in script
|
2020-05-06 00:21:26 +03:00 |
|
Nikolay Korolev
|
f45ea0a1cf
|
Merge remote-tracking branch 'upstream/miami' into miami
|
2020-05-05 20:22:17 +03:00 |
|
Nikolay Korolev
|
918d6dbf56
|
some more miami
|
2020-05-05 20:22:13 +03:00 |
|
aap
|
7428590457
|
some miami limits
|
2020-05-05 18:31:53 +02:00 |
|
aap
|
e81652c2fc
|
cleaned up MIAMI ifdefs
|
2020-05-05 18:06:38 +02:00 |
|
Sergeanur
|
22e8b0e419
|
Revert "Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULL"
This reverts commit 1eb817de77 .
# Conflicts:
# src/core/Game.cpp
|
2020-05-05 18:34:46 +03:00 |
|
Sergeanur
|
12fbf8cede
|
Merge branch 'master' into miami
# Conflicts:
# src/core/Game.cpp
|
2020-05-05 18:33:32 +03:00 |
|
Sergeanur
|
1eb817de77
|
Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULL
|
2020-05-05 18:32:46 +03:00 |
|
Nikolay Korolev
|
edeb8736f1
|
remove ifdefs
|
2020-05-05 18:20:10 +03:00 |
|
Sergeanur
|
0163a7bc46
|
Remove ColStore
|
2020-05-05 18:13:46 +03:00 |
|
Sergeanur
|
c2b9ddc5b8
|
Revert "Remove Miami stuff"
This reverts commit 9960c41193 .
|
2020-05-05 18:04:43 +03:00 |
|
Sergeanur
|
9960c41193
|
Remove Miami stuff
|
2020-05-05 18:04:18 +03:00 |
|
Sergeanur
|
dfe0642195
|
Merge pull request #512 from Nick007J/master
MIAMI CAutoPilot + CCarAI + multiple fixes
|
2020-05-05 17:14:13 +03:00 |
|
aap
|
b3b9be5e8c
|
merged master
|
2020-05-05 14:21:13 +02:00 |
|
Sergeanur
|
4cc1bb92e7
|
Make CBaseModelInfo fields protected
|
2020-05-05 15:06:55 +03:00 |
|
aap
|
fd462c9b55
|
implemented most of streamed collisions and big buildings
|
2020-05-05 14:00:20 +02:00 |
|
Sergeanur
|
e9b334d7bf
|
More use of GetModelIndex
|
2020-05-05 14:48:35 +03:00 |
|
Nikolay Korolev
|
ee261c996b
|
Merge remote-tracking branch 'upstream/master'
|
2020-05-05 14:40:56 +03:00 |
|
Nikolay Korolev
|
ae0c83fa01
|
CAutoPilot + CCarAI + fixes
|
2020-05-05 14:40:35 +03:00 |
|
aap
|
b44df26d3e
|
implemented most of streamed collisions and big buildings
|
2020-05-05 13:02:42 +02:00 |
|
Sergeanur
|
84c9484e55
|
SetPosition, final part
|
2020-05-05 04:45:18 +03:00 |
|
aap
|
a073dda5ec
|
GTA_ZONECULL define
|
2020-05-03 17:44:10 +02:00 |
|
aap
|
67467f15d1
|
GTA_BRIDGE and GTA_TRAIN defines
|
2020-05-03 17:28:54 +02:00 |
|
aap
|
702da55ec9
|
implemented most of vice city path system
|
2020-05-03 16:09:37 +02:00 |
|
Sergeanur
|
ff4af35292
|
Fix pad Y axis
|
2020-05-03 01:42:05 +03:00 |
|
Sergeanur
|
7fc33d85f7
|
Merge pull request #504 from Sergeanur/PadInputSwitch
Switching pad modes and cheats when player is switching between controller and kb&m
|
2020-05-03 00:12:54 +03:00 |
|
Sergeanur
|
d2712afc78
|
Add CURMODE macro
|
2020-05-03 00:11:02 +03:00 |
|
Sergeanur
|
9d600802fa
|
Revert "Disable PED_SKIN for now"
This reverts commit d51bf48dcd .
|
2020-05-02 23:52:41 +03:00 |
|
Nikolay Korolev
|
b095bc1b5a
|
Merge remote-tracking branch 'upstream/master'
|
2020-05-02 21:31:41 +03:00 |
|
Sergeanur
|
52a13e3301
|
Fix number of unique jumps in stat menu
|
2020-05-02 21:28:44 +03:00 |
|
Sergeanur
|
ba8aa38654
|
Switching pad modes and cheats when player is switching between controller and kb&m
|
2020-05-02 19:39:36 +03:00 |
|
Sergeanur
|
d51bf48dcd
|
Disable PED_SKIN for now
|
2020-05-02 19:13:51 +03:00 |
|
Nikolay Korolev
|
7d067684ff
|
Merge remote-tracking branch 'upstream/master'
|
2020-05-02 18:02:45 +03:00 |
|
Nikolay Korolev
|
f372ce156d
|
changed saving compatibility
|
2020-05-02 18:02:17 +03:00 |
|
Sergeanur
|
52390062b3
|
SetPosition, part 2
|
2020-05-02 15:28:19 +03:00 |
|
Sergeanur
|
d23b2c423e
|
SetPosition, part 1
|
2020-05-02 15:13:09 +03:00 |
|
rollschuh2282
|
ccf7ebca9a
|
fixed the CIRCLE_BACK_BUTTON define.
|
2020-05-02 12:58:12 +02:00 |
|
Nikolay Korolev
|
5a916c16b7
|
Merge remote-tracking branch 'upstream/master'
|
2020-05-02 11:26:26 +03:00 |
|
aap
|
339365806a
|
update librw (vsynch)
|
2020-05-02 10:08:58 +02:00 |
|
Nikolay Korolev
|
026ed72bfc
|
Merge remote-tracking branch 'upstream/master'
|
2020-05-01 21:23:09 +03:00 |
|
eray orçunus
|
97b288c1e4
|
Screen mode selector and persistent map target fix
|
2020-05-01 21:16:02 +03:00 |
|
Nikolay Korolev
|
79d66b7910
|
Merge remote-tracking branch 'upstream/master'
|
2020-05-01 13:46:36 +03:00 |
|
aap
|
56cb586f15
|
Merge pull request #499 from aap/master
Better handling of video modes, windowed mode, fixes to glfw
|
2020-05-01 08:43:35 +02:00 |
|
Nikolay Korolev
|
063bf51bf1
|
updated get/set
|
2020-04-30 22:04:07 +03:00 |
|
Nikolay Korolev
|
dc12718fc2
|
Merge remote-tracking branch 'upstream/master'
|
2020-04-30 21:41:20 +03:00 |
|
Sergeanur
|
94acee8580
|
Fix MakeSureSlotInObjectPoolIsEmpty
|
2020-04-30 16:52:37 +03:00 |
|
Sergeanur
|
7d758f3a9f
|
Adding getters and setters for type and status
|
2020-04-30 16:45:45 +03:00 |
|
aap
|
9950d105f7
|
Merge branch 'master' of github.com:gtamodding/re3
|
2020-04-30 10:17:26 +02:00 |
|
Sergeanur
|
080689589c
|
Jap fixes
|
2020-04-30 02:27:15 +03:00 |
|
Nikolay Korolev
|
38655693f5
|
Merge remote-tracking branch 'upstream/master'
|
2020-04-29 21:56:25 +03:00 |
|
aap
|
3580e31ce0
|
Merge branch 'master' of github.com:gtamodding/re3
|
2020-04-29 20:53:54 +02:00 |
|
aap
|
804b022e67
|
implemented improved video modes for win.cpp
|
2020-04-29 18:24:25 +02:00 |
|
eray orçunus
|
fdb1580e15
|
Mouse wheel fix
|
2020-04-29 18:53:05 +03:00 |
|
Nikolay Korolev
|
1e78278b5a
|
Merge remote-tracking branch 'upstream/master'
|
2020-04-29 11:44:33 +03:00 |
|
aap
|
4e630a1a38
|
Merge pull request #495 from Sergeanur/MoreLanguages
Japanese support
|
2020-04-29 10:26:36 +02:00 |
|
Nikolay Korolev
|
d8371dcf80
|
Merge remote-tracking branch 'upstream/master'
|
2020-04-28 12:16:50 +03:00 |
|
Nikolay Korolev
|
d921871a88
|
Allow keyboard controls for flying cheats
|
2020-04-28 12:05:52 +03:00 |
|
Nikolay Korolev
|
fcf9011601
|
Merge remote-tracking branch 'upstream/master'
|
2020-04-28 00:47:47 +03:00 |
|
Sergeanur
|
fe353a7cc9
|
Fixes
|
2020-04-27 22:41:09 +03:00 |
|
aap
|
f399fd1050
|
little support for gl3 textures; txd.img enabled again
|
2020-04-27 20:56:44 +02:00 |
|
Nikolay Korolev
|
a38a867cc5
|
sync with upstream
|
2020-04-27 00:55:22 +03:00 |
|
Nikolay Korolev
|
74fde1397e
|
pools compatibility
|
2020-04-27 00:54:43 +03:00 |
|
Nikolay Korolev
|
68bf239868
|
Merge pull request #489 from Nick007J/master
1.1 patch stuff + flying controls
|
2020-04-27 00:53:54 +03:00 |
|
aap
|
e467cb08b8
|
Merge branch 'master' of github.com:gtamodding/re3
|
2020-04-26 21:51:11 +02:00 |
|
aap
|
1b5616688e
|
tried to fix some half-pixel bugs
|
2020-04-26 21:50:52 +02:00 |
|
Sergeanur
|
f0890b1112
|
Merge branch 'master' into MoreLanguages
# Conflicts:
# src/core/Frontend.cpp
# src/core/MenuScreens.h
# src/render/Font.cpp
# src/render/Font.h
# src/text/Messages.cpp
# src/text/Text.cpp
|
2020-04-26 22:03:15 +03:00 |
|
Sergeanur
|
4dc2f30791
|
Remove little hack
|
2020-04-26 21:58:12 +03:00 |
|
Sergeanur
|
b7ee3792df
|
Remove struct workaround in CControllerConfigManager
|
2020-04-26 20:11:19 +03:00 |
|
Sergeanur
|
1a44bcccd5
|
A few fixes
|
2020-04-26 14:18:34 +03:00 |
|
eray orçunus
|
6c1a1f7cd2
|
Initial GLFW support
|
2020-04-26 13:29:50 +03:00 |
|
Nikolay Korolev
|
ae8deff131
|
helis done + cheats
|
2020-04-25 21:25:14 +03:00 |
|
Nikolay Korolev
|
7ddfc40675
|
Merge remote-tracking branch 'upstream/master'
|
2020-04-25 16:48:03 +03:00 |
|
aap
|
f15a5ac0f9
|
using librw GS alpha test emulation
|
2020-04-25 12:16:50 +02:00 |
|
Nikolay Korolev
|
bb14d9689f
|
Merge remote-tracking branch 'upstream/master'
|
2020-04-25 12:26:37 +03:00 |
|
Nikolay Korolev
|
2be2899034
|
Merge remote-tracking branch 'upstream/master'
|
2020-04-25 12:25:40 +03:00 |
|
Nikolay Korolev
|
34ef766c67
|
Merge remote-tracking branch 'upstream/master'
|
2020-04-25 12:15:29 +03:00 |
|
aap
|
ac19de45b8
|
few fixes
|
2020-04-25 00:41:17 +02:00 |
|
aap
|
5bb4e99926
|
implemented debugmenu
|
2020-04-24 14:08:06 +02:00 |
|
aap
|
f03b4eec4c
|
implemented skinned peds, no cutscene hands yet
|
2020-04-24 11:42:38 +02:00 |
|
aap
|
6467e2003a
|
Merge branch 'master' of github.com:gtamodding/re3
|
2020-04-23 22:10:46 +02:00 |
|
Nikolay Korolev
|
05ddc80ea2
|
Merge remote-tracking branch 'upstream/master'
|
2020-04-23 19:12:20 +03:00 |
|
Fire_Head
|
ff46dc1c6c
|
Merge branch 'master' into master
|
2020-04-23 11:50:06 +03:00 |
|
Fire-Head
|
75acd78190
|
ps2 particles, sampman oal started
|
2020-04-23 11:24:03 +03:00 |
|
eray orçunus
|
c80403a2e0
|
Crossplatform work continues
|
2020-04-22 05:24:02 +03:00 |
|
aap
|
959f84ff95
|
fixed extra directory issues
|
2020-04-21 13:56:33 +02:00 |
|
Nikolay Korolev
|
7cc3410846
|
Merge remote-tracking branch 'upstream/master'
|
2020-04-21 11:55:39 +03:00 |
|