6 commits

Author	SHA1	Message	Date
Christoph Oelckers	68c97e3c25	Merge branch 'master' of https://github.com/coelckers/Raze ... # Conflicts: # source/core/gamecontrol.h # source/duke3d/src/game.cpp # source/exhumed/src/exhumed.cpp # source/rr/src/game.cpp	2020-05-31 23:30:10 +02:00
Mitchell Richters	f6068043d3	- Remove 'int paused' accidentally added to music.cpp in common back-end.	2020-05-31 23:19:54 +02:00
Mitchell Richters	7ed9f4fa8c	Prepare back-end for updated in-game pausing.	2020-05-31 23:19:54 +02:00
Christoph Oelckers	d52600663d	- backend sync with GZDoom to pull in a few bugfixes and formatting corrections.	2020-05-26 23:12:04 +02:00
Christoph Oelckers	c81e79e635	- fixed merge error.	2020-05-23 12:59:03 +02:00
Christoph Oelckers	cfe02cebf1	- moved music code to "common"	2020-05-23 12:37:47 +02:00