Commit graph

111 commits

Author SHA1 Message Date
Robert Beckebans
08cb9730e3 Merge branch 'master' into vulkan 2019-11-19 21:29:16 +01:00
Robert Beckebans
4a6af2d609 Applied new Astyle settings 2019-11-11 20:27:44 +01:00
Jeffrey N. Johnson
07aa70f27e These changes allow the use of C++11. 2019-11-10 12:33:53 -08:00
Robert Beckebans
2c07265be5 Merge branch 'master' into IBL-environment-probes2 2019-10-30 10:38:44 +01:00
Robert Beckebans
1c9674e931 ImGui integration bugfixes 2019-10-28 15:39:00 +01:00
Robert Beckebans
a3e8b52170 Ported ImGui light editor from OpenTechBFG 2019-10-28 15:39:00 +01:00
Robert Beckebans
3709713d79 Solved IBL branch conflicts 2019-10-19 22:51:14 +02:00
Robert Beckebans
1e4292e52a Merged LordHavoc's image compression progress bar 2019-10-19 22:22:24 +02:00
Robert Beckebans
3f7cf5387d Version bump to 1.2.0 2019-10-14 20:11:58 +02:00
Robert Beckebans
d634243631 Don't convert JSON map files to JSON again. Only .map to .json 2018-11-03 14:36:03 +01:00
Robert Beckebans
98a13a2424 Generate vkGLSL if Vulkan is running otherwise GLSL 4.50 2018-10-07 16:42:28 +02:00
Robert Beckebans
4edf8b1c3b Added AMD's Vulkan Memory Allocator library 2018-10-06 17:55:32 +02:00
Robert Beckebans
a8ae629fcf Merged more renderer backend code from vkneo 2018-10-06 17:21:49 +02:00
Robert Beckebans
ee4ade8c11 Merge branch 'master' into vkdoom3-merge 2018-06-05 11:49:51 +02:00
Robert Beckebans
d75169010b
Merge pull request #382 from ensiform/x64-staticvar-fix
Static cvars incorrectly checking against wrong size on 64
2017-11-17 12:02:51 +01:00
Robert Beckebans
5c4764197a com_smp -1 mode for RenderDoc debugging 2017-09-10 17:28:27 +02:00
Robert Beckebans
38bcf14c7b killed globalImages->BindNull(). More cleanups from vkneo 2017-09-10 15:27:31 +02:00
Robert Beckebans
c91f8f4338 Merge branch 'master' into vkdoom3-merge 2017-09-03 10:32:19 +02:00
Robert Beckebans
e22837309b Merged LordHavoc's image compression progress bar
# Conflicts:
#	neo/framework/common_frame.cpp
2017-09-03 10:30:13 +02:00
Robert Beckebans
736ccadcb3 Started to move files so it can be compared to vkdoom3 2017-09-03 10:22:36 +02:00
Ensiform
29786cf420 Static cvars incorrectly checking against wrong size on 64
On 64-bit arch these checks are incorrect. the 0xFFFFFFFF is effectively UINT32_MAX rather than the pointer size. Changing to the unsigned integral pointer maximum seems like a better idea.

Fixes the warning, and corrects the code.
2017-07-30 22:30:25 -05:00
Jonathan Young
5368af9ad8 Fix playDemo running as fast as possible (like timeDemo). 2016-07-16 11:24:06 +10:00
Jonathan Young
ca0527f9a6 Merged Storm Engine 2 demo fixes. 2016-07-15 16:36:34 +10:00
Jonathan Young
42f93f5b0e Include json maps in command argument auto-complete. 2016-07-04 19:14:16 +10:00
Jonathan Young
9325c3672c Fix debug assert when auto-completing some command arguments. 2016-07-04 19:12:58 +10:00
Robert Beckebans
95de9c62a5 exportDecls command to export def/* stuff for Blender 2016-03-05 21:19:14 +01:00
Robert Beckebans
52b7775d83 Added support for new JSON based map format 2016-03-05 20:52:09 +01:00
Robert Beckebans
be556174e0 Merge branch 'master' into map-primitive-polygons-for-blender 2016-03-05 20:20:07 +01:00
Robert Beckebans
fa87f5465c Updated readme/release notes 2016-01-19 00:04:13 +01:00
Robert Beckebans
e2e4295556 Replaced r_multiSamples with r_antiAliasing to switch between SMAA, MSAA ( and TXAA future) 2015-12-30 12:07:24 +01:00
Robert Beckebans
5ed5b81161 Updated readme and release notes 2015-12-24 14:18:05 +01:00
Robert Beckebans
ab354c0ceb Defaulted fs_resourceLoadPriority to 0 2015-10-22 23:48:38 +02:00
Robert Beckebans
0ac909fe0a Dmap build BSP out of triangles instead of brushes 2015-04-12 11:53:54 +02:00
Robert Beckebans
06d0434f32 Improved modding support and loading of custom models/anims 2015-02-25 15:45:16 +01:00
Daniel Gibson
90b1ff0b65 Format Code with AStyle 2.05.1 2015-02-09 00:29:57 +01:00
Daniel Gibson
aa51d38b3c Support up to 16 mouse buttons (SDL-only)
Mostly necessary because SDL doesn't properly return mouse buttons X1/X2
on Linux/X11, see https://bugzilla.libsdl.org/show_bug.cgi?id=2310

Not sure if this is possible with Windows, DIMOFS_BUTTON7 seems to be
the highest constant there.

Also passing sdlevent.wheel.y directly as scroll delta
2015-01-28 17:32:35 +01:00
Robert Beckebans
d691002296 Bumped engine version to 1.0.3 to prepare for new release 2015-01-18 12:13:24 +01:00
Daniel Gibson
e37671d6ac Change SDL event-handling, mostly for keyboard input
Sys_GetEvent()
* renamed res_none to no_more_events, because that's what the
  caller assumes when getting that event
* don't return res_none on unhandled events, instead get the next event
  until there is a handled event or no more events
  (=> if -> while, return res_none -> continue)
* Mapping to Doom3 keynum handled differently for SDL1 vs SDL2, see below

For SDL2 we don't use SDL_KeyToDoom3Key on the keysym anymore, but map
the SDL2 scancode to Doom3/Direct-Input scancodes instead (the keynum_t
K_* constants are really used as scancodes!).

This mapping is done in sdl2_scancode_mappings.h scancodeToKeyNum[].
In sdl_events.cpp there are static SDLScanCodeToKeyNum() and
KeyNumToSDLScanCode() functions that use this scancodeToKeyNum[] array.

Sys_GetKeyName() now does something sensible for SDL2 by using
KeyNumToSDLScanCode()

This is also used to implement idKeyInput::LocalizedKeyName() for SDL-targets
(for SDL1.2 the behavior doesn't change much, though, as it doesn't have
consistent scancodes - Sys_GetKeyName() will just return NULL and
idKeyInput::LocalizedKeyName() will fall back to the old default)
2015-01-06 21:22:12 +01:00
Robert Beckebans
940d9f8a06 Formatted Code with AStyle 2014-11-25 11:42:08 +01:00
Wintermute0110
bc6cab3ab0 * SDL joystick/gamepad support implemented and working.
* Tested in Linux with both XBox360 wireless and Logitech F710 gamepads.
Should work with any XBox gamepad clone wired/wireless.
* Works well using SDL 1.2 or SDL 2.0
* SDL scan values are currently hard-coded. Note sure how to implement
remapping at the moment (config file, GUI, ...).
2014-11-21 02:47:21 +09:00
Wintermute0110
46180de310 * Some debug stuff (now commented in) used to debug joystick/gamepad events. 2014-11-20 06:13:07 +09:00
Tobias Frost
cbbf473d59 patch to use system's zlib when enabled by the CMake option USE_SYSTEM_ZLIB 2014-11-01 14:13:16 +01:00
Dan McGoo
2288ab82bb Fix loading saved game prior to commit 7e21048 crash.
Commit 7e21048 introduced a change in the save game files strutcure.
This makes the game crash whenever you load saved games created with a prior version of the code.
This commit tends to fix this issue.
However, save game files created between commit 7e21048 and the current one will not load correclty.
Unless the user change the saved game's saveVersion number in game.details.
2014-10-09 18:54:35 +09:00
Dan McGoo
8b28e50cd4 Write the renderprogs under the savepath.
Because under *nix systems, the basepath may be write protected for the user.
2014-10-07 23:20:20 +09:00
Robert Beckebans
72f986077b Removed unnecessary USERCMD_HZ. #129 2014-08-31 16:24:56 +02:00
BielBdeLuna
7e21048ba3 skipping cut scene working 2014-08-31 02:21:49 +02:00
BielBdeLuna
1f993688c6 image.h included 2014-08-25 16:13:16 +02:00
BielBdeLuna
fc7ed840bc astyle and other wonderbar stuff! 2014-08-25 15:25:54 +02:00
BielBdeLuna
095cf836c6 screen shots are PNG and envshots are TGA, but still envshots come out somewhat wrong 2014-08-19 11:35:50 +02:00
Robert Beckebans
352df659a8 Replaced ( void ) with () 2014-08-02 14:48:04 +02:00