zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-12-25 20:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity
10528 commits 86 branches 139 tags 124 MiB
Commit graph

10528 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christoph Oelckers
36bf099d54 - fixed: object pointers as array members may not be skipped if they are null. 
- changed S_GetMusic to return a const pointer to the actual music name instead of a copy. The only thing this is used for is the savegame code and it has no use for a copy, it can work far more efficiently with a const pointer.
 2016-09-23 21:24:56 +02:00
Christoph Oelckers
02b3884dff - added copyright header to serializer.cpp. 2016-09-23 20:13:22 +02:00
Christoph Oelckers
e4924c3d47 - added some missing End... calls in player deserialization code. 
- fixed reading of music name.

In its current state the code is now capable of reading an E1M1 savegame and continuing play.
 2016-09-23 20:05:12 +02:00
Christoph Oelckers
d28d02839e - fixed: An actor's default stencil color should be set in DECORATE instead of doing some hackery elsewhere to compensate for the lack of initialization. 2016-09-23 19:19:26 +02:00
Christoph Oelckers
b844ab137e - added some comments about the special player treatment in hub travels because this is not really intuitive... 2016-09-23 18:12:38 +02:00
Christoph Oelckers
01d28e3eb2 - added the last missing bits of the savegame code - thinker list deserialization and handling of players during hub travel. Now testing is what remains... 2016-09-23 17:49:33 +02:00
Christoph Oelckers
edb7f7959e - re-enable some commented-out stuff. 2016-09-23 14:06:51 +02:00
Christoph Oelckers
86e9282193 - removed the sequential processing of JSON objects because the benefit is too small. 
After testing with a savegame on ZDCMP2 which is probably the largest map in existence, timing both methods resulted in a speed difference of less than 40 ms (70 vs 110 ms for reading all sectory, linedefs, sidedefs and objects).
This compares to an overall restoration time, including reloading the level, precaching all textures and setting everything up, of approx. 1.2 s, meaning an increase of 3% of the entire reloading time.
That's simply not worth all the negative side effects that may happen with a method that highly depends on proper code construction.
On the other hand, using random access means that a savegame version change is only needed now when the semantics of a field change, but not if some get added or deleted.

- do not I_Error out in the serializer unless caused by a programming error.

It is better to let the serializer finish, collect all the errors and I_Error out when the game is known to be in a stable enough state to allow unwinding.
 2016-09-23 14:04:05 +02:00
Christoph Oelckers
5a3f1dcdb6 - made reading of objects from the savegame work. 
It turned out this may not be done automatically when opening the savegame - it has to be done later, after the pre-spawned map thinkers and all connected objects have been destroyed.
The object deserializer also has to be rather careful about dealing with parse errors, because if something goes wrong a whole batch of uninitialized or partially initialized objects will be left behind to destroy.
This means that no object class may assume that anything but the default constructor has been run on it and needs to check any variable it may reference.
 2016-09-23 09:38:55 +02:00
Christoph Oelckers
a83ea4ddd2 - fixed two typos in property names. 2016-09-23 09:20:58 +02:00
Christoph Oelckers
cad2be46ac - fixed several Destroy methods which blanketly assumed that the object's pointers were valid to use without checks. 
This is not the case if deserialization prematurely aborts. The entire object may be invalid if something in the deserializer I_Error's out.
 2016-09-23 08:49:30 +02:00
Christoph Oelckers
657140f985 - fixed: The canvastexture serializer did not call EndArray to close the containing object. 2016-09-23 08:27:31 +02:00
Christoph Oelckers
4964f94de1 - added a destructor zo DFsScript, because if this gets deleted outside the GC process it'll leave an allocated buffer behind, so make sure it always gets destroyed. 2016-09-23 08:26:36 +02:00
Christoph Oelckers
f397a4943c - added OutputDebugString calls to I_Error functions in Win32, so that these messages can be seen in the debug output. 2016-09-23 08:14:40 +02:00
Christoph Oelckers
c17da32dbd - added object deserialization. It seems to work, at least the stuff I sampled looked like it was properly reatored and it triggers no error condition. 
- always make the top level object randomaccess when opening a JSON file for reading. Some things won't work right if this is opened for sequential access.
 2016-09-23 00:45:41 +02:00
Christoph Oelckers
604b2b316b - we need to save the OF_JustSpawned flag to insert thinkers into the proper list. 2016-09-22 21:17:34 +02:00
Christoph Oelckers
c22e8c50af - fixed some errors with parsing globals.json. It looks like this file is being processed correctly now. 2016-09-22 19:36:23 +02:00
Christoph Oelckers
d9dbf26f63 - do not list savegames for different IWADs. 2016-09-22 17:39:09 +02:00
Christoph Oelckers
f52e2a8cc4 - removed bogus BeginObject call in deferred script serializer. 2016-09-22 12:36:29 +02:00
Christoph Oelckers
d5b771afdd - fixed: Both array serializers need the bounds check. 2016-09-22 11:53:09 +02:00
Christoph Oelckers
68dc75bf9e - fixed: array clamping may only be done when reading a savegame. 
- fixed generation of savegame names for level snapshots.
 2016-09-22 11:51:29 +02:00
raa-eruanna
2a9e97688d Merge http://github.com/coelckers/gzdoom 2016-09-22 05:23:02 -04:00
Christoph Oelckers
e01965b747 - fixed deserialization of level.Scrolls. 2016-09-22 11:22:15 +02:00
Christoph Oelckers
18ee6353fa - let's be safe and set the proper texture mode for the fullscreen blend rect. I've got spurious reports that on some occasions it was rendered opaque. 2016-09-22 10:54:16 +02:00
Christoph Oelckers
1bddc277e6 - fixed winding of voxel polygons. 2016-09-22 10:28:14 +02:00
Christoph Oelckers
960ed5130c - fixed: DTA_ColorOverlay was not properly handled by F2DDrawer. 2016-09-22 10:20:36 +02:00
Christoph Oelckers
52d4c3970e - use glPOlygonOffset on non-translucent flat and wall sprites to avoid z-fighting. 2016-09-22 10:00:40 +02:00
Christoph Oelckers
0a98fb0be7 - integrated dynamic light definitions into regular DECORATE as another include. 
- renamed menudef.z zo menudef.zz.

This was done because some tool out there stupidly assume that *.z is some sort of archive and refuse to operate on these files (shame on you, Beyond Compare!)
 2016-09-22 09:32:04 +02:00
Christopher Bruns
2e8d2ed626 Implement vr_swap_eyes CVAR, now that side-by-side mode is mostly working. 2016-09-22 09:25:49 +02:00
Christopher Bruns
a1cbd39f3f Move call to Stereo3DMode.AdjustPlayerSprites into FGLRenderer.DrawPlayerSprites() 
(cherry picked from commit 5b5598d7d85c6bb8930e874d5d94cca835061bf0)
 2016-09-22 09:25:48 +02:00
Christopher Bruns
a5c27af59b Show weapon at full width in SideBySideFull 3D mode. 
(cherry picked from commit c42e98c0042937adc05c1f1569d909d58a5b8ffb)
 2016-09-22 09:25:48 +02:00
Christopher Bruns
7b8847c6be Update comment for other file. 2016-09-22 09:25:47 +02:00
Christopher Bruns
d10a0309ab Update header comment in gl_sidebyside3d source files 2016-09-22 09:25:47 +02:00
Christopher Bruns
1f79e23d5b Implement wide side-by-side mode, using adjusted aspect ratio in projection matrix. 
Use optimal framebuffer size for side-by-side modes.
 2016-09-22 09:25:46 +02:00
Christopher Bruns
9a257ac158 Implement side-by-side narrow 3D mode. 2016-09-22 09:25:46 +02:00
raa-eruanna
2339b18b01 Quick fix: prevents negative values being passed to pow. 2016-09-22 09:23:26 +02:00
raa-eruanna
72491049e0 Changes to the contrast/brightness/gamma formula for both hardware and shader gamma correction. Mainly makes a correction with the shader version where contrast/brightness being negative values would clip them inappropriately. 2016-09-22 09:23:25 +02:00
Magnus Norddahl
af699dcebc Make bloom/exposure less aggressive 2016-09-22 09:13:33 +02:00
Magnus Norddahl
f7b6b1433c Added exposure pass calculating the bloom/tonemap exposure based on what the eye is seeing 2016-09-22 09:13:32 +02:00
Christoph Oelckers
f0e8e860f1 Merge branch 'master' into json 2016-09-22 09:09:48 +02:00
Christoph Oelckers
1e6b99cebd Merge branch 'master' of https://github.com/rheit/zdoom 2016-09-22 09:06:34 +02:00
Christoph Oelckers
146b5d2d06 - use 'override' qualifier on renderer interface. 
Bad things can happen if these get changed in ZDoom without adapting to the change so better let the compiler handle this automatically.
 2016-09-22 09:06:21 +02:00
nashmuhandes
a49e15c541 Added REOPEN script type. These scripts behave just like OPEN scripts, except they will re-execute themselves every time the level is re-entered (ie as part of a hub). 2016-09-22 08:57:22 +02:00
LordMisfit
715aa80cf2 - Fix for DamageFactor bug w/ PowerDamage & PowerProtection 2016-09-22 08:52:43 +02:00
alexey.lysiuk
2d55f713c2 Fixed support for automatic graphics switching on macOS 
The corresponding setting in .plist is wrong but Xcode fixes it automatically
This doesn't happen however when building via makefiles
 2016-09-22 08:52:43 +02:00
Major Cooke
1383355be7 Removed the positive-only ripper level requirement. 
- Several mods were able to just take advantage of A_SetRipperLevel and the likes, essentially bypassing this gate so there really is no point in doing this anymore.
 2016-09-22 08:50:38 +02:00
raa-eruanna
76c5ff29fe If Inventory.MaxAmount > 1 on weapons, allow and track multiple pickups. 2016-09-22 08:47:23 +02:00
alexey.lysiuk
0a24c15445 Added ability to customize path to FluidSynth dynamic library 
Use fluid_lib CVAR to set path or default name of dynamic library will be used instead
 2016-09-22 08:43:00 +02:00
alexey.lysiuk
4f7e1f0171 FluisSynth dynamic library is now referenced by system specific name on macOS 2016-09-22 08:43:00 +02:00
raa-eruanna
bc0624e3b2 Fixed my error where I was using a local session variable rather than the proper user info for the weapon bob speed. 2016-09-22 08:42:59 +02:00