 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
|
f60a4d3e71
|
ACCESS: MM - Fix the "android" watch dialog and animation
|
2015-01-21 00:26:11 +01:00 |
|
|
Strangerke
|
c810ee9a5a
|
ACCESS: MM - Make CharEntry version-dependent
|
2015-01-19 20:53:53 +01:00 |
|
|
Strangerke
|
04bc635dc7
|
ACCESS: Remove a couple of unused variables in CharManager
|
2014-12-22 19:06:56 +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 |
|
 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 |
|