4337 Commits

Author SHA1 Message Date
Cong
d596d1d49b Add life powerup #71 2023-12-23 23:08:20 +11:00
Cong
ef0751e256 Pickup counts #71 2023-12-23 17:44:32 +11:00
Cong
57eeafede9 Add cyberdogs pickups #71 2023-12-22 22:32:32 +11:00
Cong
b870ddb5df Add random pickups #71
Adjust map objects in Cyberdogs campaign
2023-12-21 22:15:22 +11:00
Cong
bdaa038178 Fix weapon stats #71 2023-12-11 23:17:31 +11:00
Cong
ad639e1500 Fix lives going to 0 when replaying first mission 2023-12-09 23:28:26 +11:00
Cong
8164233874 Don't show switch gun chatter for NPCs 2023-12-09 20:44:51 +11:00
Cong
0a8b0c42c5 Fast enemies #71 2023-12-02 15:57:06 +11:00
Cong
81b19746fe Fix memory leak screens not terminating 2023-11-30 23:47:40 +11:00
Cong
cb89d8bcf3 AI melee guns #71 2023-11-29 23:17:57 +11:00
Cong
5df151b4c2 Move and shoot #71 2023-11-28 19:38:36 +11:00
Cong
adebcefbd2 Enemy health and speed #71 2023-10-26 23:38:22 +11:00
Avinash Sonawane
0daf4c50b5 Fix CMakeLists formatting as per recommended practices (#824)
* Convert CMake-language commands to lower case

* Remove CMake-language block-end command arguments

* Ignore `share` dir and executables from out-of-source builds too

* Don't git-ignore src/cdogs/enet/include/

* Use include(CTest) which automatically invokes enable_testing()
2023-10-17 12:04:10 +11:00
Cong
97dcd9aad8 Merge branch 'master' of https://github.com/cxong/cdogs-sdl 2023-10-14 14:27:24 +09:00
Cong
b1c2c560ed Fix osx run errors 2023-10-14 14:27:13 +09:00
nads
36027ca747 fixed arrows to be closer to the player (#822) 2023-10-14 16:26:25 +11:00
Cong
51d2f8fd04 Level colours #71 2023-10-05 23:19:42 +11:00
Cong
7a9d5c7e1b Fix placement of random special chars 2023-10-04 23:39:23 +11:00
Cong
41d93e4238 Add enemies #71 2023-10-04 23:13:10 +11:00
Cong
29710427cf Add objectives #71
Fix mission copy not copying some flags
Show mission copied message box in editor
2023-09-19 21:04:23 +10:00
zhang.jiujiu
e3ae896a86 Fix for CVE-2023-33460
https://github.com/lloyd/yajl/issues/250#issuecomment-1628695214

Origin: 23a122edda
        3d65cb0c6d.patch
Bug: https://github.com/lloyd/yajl/issues/250
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1039984
2023-09-18 21:00:28 +10:00
Petr Písař
d78dc961f2 Fix CVE-2022-24795
There was an integer overflow in yajl_buf_ensure_available() leading
to allocating less memory than requested. Then data were written past
the allocated heap buffer in yajl_buf_append(), the only caller of
yajl_buf_ensure_available(). Another result of the overflow was an
infinite loop without a return from yajl_buf_ensure_available().

yajl-ruby project, which bundles yajl, fixed it
<https://github.com/brianmario/yajl-ruby/pull/211> by checking for the
integer overflow, fortifying buffer allocations, and report the
failures to a caller. But then the caller yajl_buf_append() skips
a memory write if yajl_buf_ensure_available() failed leading to a data
corruption.

A yajl fork mainter recommended calling memory allocation callbacks with
the large memory request and let them to handle it. But that has the
problem that it's not possible pass the overely large size to the
callbacks.

This patch catches the integer overflow and terminates the process
with abort().

https://github.com/brianmario/yajl-ruby/security/advisories/GHSA-jj47-x69x-mxrm

Origin: 23cea2d767
Bug: https://github.com/lloyd/yajl/issues/239
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1040036
2023-09-18 21:00:28 +10:00
Brian Lopez
2bd585775a Don't advance our end pointer until we've checked we have enough buffer left and have peeked ahead to see that a unicode escape is approaching.
Thanks @kivikakk for helping me track down the actual bug here!

Fixes: CVE-2017-16516
Origin: a8ca8f4766
Bug: https://github.com/lloyd/yajl/issues/248
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1040036
2023-09-18 21:00:28 +10:00
Cong
12d57f832b Debug github workspace #763 2023-09-17 15:12:40 +10:00
Cong
f740890d91 Add reactor #71
Place destroy objectives using strict mode initially
2023-09-01 22:56:59 +10:00
Cong
3d2bace0ae Fix destroy objective flags, drawing #819 2023-08-21 22:34:07 +09:30
Cong
e7b7c57082 Support multiple destroy object types (fixes #819)
Also increase max objective count to 1000, add shift-click modifying objective counts
2023-08-21 22:23:40 +09:30
Cong
c71ba65059 Add decorative objects #71 2023-08-11 19:20:01 +10:00
Cong
8cf989d2a8 Replace blue barrels with cabinets #71 2023-08-10 22:14:02 +10:00
Cong
36fe687a1c Don't drop ammo if we can buy and sell #71 2023-08-08 21:13:46 +10:00
Cong
6d27a66464 Replace some cyberdogs map objects so they don't spawn items #71 2023-08-08 21:09:59 +10:00
Cong
92cbaa267a Fix prox mine not dropped at feet (fixes #812) 2023-08-07 21:31:37 +10:00
Cong
c5c4a949ef Fix cyberdogs using wrong fists weapon #71 2023-07-29 13:58:16 +10:00
Cong
37159df0b8 Version 1.5.0 1.5.0 2023-07-28 21:04:34 +10:00
Cong
03603e8791 Update gif in README.md 2023-07-27 23:37:31 +10:00
Cong
7c3ace505b License fixes 2023-07-27 23:11:40 +10:00
Reiner Herrmann
a47964d04b license updates 2023-07-27 23:11:40 +10:00
Cong
415e286011 Fix zapper sprite outside grid (fixes #796) 2023-07-27 23:10:33 +10:00
Cong
5ca79945f0 Fix gas bombs ammo icon (fixes #795) 2023-07-21 23:22:46 +10:00
Cong
48f6e8af6f Add cwolf license 2023-07-17 19:25:02 +10:00
Cong
8054bbdfd9 Update package_r.txt 2023-07-17 19:25:02 +10:00
Cong
285421fe52 Replace hits gas sound 2023-07-17 19:25:02 +10:00
Cong
8fdea5c54b Replace explosion_small 2023-07-17 19:25:02 +10:00
Reiner Herrmann
eb5c198396 Update some licenses 2023-07-17 19:25:02 +10:00
Cong
01d166204d Add tests 2023-07-13 12:31:16 +10:00
Kurtsley
8bd36fb634 Fix normal guns in melee slot 2023-07-13 12:31:16 +10:00
Cong
477e5ffd2a Use button macros 2023-07-09 21:44:40 +10:00
Cong
526859a7c6 Fix players not having any grenades
Don't generate characters with too many head parts
2023-07-08 23:10:38 +10:00
Cong
746ebf8aa7 Fix bullets like inkvine not falling down
Make bullets fall down by default
2023-07-07 22:23:28 +10:00
Cong
f93ba187dd Fix coop AI players not skipping equip menu 2023-07-07 21:44:58 +10:00