Commit graph

12200 commits

Author SHA1 Message Date
Rachael Alexanderson
f823c6ea3b Merge ../gzdoom 2017-11-23 22:39:52 -05: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
Rachael Alexanderson
339b2b8aec Merge branch 'master' of https://github.com/coelckers/gzdoom 2017-11-22 18:08:16 -05: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
2705bdbbdb Merge branch 'master' of https://github.com/coelckers/gzdoom 2017-11-21 05:28:51 -05: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
Rachael Alexanderson
93dbbb661f Merge remote-tracking branch 'gzdoom/texman_models' 2017-11-19 11:55:22 -05: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
5c6e62cf6b Merge remote-tracking branch 'gzdoom/master' 2017-11-19 04:41:48 -05:00
Rachael Alexanderson
2c24d2e047 - fixed: Made shader targets not case sensitive 2017-11-19 04:41:07 -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
4da9dbf864 - fix linux compile 2017-11-18 08:11:27 -05:00
alexey.lysiuk
b0fa21017b Implemented setting of window title in Cocoa backend 2017-11-18 07:42:17 -05:00
Rachael Alexanderson
0273b1a8cc - revert to before adding I_SetWindowTitle to DFrameBuffer 2017-11-18 07:42:15 -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
25ca640354 - attempt to fix Mac OS compile 2017-11-18 02:27:24 -05:00
raa-eruanna
2e2c6fd416 - fix compile on Linux 2017-11-18 02:20:55 -05:00
Rachael Alexanderson
027dc99348 - move I_SetWindowTitle to DFrameBuffer class 2017-11-18 01:33:11 -05:00
Rachael Alexanderson
906607df45 Revert "committing unsaved changes"
This reverts commit 613cb7728a.
2017-11-18 01:00:33 -05:00
Rachael Alexanderson
00de8880b8 - set i_friendlywindowtitle to true by default 2017-11-18 00:53:16 -05:00
Rachael Alexanderson
8bbb462276 Merge branch 'friendly_window_title' of ../gzdoom 2017-11-18 00:52:21 -05:00
Rachael Alexanderson
e9b98881c0 - implemented i_timescale to control the flow of time. 2017-11-18 00:50:22 -05:00
Rachael Alexanderson
d99732eeaa Revert "Merge branch 'newtimercode' of https://github.com/coelckers/gzdoom"
This reverts commit 277ad1e6ed, reversing
changes made to 0063118442.
2017-11-15 22:44:19 -05:00
Rachael Alexanderson
cccd19485a Merge remote-tracking branch 'gzdoom/newtimercode4' 2017-11-15 22:37:19 -05:00
Rachael Alexanderson
556974441e Revert "Merge ../gzdoom"
This reverts commit ee7ea6b9a2, reversing
changes made to c04b50c41f.
2017-11-15 22:36:47 -05: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