1
0
mirror of https://github.com/rwengine/openrw.git synced 2024-11-23 02:42:39 +01:00
Commit Graph

618 Commits

Author SHA1 Message Date
Daniel Evans
ebc312bc9e Merge pull request #198 from JayFoxRox/seats
Refactor seat storage, fixes entering wrong seat
2016-08-12 19:27:05 +01:00
Jannik Vogel
b0a2e79599 Refactor seat storage, fixes entering wrong seat 2016-08-12 16:39:29 +02:00
Jannik Vogel
a70931ee7c Remove screen-door fade-in effect 2016-08-12 15:57:17 +02:00
Jannik Vogel
778ca63803 Script: Initialize globals from SCMFile 2016-08-12 02:14:15 +02:00
Jannik Vogel
6277d7981b Script: Refactor player_near_point script functions 0xF5 - 0xFA 2016-08-12 02:14:15 +02:00
Jannik Vogel
f82beeefac Avoid error in substr if short modelname in LOD selection 2016-08-12 02:14:15 +02:00
Jannik Vogel
f591c66422 Avoid crash if scriptOnMissionFlag is not linked 2016-08-12 02:14:15 +02:00
Jannik Vogel
571fd08631 Replace strcasecmp with boost::iequals 2016-08-12 02:14:15 +02:00
Jannik Vogel
cb347143f8 Cleanup: Replace non-std C++ code 2016-08-12 02:14:15 +02:00
Jannik Vogel
bda0107bb1 Cleanup: include-what-you-use 2016-08-12 02:14:15 +02:00
Jannik Vogel
9d34a16fbc Cleanup: Remove empty FileArchive.hpp 2016-08-12 02:14:15 +02:00
Jannik Vogel
623e3c16a5 Fix Bullet #include paths 2016-08-12 02:14:15 +02:00
Daniel Evans
6ad05a3110 Remove unused UnimplementedOpcode exception 2016-08-12 01:02:24 +01:00
Daniel Evans
8a985309f9 Remove breakpoint system from ScriptMachine 2016-08-12 01:02:24 +01:00
Daniel Evans
0a982c1fca Remove useless include 2016-08-12 01:02:24 +01:00
Daniel Evans
d414991d68 Correct script include guards 2016-08-12 01:02:24 +01:00
Daniel Evans
d9aded5415 Cleanup SCMFile 2016-08-12 01:02:24 +01:00
Daniel Evans
81c1bb947d Improve debug output of script 2016-08-12 01:02:24 +01:00
Daniel Evans
d8841c7561 Remove include directory from rwengine for consistency 2016-08-07 14:41:45 +01:00
Daniel Evans
85b24231f5 Don't glob for files in rwengine CMakeLists.txt 2016-08-07 14:30:21 +01:00
darkf
0242868caa Use boost::make_iterator_range, as older boost lacks ranges in filesystem iterators 2016-08-06 08:43:28 -07:00
darkf
62532107ee Rewrite SaveGame::getAllSaveGameInfo to use boost::filesystem 2016-08-03 18:31:47 -07:00
darkf
40705a6666 Rewrite findPathRealCase to use boost::filesystem, move it to FileIndex 2016-08-03 18:31:47 -07:00
Timmy Sjöstedt
756ddf2df2 Removed GL_ARB_explicit_attrib_location extension 2016-08-03 19:00:20 +02:00
Timmy Sjöstedt
1500b6acbb Removed GL_ARB_uniform_buffer_object extension 2016-08-03 18:56:50 +02:00
darkf
6d6d772653 Open binary files in binary mode 2016-08-02 04:38:35 -07:00
darkf
77ca9054c6 De-initialize OpenAL 2016-08-02 04:38:34 -07:00
darkf
a574649dce Silence a lot of warnings 2016-08-02 04:31:12 -07:00
Daniel Evans
f3151fe0b7 Merge pull request #166 from danhedron/feature/input-improvements
Seperate Input state from binding
2016-08-01 20:06:37 +01:00
Daniel Evans
c48bc26c1e Merge pull request #158 from danhedron/feature/physics-overhaul-1
MotionStates & physics cleanup
2016-08-01 19:32:30 +01:00
haphzd
114abe2286 Windows/MinGW-W64 compatibility 2016-07-28 14:46:48 +03:00
Daniel Evans
c2fc2359e3 Add primitive sprint behaviour 2016-07-02 20:51:30 +01:00
Daniel Evans
91428fbff1 Use input state for player movement 2016-07-02 20:51:30 +01:00
Daniel Evans
cf2347ba02 Disable un-latching of vehicle parts during damage
The implementation currently causes crashes when vehicles are deleted
2016-07-02 20:37:05 +01:00
Daniel Evans
21d103642e Add bullet motion states for dynamic vehicle parts 2016-07-02 20:37:04 +01:00
Daniel Evans
f860e4c9a7 Overhaul object transformation handling
Objects must now write back to their position and rotations using
updateTransform(position, rotation) to updae their transform. This
allows the getPosition and getRotation methods to become non virtual
2016-07-02 20:37:04 +01:00
Daniel Evans
b3fe87c2ea Clean up CollisionInstance and some of VehicleObject 2016-07-02 20:37:04 +01:00
Daniel Evans
280f83ecc7 Remove defunct grid code 2016-07-02 20:33:25 +01:00
Daniel Evans
cd0a11d899 Merge pull request #164 from JayFoxRox/fix-taxi
Stub Taxi-Mission
2016-07-02 17:51:04 +01:00
Daniel Evans
50e059daf0 Add GameInputState to store all control state 2016-07-02 17:23:01 +01:00
Daniel Evans
600333e20b Merge pull request #159 from danhedron/feature/traffic-vehicles
Parked traffic and out-of-view spawning
2016-06-29 23:04:00 +01:00
Daniel Evans
30e4a7faf1 Merge pull request #137 from haphzd/patch-1
File loading improvements
2016-06-29 22:26:58 +01:00
Jannik Vogel
7deeda71f5 Script: Fix 01D3 (game_character_exit_vehicle) 2016-06-29 21:06:08 +02:00
Jannik Vogel
86afe4761a Script: 01AC (Is Vehicle Stopped in volume) 2016-06-29 21:06:08 +02:00
Jannik Vogel
6491acf035 Script: 01FB (Sqrt) and 0209 (Random Int in Range) 2016-06-29 21:06:08 +02:00
Jannik Vogel
bb3b879848 Script: 0291 (Set Character Attack When Provoked) 2016-06-29 21:06:08 +02:00
Jannik Vogel
ec2e70e3bf Script: 0216 (Set Taxi Available Light) 2016-06-29 21:06:08 +02:00
Jannik Vogel
27ba6756dd Script: 020F (Turn Character to Face Player) 2016-06-29 21:06:08 +02:00
Jannik Vogel
5895fca398 Script: 0365 (Set Character Objective to Hail Taxi) 2016-06-29 21:06:08 +02:00
Jannik Vogel
159f2463ef Script: 0319 (Set Character Running) 2016-06-29 21:06:08 +02:00
Jannik Vogel
cbd5637fdd Script: 02DD (Get Random Character In Zone) 2016-06-29 21:06:08 +02:00
Jannik Vogel
81b5dd2f36 Script: 0185 (Is Vehicle Health Greater Than) 2016-06-28 15:30:29 +02:00
Jannik Vogel
88e205df7f Script: 00FD (Is Player in Vehicle Near Character) 2016-06-28 15:30:29 +02:00
Jannik Vogel
bac779b53d Script: 00A0 (Get Character Position) 2016-06-28 15:30:29 +02:00
Jannik Vogel
e5e3ed7b1e Script: 0315 (Increment Taxi Dropoffs) and 0316 (Register Taxi Money) 2016-06-28 15:30:29 +02:00
Jannik Vogel
d3c70140cf Script: 018C (Play Sound At) 2016-06-28 02:39:00 +02:00
Jannik Vogel
d1131a63a8 Add isStopped() in VehicleObject and CharacterObject 2016-06-28 02:39:00 +02:00
Daniel Evans
b6d8618e6f Spawn at ground level if vehicle generator z is < -90 2016-06-27 23:37:47 +01:00
Daniel Evans
d2ec218f89 Restore vehicle generators from save data 2016-06-27 22:55:13 +01:00
Daniel Evans
69e7d32f3a Use view frustum for traffic spawning and cleanup 2016-06-27 22:33:22 +01:00
Daniel Evans
50eee4e5ff Implement static VehicleGenerator traffic 2016-06-27 22:33:22 +01:00
Jannik Vogel
c5083701ea Script: 036D (Print Big With 2 Numbers) 2016-06-27 02:05:34 +02:00
Jannik Vogel
86d31328c3 Script: 00BD (Print Message Soon) 2016-06-27 02:05:34 +02:00
Jannik Vogel
37e0ba943e Script: 008C (Floor Float To Int) 2016-06-27 01:44:51 +02:00
Jannik Vogel
089d0efe5b Script: 0069 (Multiply Global Float by Global Float) 2016-06-27 01:44:51 +02:00
Jannik Vogel
3869cd608a Script: 0058 (Increment Global Integer by Global Integer) and 0059 (Increment Global Float by Global Float) 2016-06-27 01:44:51 +02:00
Jannik Vogel
9042e235a8 Script: 003A (Global Int Equal to Global Int) 2016-06-27 01:44:51 +02:00
Jannik Vogel
004f42504a Script: 001F (Local Int Greater than Global Int) 2016-06-27 01:44:50 +02:00
Jannik Vogel
6f49cc579a Script: 0010 (Multiply Global Int by Int) and 0014 (Divide Global by Integer) 2016-06-27 01:44:50 +02:00
Jannik Vogel
709cbc5686 Fix vm_int_ge_global_int and vm_global_int_eq_int 2016-06-27 01:44:50 +02:00
Jannik Vogel
3789a8454d Fix game_add_location_blip by using realValue() 2016-06-27 01:44:50 +02:00
Jannik Vogel
ae7b70bed9 Introduce realValue() to load script real from var or immediate automaticly 2016-06-27 01:44:50 +02:00
haphzd
593aa73bda Use existing file loading method for SCM 2016-06-26 13:25:26 +03:00
haphzd
e82be612a1 Open binary files in binary mode 2016-06-26 13:24:43 +03:00
Jannik Vogel
cf33ef8ca6 Hardwire sub-mission button in is_button_pressed to player->isRunning() 2016-06-25 23:40:12 +02:00
Daniel Evans
a58486fc4f Merge pull request #147 from danhedron/fix/script-opcode-1
Fix opcodes 0x0213 & 0x032B
2016-06-25 22:34:43 +01:00
Daniel Evans
4568a2aebb Merge pull request #155 from aap/feature-vertex-colours
Implemented proper RW-style shading for world objects, in particular …
2016-06-25 21:48:02 +01:00
Daniel Evans
fddc254812 Re-enable opcode 0x3DD: required opcode 0x32B now implemented 2016-06-25 21:35:34 +01:00
Daniel Evans
9307dedbbe 0x32B: Implement additional pickup opcode 2016-06-25 21:34:57 +01:00
Daniel Evans
75fd42e29b Add GameWorld::createPickup() and improve opcode 0x213 implementation 2016-06-25 21:33:37 +01:00
Daniel Evans
4ff4515ad7 add getModel to ScriptArguments to lookup script models 2016-06-25 20:39:01 +01:00
Daniel Evans
f2eaa05759 Improve integerValue function for script parameters 2016-06-25 20:38:38 +01:00
Daniel Evans
9aaeb2ceda Remove screenshot functionality, as it's broken. 2016-06-23 22:43:00 +01:00
aap
a01e190c6a Implemented proper RW-style shading for world objects, in particular vertex colours 2016-06-23 23:29:52 +02:00
Jannik Vogel
9bfb9f8002 CMake: Use FindSDL2.cmake 2016-06-22 23:58:27 +02:00
Christoph Heiss
3281e31dda Fix build on OS X 2016-06-22 12:32:10 +02:00
Christoph Heiss
649f7b144d Replace SFML with SDL2
This entirely replaces all remaining SFML pieces with SDL2 and
brings OpenRW up to OpenGL 3.3
2016-06-22 12:29:39 +02:00
Christoph Heiss
938a2e4bfc Introduce Renderer::readPixels
This is needed for taking screenshots.
2016-06-22 11:14:47 +02:00
Jannik Vogel
3400603f64 Script: 0243 (Set Character Personality) 2016-06-16 01:04:05 +02:00
Jannik Vogel
45d22e42bb Script: 01CC (Set Character Objective to Kill Player by Any Means) 2016-06-16 01:03:54 +02:00
Jannik Vogel
e961ff26cc Script: 039C (Set Car Watertight) 2016-06-16 01:03:47 +02:00
Jannik Vogel
e731f8d989 Script: 02AA (Set Car Only Damageable by Player) 2016-06-16 01:03:47 +02:00
Jannik Vogel
a19e10e26d Script: 00AF (Set Vehicle Objective) 2016-06-16 01:03:47 +02:00
Jannik Vogel
e2afae66ea Script: 0227 (Get Vehicle Health) 2016-06-16 01:03:47 +02:00
Jannik Vogel
cdb67956ee Script: 01C8 (Create Character as Passenger) 2016-06-16 01:03:47 +02:00
Jannik Vogel
95390d5fb3 Script: 02BF (Is Vehicle in Water) 2016-06-16 01:03:47 +02:00
Jannik Vogel
490f5f2cb0 Script: 01AD (Locate Vehicle Near Point 2D) 2016-06-16 01:03:47 +02:00
Jannik Vogel
7fbdc0d86f Script: 03DD (Add Sprite Blip for Pickup) 2016-06-16 01:03:46 +02:00
Jannik Vogel
0944ab7dab Fix signedness warning in game_give_weapon_to_character 2016-06-16 01:03:46 +02:00
Daniel Evans
d8b46b24c0 Fix door closing logic to require door be open for a time 2016-06-15 22:11:07 +01:00
Daniel Evans
ff96a460a0 Implement carjacking 2016-06-15 22:05:00 +01:00
Daniel Evans
ce4d5061e8 Merge pull request #141 from danhedron/fix/opcodes-1
Fix opcodes 0121 & 0395
2016-06-11 13:44:52 +01:00
Sam Nicholls
99ec7b5a6e Attempt to remove compiler warning //?? (#104)
* Attempt to remove compiler warning
2016-06-11 12:58:11 +01:00
Daniel Evans
636f0db9e5 0x395: Don't delete the player in game_clear_area 2016-06-10 08:13:56 +01:00
Daniel Evans
98d690a13f 0x0121: Use template to determine parameter type 2016-06-10 08:13:41 +01:00
Jannik Vogel
384f6bced8 Script: 0199 (Is Player In Area Or Cylinder) 2016-06-04 18:50:51 +02:00
Jannik Vogel
cfb5dfbf1d Script: 03BC and 03BD (Create Cylinder / Destroy Cylinder) 2016-06-04 18:50:51 +02:00
Jannik Vogel
a87df6579e Script: 0329 (Has Respray Happened) 2016-06-04 18:50:50 +02:00
Jannik Vogel
c5269eeb6a Script: 0335 (Set Free Respray) 2016-06-04 18:50:50 +02:00
Jannik Vogel
37dbd5a8ed Script: 0395 (Clear Area Vehicles and Pedestrians) 2016-06-04 18:50:50 +02:00
Jannik Vogel
340b2f7159 Don't replace nearby vehicles / characters on creation 2016-06-04 18:50:50 +02:00
Jannik Vogel
8bf6780e84 Spawn script cars on ground level 2016-06-04 18:50:50 +02:00
Daniel Evans
1f5fcb16ca Merge pull request #121 from JayFoxRox/improve-text
Improve text styles
2016-06-04 17:41:32 +01:00
Daniel Evans
5d203ee59c Merge pull request #122 from JayFoxRox/fix-fishgen
Fix FISHGEN
2016-06-04 17:31:48 +01:00
Jannik Vogel
6fda71329f Script: 03EC (Has Crane Collected All Cars) 2016-06-04 17:23:52 +02:00
Jannik Vogel
b7970c4915 Script: 03D4 (Import Garage Contains Needed Car) 2016-06-04 17:23:52 +02:00
Jannik Vogel
fbb02e14fb Load import / export garage lists from savegame 2016-06-04 17:23:52 +02:00
Jannik Vogel
ab130d3ba1 Fix typo for script opcode 03AD 2016-06-04 17:23:51 +02:00
Jannik Vogel
53ee6443ef Script: 01C2 (Mark Character as Unneeded) 2016-06-03 02:40:14 +02:00
Jannik Vogel
9c8f01629f Script: 011A (Set Character Search Threat) 2016-06-03 02:30:41 +02:00
Jannik Vogel
817247ed1e Script: 009C (Set Character Wander Path) 2016-06-03 02:30:41 +02:00
Jannik Vogel
63aae5a452 Script: 01B2 (Give Weapon to Character) 2016-06-03 02:30:41 +02:00
Jannik Vogel
8770f954c0 Support all text markup-colours 2016-06-02 19:11:22 +02:00
Jannik Vogel
823891a84e Fix shadow position for HighPriority-text 2016-06-02 18:58:09 +02:00
Jannik Vogel
5780aaa4f7 Document, improve and add all styles for Big-text 2016-06-02 18:58:09 +02:00
Jannik Vogel
6bb43324a2 Support negative shadow offsets for texts and force shadow colour 2016-06-02 18:57:54 +02:00
Jannik Vogel
87bed4cf0f Script: 021B (Set Target Car for Mission Garage) 2016-06-02 18:18:28 +02:00
Jannik Vogel
8c72bd33fb Script: 0422 (Garage Contains Car) 2016-06-02 18:18:28 +02:00
Jannik Vogel
52477013f3 Script: 021C (Is Car Inside Garage) 2016-06-02 18:18:28 +02:00
Jannik Vogel
f850e401cf Script: 02FB (Create Crusher Crane) 2016-06-02 18:01:36 +02:00
Jannik Vogel
830b295867 Make it more obvious that create_garage returns an index 2016-06-02 17:51:22 +02:00
Jannik Vogel
e5014e29f9 Add function to disable collision for InstanceObjects 2016-06-02 17:47:22 +02:00
Daniel Evans
42ef84998a Merge pull request #99 from JayFoxRox/fix-luigi3
Partially fix LUIGI3 (Drive Misty For Me)
2016-05-31 00:22:48 +01:00
Daniel Evans
ddb2457674 Merge pull request #98 from JayFoxRox/load-objects
Create object instances from savegame
2016-05-30 23:53:07 +01:00
Daniel Evans
bf8ea869fb Merge pull request #110 from JayFoxRox/flags-depth-write
Enable / Disable depth writing
2016-05-30 23:03:09 +01:00
Timmy Sjöstedt
4909e68b82 Added explanatory comments to MADStream 2016-05-30 23:44:42 +02:00
Timmy Sjöstedt
5a8b5a603f More alCheck calls 2016-05-30 20:06:34 +02:00
Timmy Sjöstedt
0d443cc535 Improved sound/music loading. No temporary objects 2016-05-30 20:06:34 +02:00
Timmy Sjöstedt
08b45b6c12 Sleep while waiting for OpenAL buffers to become available 2016-05-30 20:06:34 +02:00
Timmy Sjöstedt
d715cfe24a Make the right part of the code store the name of loaded audio
Otherwise game_play_music_id thinks that the audio hasn't loaded
2016-05-30 20:06:34 +02:00
Timmy Sjöstedt
ccabc6f1d8 Improved music map access 2016-05-30 20:06:33 +02:00
Timmy Sjöstedt
f40a0cf29f Make the SoundManager OpenAL context current 2016-05-30 20:06:33 +02:00
Timmy Sjöstedt
fef71de074 Removed SFML audio things 2016-05-30 20:06:33 +02:00
Timmy Sjöstedt
14e712f202 Wait for buffers to become available before uploading data 2016-05-30 20:06:33 +02:00
Timmy Sjöstedt
63986edca4 Make libmad decoder run in a thread 2016-05-30 20:06:33 +02:00
Timmy Sjöstedt
6a1a204728 Upload audio data to OpenAL 2016-05-30 20:06:33 +02:00
Timmy Sjöstedt
963f4c62ea Make cutscene audio use SoundManager 2016-05-30 20:06:33 +02:00
Timmy Sjöstedt
5294b40c40 Implement stopMusic method 2016-05-30 20:06:33 +02:00
Timmy Sjöstedt
861dbf0c2a Implemented playMusic method 2016-05-30 20:06:33 +02:00
Timmy Sjöstedt
6a14dc3e02 Implemented loadMusic method 2016-05-30 20:06:33 +02:00