immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,149 Commits
19 Branches
15 Tags
59 MiB
Commit Graph

3149 Commits (6a0234edd5172f9eb3b2e241ef50584b92567fea)

Author SHA1 Message Date
krzys-h 073191d1ea Small CPathManager refactoring 2018-05-16 13:28:06 +02:00
krzys-h c218fcce98 Merge branch 'master' into dev 2018-05-16 11:55:15 +02:00
krzys-h 17447e813b Fix building of colobot.rc on Windows 2018-05-16 11:55:06 +02:00
José Robson Mariano Alves dbd1f601da Translation to Brazilian Portuguese 2018-05-15 18:31:41 -03:00
José Robson Mariano Alves be1066912f Translation to Brazilian Portuguese 2018-05-15 16:50:42 -03:00
José Robson Mariano Alves 2b933264fc Translation to Brazilian Portuguese 2018-05-15 16:07:03 -03:00
krzys-h cdb8a4871a Release 0.1.11.1-alpha: Bump version 2018-05-10 21:20:13 +02:00
krzys-h 12c969c71c Post-release 0.1.11.1-alpha 2018-05-10 21:20:13 +02:00
krzys-h af306c4790 Release 0.1.11.1-alpha: Merge branch 'dev' 2018-05-10 21:20:13 +02:00
krzys-h 7aaac449f5 Fix release script version override 
This fixes a bug in 94a18e9648
 2018-05-10 21:16:42 +02:00
krzys-h acc3362172 Update data submodule 2018-05-10 21:06:10 +02:00
krzys-h f538b4f477 What did I say about commiting in a hurry 2018-05-10 11:32:33 +02:00
krzys-h 12cf57409c Support more buttonX.png files in other places than just buttons 2018-05-10 11:24:59 +02:00
krzys-h 05bc65a90b Add support for more buttonsX.png textures (for modders) 2018-05-10 11:12:45 +02:00
krzys-h 8095dc14f7 Add support for custom button= for View cameras 2018-05-10 11:12:22 +02:00
krzys-h ed397d2b0f Make sure aliens hatched from eggs are not selectable by default, closes #1054 2018-05-09 23:25:52 +02:00
krzys-h 319d8e6854 Fix delete() not returning sometimes, closes #1067 2018-05-09 23:12:26 +02:00
AbigailBuccaneer e481905a25 Do less state setting in gl14 and gl21 2018-05-09 21:03:08 +01:00
AbigailBuccaneer c9a8a242a0 Remove CGL14Device's support for display lists 
Closes #1153.
 2018-05-09 21:03:08 +01:00
AbigailBuccaneer f8ebc6ec21 Remove code for drawing dynamic vertex formats 
It's unused, and it's a bad idea - it's important for authoring tools
and for performance that vertex formats are well-defined instead of
dynamically created.
 2018-05-09 21:03:08 +01:00
AbigailBuccaneer 94b30c00a0 Remove code duplication in CGLxxDevice 2018-05-09 21:03:08 +01:00
krzys-h 10fc47476b Fix code style 2018-05-09 18:34:27 +02:00
krzys-h 85772376fa Merge ScoreboardSortType with main Scoreboard command 2018-05-09 18:33:27 +02:00
krzys-h 1ed3f4b215 Add EndMissionTeams immediateWin=true; make the teams on win screen sorted 2018-05-09 18:28:25 +02:00
AbigailBuccaneer c027b54add Don't create a color renderbuffer for shadow map 
When rendering the shadow map offscreen using framebuffer objects, it's
not necessary to create a color renderbuffer. Currently
FramebufferParams only lets you choose between a renderbuffer and a
texture for both color and depth attachments. This changes that, and now
you can ask for a texture, a renderbuffer, or nothing.

This improves performance. On my computer, with an 8192x8192 shadow map,
this improves overall frame time by 8.0%.
 2018-05-09 17:25:52 +01:00
krzys-h abe489e294 Add EndMissionTimeout 2018-05-09 17:47:21 +02:00
krzys-h 94a18e9648 Add version override to release script 
NOT TESTED!
 2018-05-09 17:23:46 +02:00
krzys_h 761694fa05
Merge pull request #1161 from AbigailBuccaneer/fix/1160 
Fix -Wsuggest-override compile errors in tests
 2018-05-09 17:10:44 +02:00
AbigailBuccaneer 807d6e40e3 Fix -Wsuggest-override compile errors in tests 
Fixes #1160
 2018-05-09 08:49:23 +01:00
krzys-h a3def6d683 Disallow firendly fire in ScoreboardKillRule 2018-05-08 23:57:13 +02:00
krzys-h 0baf9f8077 Don't commit code in a hurry like that... 2018-05-08 23:47:50 +02:00
krzys-h f03c3dbc10 Implement ScoreboardObjectRule 2018-05-08 23:44:23 +02:00
krzys-h 05bdd74bef Update data submodule 2018-05-08 20:27:11 +02:00
krzys-h dd40c4d4ee Make magnifyDamage=0 for fragile objects actually work 
This fixes a bug in 36d2cf14b8
 2018-05-08 19:54:25 +02:00
krzys-h db72a36315 Fix code style 2018-05-08 19:44:24 +02:00
Fiftytwo caf58c8ab8 Merge branch 'dev' of https://github.com/colobot/colobot into dev 2018-05-07 21:48:48 +02:00
krzys_h 5283865a5c
Merge pull request #1136 from colobot/dev-cbot-optimizations 
Some CBot code optimizations
 2018-05-07 20:53:52 +02:00
krzys_h 182c4c5cbf
Merge pull request #1154 from AbigailBuccaneer/shadow-shimmering 
Fix shadow shimmering
 2018-05-07 20:53:28 +02:00
krzys_h a54f65f71b
Merge pull request #1152 from AbigailBuccaneer/consistent-shadow-antialiasing 
Improve shadow quality and performance in gl33
 2018-05-07 20:53:21 +02:00
krzys_h 50ed675acd
Merge pull request #1150 from AbigailBuccaneer/debug-rendering 
Add generic debug rendering functions
 2018-05-07 20:53:12 +02:00
krzys_h f146d2885b
Merge pull request #1149 from AbigailBuccaneer/tighter-visibility-checking 
Improve object visibility culling with tighter bounding spheres
 2018-05-07 20:53:00 +02:00
krzys_h 44f2684c70
Merge pull request #1148 from AbigailBuccaneer/text-batching 
Improve text rendering performance
 2018-05-07 20:52:50 +02:00
krzys-h 6e273e7e33 Declare CBotVar::m_token as const 2018-05-07 20:51:44 +02:00
krzys_h 05fe7431c4
Merge pull request #1143 from AbigailBuccaneer/fix/1087-positional-sounds 
Fix global sounds being positioned at camera
 2018-05-07 20:43:03 +02:00
krzys_h b36d40a509
Merge pull request #1151 from melex750/dev-savegame 
Fix saving/loading "NewScript" programs for factory bots
 2018-05-07 20:42:51 +02:00
krzys_h b9e2edce6c
Merge pull request #1146 from colobot/dev-scene-camera 
Implement viewpoint feature
 2018-05-07 20:42:18 +02:00
krzys_h 099a906b17
Merge pull request #1129 from colobot/dev-scoreboard-sort 
Add realtime scoreboard sorting
 2018-05-07 20:42:02 +02:00
krzys_h 35640b8e3f
Merge branch 'dev' into dev-scoreboard-sort 2018-05-07 20:41:40 +02:00
krzys-h 36d2cf14b8 Make magnifyDamage influence fragile objects 2018-05-07 20:31:36 +02:00
krzys-h 1d09ee9b3c Fix transportable object damage rules 
This makes the rules match the original Colobot like they were supposed to
 2018-05-07 20:31:36 +02:00