zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
13,641 Commits 139 Branches 144 Tags 184 MiB
Commit Graph

13641 Commits

Author SHA1 Message Date
Rachael Alexanderson 6d43c5cdc6 Merge remote-tracking branch 'origin/friendly_window_title' 2017-11-24 14:41:25 -05:00
Rachael Alexanderson 5e29b1c89c Merge branch 'newtimercode4' 2017-11-24 14:39:58 -05:00
Rachael Alexanderson c80c2ba635 - added 100% CPU fix provided by Leonard2: https://forum.zdoom.org/viewtopic.php?p=1028500#p1028500 2017-11-24 14:38:55 -05:00
Christoph Oelckers ed871c3bf8 Merge remote-tracking branch 'remotes/origin/texman_models' 2017-11-24 19:14:08 +01:00
Rachael Alexanderson 297f00aa4b - fix model rotation some more 
- a couple compiler warning fixes
 2017-11-23 22:37:07 -05:00
Rachael Alexanderson 5181e3ebb2 - rewound time from 2917 to 2017. At least, at this point, we know ZDoom's future is secure. 2017-11-23 22:04:42 -05:00
Rachael Alexanderson 3842071b23 - implemented i_timescale to control the flow of time. 2017-11-23 21:54:04 -05:00
Rachael Alexanderson 1f00810f40 - re-doubled the model rotation code 2017-11-23 21:27:16 -05:00
Rachael Alexanderson 16e6fbf5bf - commit fix - todo: need to re-double/floatify the model timers again 2017-11-23 21:12:50 -05:00
Rachael Alexanderson fd5b8cdbf7 Merge remote-tracking branch 'origin/master' into newtimercode4 
# Conflicts:
#	src/gl/models/gl_models.cpp
 2017-11-23 21:08:09 -05:00
Magnus Norddahl 00d7dd0c64 - Implement model rendering in softpoly 2017-11-24 00:39:10 +01:00
Magnus Norddahl f1e7df542f - Create model renderer abstraction to share more model drawing between renderers 2017-11-24 00:38:52 +01:00
Christoph Oelckers 734f5104dd Merge branch 'master' of https://github.com/coelckers/gzdoom 2017-11-22 21:43:01 +01:00
Christoph Oelckers 978fdfb273 - tested and fixed UMAPINFO parser. 
Although this looks like it's working with the test file I used it still needs some stress testing!
 2017-11-22 21:42:48 +01:00
Magnus Norddahl e7e9d1a942 - Fixed bug introduced by removing a little bit too much from the rect drawers 2017-11-22 19:02:25 +01:00
Magnus Norddahl 9052ee6bc8 - Added scaled fuzz to softpoly pal drawer 2017-11-22 18:54:49 +01:00
Magnus Norddahl f04fca75f7 - Add scaled fuzz to softpoly sse2 drawer 2017-11-22 18:46:45 +01:00
Magnus Norddahl 4e4f94db2f - Implement newer scaled fuzz in softpoly's truecolor non-sse drawer 2017-11-22 06:32:55 +01:00
Magnus Norddahl 0ef8105e6b - Add missing r_draw.cpp in CMakeLists.txt 2017-11-21 18:57:44 +01:00
Rachael Alexanderson 495fc79fe9 - added dpJudas's drawer fix for the upscaled fuzz drawing 2017-11-21 05:26:46 -05:00
Rachael Alexanderson 505da5bf4f Merge branch 'master' of https://github.com/coelckers/gzdoom into newtimercode4 2017-11-21 05:23:00 -05:00
Rachael Alexanderson 47e9975e90 - fixed a couple of fixes from the previous commit 2017-11-21 05:20:02 -05:00
Rachael Alexanderson 2bc86b52c8 - fixed a few of the more obvious logic errors 2017-11-21 04:06:24 -05:00
Magnus Norddahl 5532266b14 - Fix softpoly sprite positioning bug 2017-11-20 22:43:44 +01:00
Christoph Oelckers 6389b6b914 - UMAPINFO parser, including some convenience additions to FScanner. 
Not tested yet!
 2017-11-19 23:04:15 +01:00
alexey.lysiuk cf9a364f71 textures for models 2017-11-19 18:02:14 +02:00
Christoph Oelckers f0dc619b5b - fixed bad use of FScanner::GetNumber and GetFloat in code inherited from ZDoomGL. 
This could lead to bad error messages if some malformed definitions were used.
 2017-11-19 15:30:45 +01:00
Rachael Alexanderson de19efa79d - trying again: fix shader targets being case sensitive 2017-11-19 04:48:30 -05:00
Rachael Alexanderson 351de94311 - fixed: Accidentally committed in-progress work... again 
Partial Revert "- fixed: Made shader targets not case sensitive"

This reverts commit 2c24d2e047.
 2017-11-19 04:46:52 -05:00
Rachael Alexanderson 2c24d2e047 - fixed: Made shader targets not case sensitive 2017-11-19 04:41:07 -05:00
Rachael Alexanderson f1405f68a7 Merge remote-tracking branch 'origin/master' into friendly_window_title 2017-11-18 14:08:33 -05:00
alexey.lysiuk c2b4efbea0 Fixed applying of brightmaps to overridden textures 
https://forum.zdoom.org/viewtopic.php?t=58444
 2017-11-18 17:07:42 +02:00
raa-eruanna 28d47d463f - fix linux compile 
# Conflicts:
#	src/posix/sdl/sdlvideo.cpp
 2017-11-18 08:20:58 -05:00
alexey.lysiuk 35bb9ba9d3 Implemented setting of window title in Cocoa backend 
# Conflicts:
#	src/posix/cocoa/i_video.mm
 2017-11-18 08:19:15 -05:00
Rachael Alexanderson c3c637a0cc - set i_friendlywindowtitle to true by default 2017-11-18 08:17:18 -05:00
alexey.lysiuk 80b47cafb4 Fixed detection of the first entry from internal IWADINFO 
https://forum.zdoom.org/viewtopic.php?t=58333
 2017-11-18 14:37:12 +02:00
Rachael Alexanderson e867d75712 Merge remote-tracking branch 'origin/master' into newtimercode4 2017-11-15 22:33:27 -05:00
Rachael Alexanderson e418663a26 - fixed: Reverted an accident in a previous commit where I_StartTic() was moved inappropriately. The new location fixed a mouse stutter, however, it causes net desyncs so it cannot be used here. 2017-11-15 22:20:55 -05:00
Rachael Alexanderson 909daadd75 - update more millisecond-storing data structures to u/int64_t to fix possible rollover bugs 2017-11-15 20:33:08 -05:00
Christoph Oelckers 16fa0cba21 - fixed comparison. 
The timer reset must also occur when the values are equal, meaning they got set during the same millisecond.
 2017-11-15 18:02:41 +01:00
Rachael Alexanderson ab32cb4c88 - track level start time for the shader system, reset the shaders. 2017-11-15 11:06:21 -05:00
Rachael Alexanderson d2bc24737b - put in timer resets for the shader system, so that they can continue being passed as floats 2017-11-14 22:46:28 -05:00
Rachael Alexanderson 0dcb1fe74c - fix zscript-side definition for Warp 2017-11-14 18:44:35 -05:00
Rachael Alexanderson 763222b571 - fixed: high uptime was causing overloads in uint32_t and float structures (float losing loss of precision) - this caused any computer online for more than a few days to experience jankiness with internal animations such as rotations and shader timers. Unfortunately, this sounds the death knell for 32-bit platforms, since uint64_t is now required in time-critical structures, which will hurt performance tremendeously, but 64-bit systems will be unaffected. 2017-11-14 16:15:25 -05:00
Christoph Oelckers 5935e14c09 - exported P_Thing_Warp to ZScript. 2017-11-13 21:00:17 +01:00
Christoph Oelckers 0323f54384 - rename I_FPSTime function. 
- now that the frame buffer stores its render time, the 'ms' return from I_GetTimeFrac is not needed anymore, we may just as well use the globally stored value instead.

The only feature this value was ever used for was texture warping.
 2017-11-13 00:54:32 +01:00
Christoph Oelckers 96e9eadd97 - removed I_MSTime entirely after checking how the wipe code actually works. 
Since this calls I_WaitVBL, which resets the frame time, it was essentially just like calling a real-time timer anyway and nothing in it required a specific 0-timepoint.
The same applies to the ZScript interface. All it needs is a millisecond-precise timer with no semantics attached.
 2017-11-13 00:38:04 +01:00
Christoph Oelckers 2c65f08011 - more timer cleanup 
* store the frame time in the current screen buffer from where all render code can access it.
* replace some uses of I_MSTime with I_FPSTime, because they should not use a per-frame timer. The only one left is the wipe code but even this doesn't look like it needs either a per-frame timer or a timer counting from the start of the playsim.
 2017-11-13 00:28:43 +01:00
Christoph Oelckers e94109f1c3 - Inside the renderer, use only the time value being passed to RenderView. 
The voxel rotation code of the software renderer and R_SetupFrame still called I_FPSTime directly.
 2017-11-12 23:53:46 +01:00
Christoph Oelckers f54475b1f1 - I_FPSTime may not return the time at frame start. 
This is used for real-time profiling and as such needs to return the current time or most of its uses will break.
 2017-11-12 23:39:48 +01:00