nukeykt
|
3458a88f8e
|
Backport framelimitter fix
# Conflicts:
# source/rr/src/demo.cpp
# source/rr/src/game.cpp
# source/rr/src/net.cpp
# source/rr/src/screens.cpp
|
2019-09-21 10:26:47 +02:00 |
|
nukeykt
|
6fea4bf527
|
Fix compilation on linux
|
2019-09-21 10:24:13 +02:00 |
|
nukeykt
|
2762044313
|
Fix interpolation bitmap OOB issue
|
2019-09-21 10:21:26 +02:00 |
|
nukeykt
|
065cf13945
|
Fix in CanMove
|
2019-09-21 10:20:54 +02:00 |
|
nukeykt
|
ce43103ae9
|
Use engine's cstat defines
# Conflicts:
# source/blood/src/mapedit.cpp
|
2019-09-21 10:18:24 +02:00 |
|
nukeykt
|
9c5cbd6308
|
Delete pqueue.cpp
|
2019-09-21 10:18:20 +02:00 |
|
nukeykt
|
1561ffae9e
|
make PriorityQueue template class, and extend index field in EVENT struct
|
2019-09-21 10:17:04 +02:00 |
|
nukeykt
|
e4174d4f2d
|
Extend xobject reference field size to fit 16384 sprites/walls
|
2019-09-21 10:16:53 +02:00 |
|
Grind Core
|
dd79c66f20
|
Changes in adjustSprites
# Conflicts:
# source/blood/src/mapedit.cpp
# source/build/src/2d.cpp
|
2019-09-21 10:15:58 +02:00 |
|
nukeykt
|
599f086fd9
|
Xobjects editor wip
# Conflicts:
# source/blood/src/mapedit.cpp
|
2019-09-21 10:13:02 +02:00 |
|
nukeykt
|
2f49b549df
|
Oops
|
2019-09-21 10:11:02 +02:00 |
|
nukeykt
|
107a630883
|
Add TROR rendering
# Conflicts:
# source/blood/src/mapedit.cpp
# source/build/include/editor.h
# source/build/include/polymer.h
# source/build/src/build.cpp
# source/build/src/polymer.cpp
|
2019-09-21 10:11:02 +02:00 |
|
nukeykt
|
1fe344d273
|
Free cstat bit 14
# Conflicts:
# source/blood/src/mapedit.cpp
# source/build/src/build.cpp
# source/build/src/engine.cpp
# source/duke3d/src/astub.cpp
|
2019-09-21 10:10:15 +02:00 |
|
nukeykt
|
858da4351c
|
Semi-working map save
|
2019-09-21 10:08:04 +02:00 |
|
nukeykt
|
140174d1ee
|
Minor tweaks
# Conflicts:
# source/blood/src/m32common.cpp
# source/blood/src/mapedit.cpp
|
2019-09-21 10:08:04 +02:00 |
|
nukeykt
|
db5c628b34
|
Fix silly error with yax stuff
|
2019-09-21 10:07:11 +02:00 |
|
nukeykt
|
2867131c86
|
Add ability to load blood maps
# Conflicts:
# platform/Windows/nmapedit.vcxproj
# platform/Windows/nmapedit.vcxproj.filters
# source/blood/src/mapedit.cpp
# source/build/src/build.cpp
# source/build/src/engine.cpp
|
2019-09-21 10:06:57 +02:00 |
|
nukeykt
|
57e9ff2fbc
|
Move stuff around
# Conflicts:
# platform/Windows/nmapedit.vcxproj
# platform/Windows/nmapedit.vcxproj.filters
# source/blood/src/config.cpp
# source/blood/src/config.h
# source/blood/src/mapedit.cpp
# source/blood/src/screen.cpp
# source/blood/src/screen.h
|
2019-09-21 10:05:26 +02:00 |
|
nukeykt
|
381f5dcac2
|
Increase build objects count max size
# Conflicts:
# source/blood/src/mapedit.cpp
|
2019-09-21 10:04:03 +02:00 |
|
nukeykt
|
4e0a563cfe
|
Add macros.h
|
2019-09-21 10:03:34 +02:00 |
|
nukeykt
|
afff9ce61f
|
wip
# Conflicts:
# platform/Windows/nmapedit.vcxproj
# platform/Windows/nmapedit.vcxproj.filters
# source/blood/src/blood.cpp
# source/blood/src/blood.h
# source/blood/src/gui.cpp
# source/blood/src/m32def.cpp
# source/blood/src/m32def.h
# source/blood/src/m32exec.cpp
# source/blood/src/mapedit.cpp
|
2019-09-21 10:02:46 +02:00 |
|
nukeykt
|
8fd6e0e183
|
TROR related tweaks
# Conflicts:
# source/blood/src/mirrors.cpp
|
2019-09-21 09:59:58 +02:00 |
|
nukeykt
|
388bf2665f
|
Enable TROR code and rotated wall cstat bit for blood
|
2019-09-21 09:59:16 +02:00 |
|
nukeykt
|
fb59a49342
|
Fix mirrors in polymost
|
2019-09-21 09:50:34 +02:00 |
|
nukeykt
|
75d2e81e98
|
Move midi stuff to audiolib
# Conflicts:
# platform/Windows/eduke32.vcxproj
# platform/Windows/nblood.vcxproj.filters
# source/audiolib/include/al_midi.h
# source/audiolib/include/opl3.h
# source/audiolib/include/oplmidi.h
# source/audiolib/src/_al_midi.h
# source/audiolib/src/_oplmidi.h
# source/audiolib/src/al_midi.cpp
# source/audiolib/src/opl3.cpp
# source/audiolib/src/oplmidi.cpp
# source/duke3d/Dependencies.mak
# source/duke3d/src/sdlmusic.cpp
|
2019-09-21 09:37:07 +02:00 |
|
Christoph Oelckers
|
6942d4c50b
|
- added missing #define
|
2019-09-21 09:33:39 +02:00 |
|
Christoph Oelckers
|
afe5128c70
|
- Blood fixes for changes in timer and mouse input interface-
|
2019-09-20 22:08:06 +02:00 |
|
Christoph Oelckers
|
20f5972b9b
|
- fixed everything to compile again.
|
2019-09-20 19:37:29 +02:00 |
|
Christoph Oelckers
|
4189e9d287
|
- Function renaming
|
2019-09-20 16:00:14 +02:00 |
|
Christoph Oelckers
|
0254bf82d3
|
- added NBlood source.
|
2019-09-20 00:42:45 +02:00 |
|