ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
86,814 Commits 45 Branches 139 Tags
578a6794de9ba7679966fee9aec02c6b2bdbce94
Commit Graph
44 Commits
Author SHA1 Message Date
Willem Jan Palenstijn 6ec9c81b57 Merge branch 'master' into mm 
Conflicts:
	engines/access/access.cpp
	engines/access/asurface.h
	engines/access/bubble_box.cpp
	engines/access/bubble_box.h
	engines/access/martian/martian_game.cpp
	engines/access/player.cpp
	engines/access/player.h
	engines/access/resources.cpp
	engines/access/screen.cpp
	engines/access/screen.h
	engines/access/sound.cpp
	engines/access/sound.h
 2015-07-22 22:43:42 +02:00
Strangerke 452c5e59c5 ACCESS: Tex2 - Start implementing takePicture() 2015-02-04 22:22:50 +01:00
Strangerke 56754c2a9d ACCESS: MM - Make RMOUSE game-specific 2015-01-02 22:34:45 +01:00
Strangerke b2a4999f3c ACCESS: MM - Fix mouse cursor when y between 177 and 184, add a call to takePicture (not yet implemented) 2015-01-02 11:05:21 +01:00
Strangerke d1bc69426e ACCESS: Move variable from Room manager to local function 2014-12-22 19:41:40 +01:00
Strangerke fe627c5ce1 ACCESS: Fix spacing around semicolumn in class definitions 2014-12-17 21:31:26 +01:00
Strangerke 492d974550 ACCESS: Some more polishing in the file headers 2014-12-17 18:27:47 +01:00
Strangerke f968553329 ACCESS: Fix RoomInfo for the demo version, fix a typo in a comment 2014-12-12 22:56:11 -05:00
Paul Gilbert e332218568 ACCESS: Workaround for Exit/walk icon in massacre site scene 2014-12-12 22:50:54 -05:00
Paul Gilbert 3be3cb1ac2 ACCESS: Cleanup of room _function and river canoe movement 2014-12-12 22:49:16 -05:00
Paul Gilbert a0beb08984 ACCESS: Refactor _inactive from AccessEngine to AmazonEngine 2014-12-12 22:39:42 -05:00
Strangerke 237404fa70 ACCESS: Some more work on RIVER (still WIP) 2014-12-12 22:37:57 -05:00
Strangerke 4e1394c8e3 ACCESS: Fix intro countdown, add splashscreen and loading of scene 0 2014-12-12 22:33:28 -05:00
Paul Gilbert fddff687da ACCESS: Workaround for original game vertical room scrolling 2014-12-12 22:25:01 -05:00
Strangerke 2cc6d9299a ACCESS: Add a check to work around a difference in hardcoded data between the CD and the floppy version 2014-08-31 01:09:29 +02:00
Paul Gilbert 2cca520465 ACCESS: Add new support for mouse wheel for cycling through cursors 2014-08-30 11:52:48 -04:00
Strangerke 1568b4a433 ACCESS: Move Establish functions to Amazon engine, start implementing init4Quads 2014-08-26 23:55:17 +02:00
Paul Gilbert ee62d6c1cf ACCESS: In progress inventory display screen 2014-08-23 23:21:17 -04:00
Paul Gilbert 31c8a524a3 ACCESS: More implementation of CharManager 2014-08-23 13:13:56 -04:00
Paul Gilbert 7aa2c7fe5c ACCESS: Beginnings of character/converse manager 2014-08-23 12:09:27 -04:00
Paul Gilbert 966515a7d0 ACCESS: Fix room data loading for MM 2014-08-21 07:44:41 -04:00
Paul Gilbert 4e5eb04e47 ACCESS: Fix freeing player sprites when the scene changes 2014-08-20 20:22:35 -04:00
Paul Gilbert 17315a4dd7 ACCESS: Implemented wall checks for pathfinding 2014-08-18 00:29:01 -04:00
Strangerke 4ea9339d18 ACCESS: Implement cmdSetTex() 2014-08-17 22:42:28 +02:00
Paul Gilbert 404c7cd5d3 ACCESS: Split the bubble box code from Room into it's own file 2014-08-17 11:14:30 -04:00
Strangerke 3e61eb9cc3 ACCESS: Implement some opcodes 2014-08-17 11:16:31 +02:00
Paul Gilbert ff01ee6807 ACCESS: Added code for bubble box size calculations 2014-08-16 23:18:53 -04:00
Paul Gilbert 8d6c8ed452 ACCESS: Beginnings of code for text bubble drawing 2014-08-16 20:26:17 -04:00
Paul Gilbert a42e52fb5b ACCESS: Implemented code for clicking in room area 2014-08-16 17:24:22 -04:00
Paul Gilbert b3ab8a42a6 ACCESS: Implementing doCommand 2014-08-16 09:35:38 -04:00
Paul Gilbert 4a3ce2d27d ACCESS: Implementing checkScroll 2014-08-15 09:27:05 -04:00
Paul Gilbert 146f6b5df4 ACCESS: Fix rendering of scene background 2014-08-13 20:56:06 -04:00
Paul Gilbert 89772d55a5 ACCESS: Implemented window size fields setup and copyBF2Vid 2014-08-12 23:34:23 -04:00
Paul Gilbert b2596cab0e ACCESS: Implement loadPlayField 2014-08-10 18:36:34 -04:00
Paul Gilbert 1171400ccb ACCESS: Beginnings of animation manager 2014-08-09 15:54:35 -04:00
Paul Gilbert 52721cf2cb ACCESS: General cleanup of Room class 2014-08-07 22:04:01 -04:00
Paul Gilbert 6715bb0864 ACCESS: Move playField and tile data to Room class 2014-08-07 21:59:45 -04:00
Paul Gilbert 0c38730f3f ACCESS: Implement buildScreen 2014-08-07 21:54:22 -04:00
Paul Gilbert 0183007d0b ACCESS: Fixes for loading room data 2014-08-07 20:31:42 -04:00
Paul Gilbert bea93f3441 ACCESS: Implemented setupRoom method 2014-08-07 09:23:31 -04:00
Paul Gilbert 031cc32c84 ACCESS: Implemented room data loading 2014-08-06 22:43:40 -04:00
Paul Gilbert c4d6dc3763 ACCESS: Added room clearing 2014-08-06 08:28:20 -04:00
Paul Gilbert 8e43a6c528 ACCESS: Add scripts classes and Amazon room setup 2014-08-05 23:23:49 -04:00
Paul Gilbert 7d605ce573 ACCESS: Implement outer room handler 2014-08-05 22:17:30 -04:00