dca5f0e908
- Squashed commit of the following:
commit bc45fe3263d34ef5f746f524687999c19bf7b779
Author: Randy Heit <rheit@users.noreply.github.com>
Date: Sun Mar 1 18:51:05 2015 -0600
wave scale -> wave speed
commit ff96388b128c724c1198757bfa52f1935a263356
Author: Randy Heit <rheit@users.noreply.github.com>
Date: Sun Mar 1 18:45:32 2015 -0600
More sine quake fixes
commit 2a89749a6fe6d271b9fbdc218779f680afcf4cb6
Merge: 719dfbe 5456074
Author: MajorCooke <paul.growney22@gmail.com>
Date: Sat Feb 28 20:37:22 2015 -0600
Added QF_WAVE to A_QuakeEx.
- Changes the random quakes into a sine wave (see Shadow Warrior/Rise of the Triad reboots, Hard Reset, etc.)
- Added 3 properties to control waves per second along each individual axis. Only works with QF_WAVE.
- Intensity X/Y/Z property becomes the amplitude of the wave.
- Stacks with regular quakes, allowing shaking along the camera which must be called using A_QuakeEx WITHOUT the flag, or the other quaking functions.
- Uses the youngest quake's time for positioning.
commit 54560741581e8d15cc7060e8e068cf85e9a4b432
Author: MajorCooke <paul.growney22@gmail.com>
Date: Sat Feb 28 20:21:19 2015 -0600
Recommitted recommended changes by Randi, with some modifications. Now, we should be finished!
commit 6f4473013411686d88fc185bdc1cc58b1035b0f1
Author: MajorCooke <paul.growney22@gmail.com>
Date: Sat Feb 28 12:52:57 2015 -0600
Finish this revert.
commit 467e53f9400f588a2ada9b32e7634cb1f4ad5066
Author: MajorCooke <paul.growney22@gmail.com>
Date: Sat Feb 28 12:46:02 2015 -0600
Reverted back to what was working.
commit da9de56a67efda08036e481fd5fccd5392ce6810
Author: MajorCooke <paul.growney22@gmail.com>
Date: Thu Feb 26 18:53:20 2015 -0600
Forgot this bit, for testing.
commit c5093d9bb97caf8478cefc32abc56a036feeea58
Author: MajorCooke <paul.growney22@gmail.com>
Date: Thu Feb 26 18:52:46 2015 -0600
Some more progress, but...
- This did not solve anything. In fact, it did the opposite -- completely broke wave quakes. Now they only happen whenever a random quake is in progress.
- Left in the commented code on purpose so Randi can test it.
commit 7e526405d2127cbb279f66008c8f8e55a5d497f3
Author: MajorCooke <paul.growney22@gmail.com>
Date: Wed Feb 25 17:50:42 2015 -0600
- Use newest waveform timer, not oldest.
commit 1356443609dbc6c7f46e081d0846816dc0836124
Author: MajorCooke <paul.growney22@gmail.com>
Date: Wed Feb 25 17:32:09 2015 -0600
- Got regular quakes to multiply onto sine quakes, but the vice versa needs fixing too.
commit d95796c94c70cd0229d4a6d30f69e3a7568b9588
Author: MajorCooke <paul.growney22@gmail.com>
Date: Wed Feb 25 16:46:21 2015 -0600
- Last hurdle. Now just need to figure out how to properly scale up and down.
commit 4bc3458e689155ce72c09776604d9eb4fa73d8be
Author: MajorCooke <paul.growney22@gmail.com>
Date: Tue Feb 24 23:18:03 2015 -0600
- Fixed the quakes being unstackable.
commit b51012d6d4ea065bf7f6fc9c1a0472966491f7af
Author: MajorCooke <paul.growney22@gmail.com>
Date: Mon Feb 23 23:48:34 2015 -0600
QF_WAVE renamed from SINE.
- Lots of ground covered, but still more to go.
- Still need to figure out how to make the camera properly shudder.
commit 427e4893193470bbf45415ffec70a0b69b8cccfd
Author: MajorCooke <paul.growney22@gmail.com>
Date: Sun Feb 22 16:52:30 2015 -0600
- Begin the groundworks for QF_SINE.
- Need to figure out how to rework and manipulate the sine wave to move faster, and to allow going below 0 without breaking it too much.
104 lines
3.8 KiB
C
104 lines
3.8 KiB
C
/*
|
|
** version.h
|
|
**
|
|
**---------------------------------------------------------------------------
|
|
** Copyright 1998-2007 Randy Heit
|
|
** All rights reserved.
|
|
**
|
|
** Redistribution and use in source and binary forms, with or without
|
|
** modification, are permitted provided that the following conditions
|
|
** are met:
|
|
**
|
|
** 1. Redistributions of source code must retain the above copyright
|
|
** notice, this list of conditions and the following disclaimer.
|
|
** 2. Redistributions in binary form must reproduce the above copyright
|
|
** notice, this list of conditions and the following disclaimer in the
|
|
** documentation and/or other materials provided with the distribution.
|
|
** 3. The name of the author may not be used to endorse or promote products
|
|
** derived from this software without specific prior written permission.
|
|
**
|
|
** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
**---------------------------------------------------------------------------
|
|
**
|
|
*/
|
|
|
|
#ifndef __VERSION_H__
|
|
#define __VERSION_H__
|
|
|
|
const char *GetGitDescription();
|
|
const char *GetGitHash();
|
|
const char *GetGitTime();
|
|
const char *GetVersionString();
|
|
|
|
/** Lots of different version numbers **/
|
|
|
|
#define VERSIONSTR "2.8pre"
|
|
|
|
// The version as seen in the Windows resource
|
|
#define RC_FILEVERSION 2,7,9999,0
|
|
#define RC_PRODUCTVERSION 2,7,9999,0
|
|
#define RC_PRODUCTVERSION2 "2.8pre"
|
|
|
|
// Version identifier for network games.
|
|
// Bump it every time you do a release unless you're certain you
|
|
// didn't change anything that will affect sync.
|
|
#define NETGAMEVERSION 231
|
|
|
|
// Version stored in the ini's [LastRun] section.
|
|
// Bump it if you made some configuration change that you want to
|
|
// be able to migrate in FGameConfigFile::DoGlobalSetup().
|
|
#define LASTRUNVERSION "210"
|
|
|
|
// Protocol version used in demos.
|
|
// Bump it if you change existing DEM_ commands or add new ones.
|
|
// Otherwise, it should be safe to leave it alone.
|
|
#define DEMOGAMEVERSION 0x21B
|
|
|
|
// Minimum demo version we can play.
|
|
// Bump it whenever you change or remove existing DEM_ commands.
|
|
#define MINDEMOVERSION 0x21B
|
|
|
|
// SAVEVER is the version of the information stored in level snapshots.
|
|
// Note that SAVEVER is not directly comparable to VERSION.
|
|
// SAVESIG should match SAVEVER.
|
|
|
|
// MINSAVEVER is the minimum level snapshot version that can be loaded.
|
|
#define MINSAVEVER 3100
|
|
|
|
// Use 4500 as the base git save version, since it's higher than the
|
|
// SVN revision ever got.
|
|
#define SAVEVER 4521
|
|
|
|
#define SAVEVERSTRINGIFY2(x) #x
|
|
#define SAVEVERSTRINGIFY(x) SAVEVERSTRINGIFY2(x)
|
|
#define SAVESIG "ZDOOMSAVE" SAVEVERSTRINGIFY(SAVEVER)
|
|
|
|
// This is so that derivates can use the same savegame versions without worrying about engine compatibility
|
|
#define GAMESIG "ZDOOM"
|
|
#define BASEWAD "zdoom.pk3"
|
|
|
|
// More stuff that needs to be different for derivatives.
|
|
#define GAMENAME "ZDoom"
|
|
#define FORUM_URL "http://forum.zdoom.org"
|
|
#define BUGS_FORUM_URL "http://forum.zdoom.org/index.php?c=3"
|
|
|
|
#if defined(__APPLE__) || defined(_WIN32)
|
|
#define GAME_DIR GAMENAME
|
|
#else
|
|
#define GAME_DIR ".config/zdoom"
|
|
#endif
|
|
|
|
|
|
// The maximum length of one save game description for the menus.
|
|
#define SAVESTRINGSIZE 24
|
|
|
|
#endif //__VERSION_H__
|