Randy Heit 4deeb8d8ae Merge branch 'master' into scripting ... Conflicts: src/actor.h src/g_doom/a_doomweaps.cpp src/p_local.h src/p_map.cpp src/sdl/i_main.cpp src/thingdef/thingdef_codeptr.cpp		2013-06-25 19:28:25 -05:00
..
afxres.h
boing1.ico
boing2.ico
boing3.ico
boing4.ico
boing5.ico
boing6.ico
boing7.ico
boing8.ico
critsec.h
deadguy.bmp
eaxedit.cpp
fb_d3d9.cpp	- Moved all BorderNeedRefresh and SB_state updating code into separate functions that won't crash if screen is NULL.	2013-02-27 03:10:25 +00:00
fb_d3d9_wipe.cpp
fb_ddraw.cpp	- Added vid_maxfps cvar to limit the frame rate to some arbitrary rate between 35 and 1000 FPS. It	2012-09-16 04:40:56 +00:00
hardware.cpp
hardware.h	- Added vid_maxfps cvar to limit the frame rate to some arbitrary rate between 35 and 1000 FPS. It	2012-09-16 04:40:56 +00:00
helperthread.cpp
helperthread.h
i_cd.cpp
i_crash.cpp	- Use gitinfo.h instead of svnrevision.h for versioning.	2013-06-22 21:49:51 -05:00
i_dijoy.cpp
i_input.cpp
i_input.h
i_keyboard.cpp
i_main.cpp	Merge branch 'master' into scripting	2013-06-25 19:28:25 -05:00
i_mouse.cpp	- Unraveled the want_native bit in I_CheckNativeMouse somewhat to ensure that it ends up false	2012-05-04 02:16:19 +00:00
i_movie.cpp
i_rawps2.cpp
i_system.cpp	- Use gitinfo.h instead of svnrevision.h for versioning.	2013-06-22 21:49:51 -05:00
i_system.h
i_xinput.cpp
icon1.ico
rawinput.h
resource.h
st_start.cpp	- fixed: The text screen's color #6 should be brown, not dark yellow.	2012-06-15 07:17:30 +00:00
win32iface.h	- Added vid_maxfps cvar to limit the frame rate to some arbitrary rate between 35 and 1000 FPS. It	2012-09-16 04:40:56 +00:00
win32video.cpp	- Added vid_maxfps cvar to limit the frame rate to some arbitrary rate between 35 and 1000 FPS. It	2012-09-16 04:40:56 +00:00
winres.h
zdoom.exe.manifest
zdoom.rc	- Use gitinfo.h instead of svnrevision.h for versioning.	2013-06-22 21:49:51 -05:00
zdoom.RES