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

2092 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sergeanur
6ad66fb2d7 Merge remote-tracking branch 'origin/master' into miami 
# Conflicts:
#	src/render/Renderer.cpp
 2020-05-06 19:32:57 +03:00
Nikolay Korolev
53107d3b71 added flag 2020-05-06 19:24:33 +03:00
Nikolay Korolev
0930d70134 IsStatic 2020-05-06 19:20:45 +03:00
Nikolay Korolev
3895853fe7
Merge pull request #517 from Nick007J/master 
IsStatic
 2020-05-06 19:18:44 +03:00
Nikolay Korolev
a24b65cbde IsStatic 2020-05-06 19:17:47 +03:00
Nikolay Korolev
d5e76471ae Merge remote-tracking branch 'upstream/miami' into miami 2020-05-06 19:04:52 +03:00
aap
f1c1f56b12 CSphere and CBox for CColModel 2020-05-06 17:56:38 +02:00
Sergeanur
fc8c28722f Merge remote-tracking branch 'origin/master' into miami 
# Conflicts:
#	src/objects/Object.h
 2020-05-06 18:24:31 +03:00
aap
a76b88da08 fixed object collision stuff at least somewhat 2020-05-06 17:17:07 +02:00
aap
c11912a8ec sorted out object collision enums 2020-05-06 17:14:34 +02:00
aap
aa12251c6b Merge branch 'master' of github.com:GTAmodding/re3 2020-05-06 17:13:53 +02:00
aap
a2b89c6a18 sorted out object collision enums 2020-05-06 17:13:46 +02:00
Sergeanur
d015e09c92 Merge branch 'master' into miami 2020-05-06 18:03:36 +03:00
Sergeanur
b633288d1b Merge remote-tracking branch 'origin/master' 2020-05-06 18:02:16 +03:00
Sergeanur
daa3b20477 Fix cAudioManager::ProcessActiveQueues loop 2020-05-06 18:01:52 +03:00
aap
224727c14d got rid of superfluous enum 2020-05-06 16:58:57 +02:00
aap
b4bbd91921 got rid of superfluous enum 2020-05-06 16:56:59 +02:00
Nikolay Korolev
bd4d5d7c47 Merge remote-tracking branch 'upstream/miami' into miami 2020-05-06 16:55:45 +03:00
Nikolay Korolev
15520fe77d
fix memory corruption 2020-05-06 16:55:04 +03:00
Nikolay Korolev
3b08efa2ad Merge remote-tracking branch 'upstream/miami' into miami 2020-05-06 16:46:33 +03:00
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