Commit Graph

3561 Commits

Author SHA1 Message Date
c3647ee51e rem comment 2020-04-15 20:34:58 +03:00
cb4e1d68e7 glass NULL->nil 2020-04-15 20:09:51 +03:00
708d247c98 'fix' fix 2020-04-15 19:53:08 +03:00
85fe445fef weapon cosmetic fix 2020-04-15 19:43:16 +03:00
e132c3fada Merge pull request #416 from saml1er/PedPath
CPedPath complete
2020-04-15 19:29:17 +03:00
647cfbfd45 Merge pull request #446 from erorcun/erorcun
Many fixes and cleanup
2020-04-15 19:22:28 +03:00
4da1879975 Many fixes and cleanup 2020-04-15 19:19:45 +03:00
1d8484ed7d fix 2020-04-15 17:36:38 +03:00
aap
eccc4a3a5b fixed bug and weirdness in CHeli 2020-04-15 16:17:18 +02:00
aap
d7eee5c130 fixed clouds and sprites 2020-04-15 15:26:55 +02:00
aap
90be379bed implemented most of librw wrapper 2020-04-15 14:05:40 +02:00
27c9f7bc88 Merge remote-tracking branch 'origin/master' into MoreLanguages 2020-04-15 10:54:15 +03:00
7c13d72edc Update Weapon.cpp 2020-04-15 08:13:46 +03:00
daed13485e CWeapon done, ps2 cheats fix 2020-04-15 08:03:53 +03:00
f7f4e44c34 Merge branch 'master' into garages_dev 2020-04-15 01:07:17 +03:00
b354a72de1 Merge remote-tracking branch 'upstream/master' 2020-04-15 01:06:56 +03:00
b657a8e17c bullet info 2020-04-15 01:06:32 +03:00
70b51d42f4 fixed crash 2020-04-15 00:33:55 +03:00
e373d0526e Merge branch 'master' into MoreLanguages
# Conflicts:
#	src/core/Frontend.cpp
#	src/render/Font.cpp
#	src/render/Hud.cpp
#	src/render/Hud.h
#	src/text/Messages.cpp
#	src/text/Text.cpp
2020-04-15 00:10:50 +03:00
6d5464b6bb CPedPath improvements 2020-04-14 23:32:15 +05:00
f35d2721f5 fix 2020-04-14 20:16:02 +03:00
fbed2c4530 fix debug stuff 2020-04-14 20:12:26 +03:00
f2c78e4bfb Merge branch 'master' into game_dev 2020-04-14 20:10:39 +03:00
21a11fd343 scene edit 2020-04-14 20:09:42 +03:00
6d934892ec RwMatFX support with linked RW libs 2020-04-14 18:35:07 +03:00
eb0b9f6255 fix CTheCarGenerators::SaveAllCarGenerators 2020-04-14 17:24:31 +03:00
9a7b833aa5 Added missing audio ctors 2020-04-14 17:13:38 +03:00
bf040c7cd1 Remove float casts 2020-04-14 17:05:51 +05:00
8bb23ca5d4 Refactor CPedPath::CalcPedRoute 2020-04-14 16:57:28 +05:00
41d42a3e53 Merge pull request #414 from ShFil119/audio17
Finish audio
2020-04-14 13:01:40 +02:00
b4d5d5249c CPedPath complete 2020-04-14 15:45:47 +05:00
a19fa8764f CarGen, Cranes, Gangs: cleanup, fixes, r* visioned placement 2020-04-14 13:08:03 +03:00
7f8a4b4867 Debug font and CProfiles 2020-04-14 10:31:37 +03:00
313f547860 Some cleanup 2020-04-14 03:21:16 +03:00
f54c83c0b5 Merge branch 'master' into game_dev 2020-04-14 01:18:53 +03:00
2e20e040cc Merge pull request #403 from saml1er/roadblocks
CRoadBlocks complete
2020-04-14 00:11:39 +02:00
aa3b7869e5 Merge pull request #406 from Nick007J/master
Pools load/save
2020-04-14 00:11:22 +02:00
60eb60de4e Use NUMROADBLOCKS enum member in CRoadBlocks 2020-04-14 02:13:00 +05:00
906133d3be fix garages 2020-04-13 22:43:41 +03:00
304b574eba added missing break 2020-04-13 22:25:24 +03:00
2709447073 Merge remote-tracking branch 'upstream/master' 2020-04-13 22:17:42 +03:00
c21529467a fixed record 2020-04-13 22:16:51 +03:00
67055c1fbb Cleanup cAudioManager::ProcessRainOnVehicle a bit 2020-04-13 21:13:07 +02:00
12d36d8710 fixed record 2020-04-13 22:12:41 +03:00
1c592c26f9 review fix 2020-04-13 21:57:13 +03:00
3b0cd93f89 Merge remote-tracking branch 'upstream/master' 2020-04-13 21:54:25 +03:00
cb85091d34 scene edit 2020-04-13 21:50:56 +03:00
0e056a8e01 Merge pull request #412 from whampson/save-stuff
GenericLoad() done
2020-04-13 21:49:57 +03:00
3b9f1255af Finish audio code 2020-04-13 20:30:18 +02:00
a19d5dbee1 Fixes 2020-04-13 11:20:57 -07:00