Merge branch 'master' into remove-sdlnet
NOTE: dd_loop.c is still conflicted. It needs rewriting based on master'sdd_loop.c once the new core timer is available. LegacyCore will not beused in its present incarnation.
Conflicts: distrib/platform_release.py distrib/win32/dorel.bat doomsday/doomsday.pro doomsday/engine/engine.pro doomsday/engine/portable/src/dd_loop.c doomsday/engine/unix/src/dd_uinit.c
Added by skyjake over 12 years ago
Added by
Merge branch 'master' into remove-sdlnet
NOTE: dd_loop.c is still conflicted. It needs rewriting based on master's
dd_loop.c once the new core timer is available. LegacyCore will not be
used in its present incarnation.
Conflicts:
distrib/platform_release.py
distrib/win32/dorel.bat
doomsday/doomsday.pro
doomsday/engine/engine.pro
doomsday/engine/portable/src/dd_loop.c
doomsday/engine/unix/src/dd_uinit.c