mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-11-16 23:38:59 +00:00
Code Issues Projects Releases Wiki Activity
2022 commits 3 branches 0 tags 63 MiB
Commit graph

2022 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sergeanur
bb55430f75 Merge remote-tracking branch 'origin/master' into miami 2020-05-06 16:44:30 +03:00
aap
13522259b8 fix for radar 2020-05-06 15:41:40 +02:00
Nikolay Korolev
88076a0050 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-06 15:45:13 +03:00
aap
25a4091fa8 setting some areas so objects dont disappear 2020-05-06 14:43:23 +02:00
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
bb8b6348ec Fix appveyor 2020-05-06 14:11:21 +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
aa8968ecf2 updating librw because of fuckup 2020-05-06 09:59:36 +02:00
aap
edd9301d7f reverting fuckup 2020-05-06 09:59:04 +02:00
aap
8e84728f41 Merge branch 'master' of github.com:GTAmodding/re3 2020-05-06 09:24:18 +02:00
aap
bb0541404d updated librw 2020-05-06 09:24:12 +02:00
aap
ed021431e9 updated librw 2020-05-06 09:23:31 +02: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
f0896ceba7 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-05 21:46:00 +03:00
Nikolay Korolev
1291dd534b script stuff 2020-05-05 21:45:43 +03:00
Sergeanur
0b61ae11ec Fix appveyour 2020-05-05 21:05:51 +03:00
Sergeanur
a02b4c9592 Merge branch 'master' into miami 2020-05-05 20:54:54 +03:00
Sergeanur
42a64a2379 appveyor update 2020-05-05 20:54:44 +03:00
Sergeanur
3adf740bd5 Remove audio from premake 2020-05-05 20:51:23 +03:00
Sergeanur
4bd4d24802 Merge branch 'master' into miami 
# Conflicts:
#	premake5.lua
 2020-05-05 20:42:11 +03:00
Sergeanur
52907088f9 Fix build status and don't add random files into the project 2020-05-05 20:40:27 +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
559ad5c5e2 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami 2020-05-05 18:07:45 +02:00
Nikolay Korolev
3e18b92ccc
Merge pull request #515 from Nick007J/miami 
skipped one def
 2020-05-05 19:07:28 +03:00
aap
e81652c2fc cleaned up MIAMI ifdefs 2020-05-05 18:06:38 +02:00
Nikolay Korolev
6b4b708fa7 skipped one def 2020-05-05 19:06:24 +03: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
aap
2c0b82ec1a
Merge pull request #514 from Nick007J/miami 
remove ifdefs
 2020-05-05 17:23:23 +02:00
Nikolay Korolev
2a29c6c214 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-05 18:20:37 +03:00
Nikolay Korolev
edeb8736f1 remove ifdefs 2020-05-05 18:20:10 +03:00
Sergeanur
7afa4f8316 Revert "Remove ColStore" 
This reverts commit 0163a7bc46.
 2020-05-05 18:14:31 +03:00
Sergeanur
0aab36c5a7 Merge branch 'master' into miami 2020-05-05 18:14:19 +03:00
Sergeanur
0163a7bc46 Remove ColStore 2020-05-05 18:13:46 +03:00
Sergeanur
cb8ffbac73 Revert "Remove #endif" 
This reverts commit 7200a783ee.
 2020-05-05 18:07:43 +03:00