Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: steshaw/sauerbraten
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: embeddedc/sauerbraten
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.

Commits on Jun 18, 2015

  1. bbinsideva fix

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5095 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jun 18, 2015
    Copy the full SHA
    9286133 View commit details
  2. endsp fix

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5096 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jun 18, 2015
    Copy the full SHA
    0be1857 View commit details

Commits on Jun 21, 2015

  1. editmode spawn fix

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5097 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jun 21, 2015
    Copy the full SHA
    cf8926d View commit details

Commits on Jun 22, 2015

  1. allowmove fix

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5098 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jun 22, 2015
    Copy the full SHA
    ebdd840 View commit details
  2. allowmove cleanup

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5099 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jun 22, 2015
    Copy the full SHA
    e729acb View commit details

Commits on Jun 29, 2015

  1. particle fixes

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5100 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jun 29, 2015
    Copy the full SHA
    4b88244 View commit details

Commits on Jul 9, 2015

  1. begin removal of fixed function and assembly render paths

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5101 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 9, 2015
    Copy the full SHA
    4a3bfae View commit details
  2. remove checkglslsupport

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5102 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 9, 2015
    Copy the full SHA
    4888375 View commit details
  3. vec cleanups

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5103 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 9, 2015
    Copy the full SHA
    db07f1a View commit details
  4. model tc cleanups

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5104 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 9, 2015
    Copy the full SHA
    4360a96 View commit details
  5. particle texcoord cleanups

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5105 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 9, 2015
    Copy the full SHA
    017ac00 View commit details
  6. vec2 cleanups

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5106 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 9, 2015
    Copy the full SHA
    c9d9319 View commit details
  7. ivec2 cleanups

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5107 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 9, 2015
    Copy the full SHA
    7009471 View commit details

Commits on Jul 10, 2015

  1. explosion cleanup

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5108 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 10, 2015
    Copy the full SHA
    c9582ae View commit details
  2. fogdome cleanup

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5109 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 10, 2015
    Copy the full SHA
    ed00eb2 View commit details
  3. assume has draw range elements

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5110 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 10, 2015
    Copy the full SHA
    1dbcac9 View commit details
  4. assume has vertex buffer object

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5111 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 10, 2015
    Copy the full SHA
    2f4ff9a View commit details
  5. assume has cubemaps

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5112 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 10, 2015
    Copy the full SHA
    953246a View commit details
  6. assume has occlusion queries

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5113 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 10, 2015
    Copy the full SHA
    8fbd171 View commit details
  7. remove some unused extension checks

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5114 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 10, 2015
    Copy the full SHA
    ef12949 View commit details
  8. set OpenGL 2.1 as minimum

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5115 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 10, 2015
    Copy the full SHA
    81779d1 View commit details
  9. assume has non-power-of-2 textures

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5116 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 10, 2015
    Copy the full SHA
    9bb9ce4 View commit details
  10. assume has texture compression

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5117 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 10, 2015
    Copy the full SHA
    a38cd22 View commit details
  11. don't use generate mipmap extension anymore

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5118 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 10, 2015
    Copy the full SHA
    14436ca View commit details
  12. don't use bindable uniform extension

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5119 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 10, 2015
    Copy the full SHA
    9eb87e9 View commit details
  13. remove old matrix skeletal animation path

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5120 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 10, 2015
    Copy the full SHA
    1ab20c3 View commit details
  14. ragdoll reljoints cleanup

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5121 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 10, 2015
    Copy the full SHA
    b133bd0 View commit details
  15. assume has blend equation

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5122 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 10, 2015
    Copy the full SHA
    dc168dc View commit details
  16. remove nvidia_scissor_bug

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5123 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 10, 2015
    Copy the full SHA
    5c40fb7 View commit details
  17. remove a fpdepthfx workaround

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5124 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 10, 2015
    Copy the full SHA
    0604ddb View commit details
  18. check for texture_rg extension

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5125 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 10, 2015
    Copy the full SHA
    bfc0bf1 View commit details
  19. remove ati_ubo_bug

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5126 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 10, 2015
    Copy the full SHA
    fe90cfa View commit details
  20. extension loading cleanups

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5127 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 10, 2015
    Copy the full SHA
    e49bb4f View commit details
  21. remove unnecessary tmu enables

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5128 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 10, 2015
    Copy the full SHA
    1411d7e View commit details
  22. remove some unused vslot data

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5129 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 10, 2015
    Copy the full SHA
    d40c10b View commit details

Commits on Jul 11, 2015

  1. shader parameter cleanups

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5130 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 11, 2015
    Copy the full SHA
    9e8a6ae View commit details
  2. fix gl typo

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5131 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 11, 2015
    Copy the full SHA
    63c1b8b View commit details
  3. shader fixes

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5132 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 11, 2015
    Copy the full SHA
    4db2da4 View commit details
  4. remove texffenv commands

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5133 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 11, 2015
    Copy the full SHA
    35e1bea View commit details
  5. water light fix

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5134 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 11, 2015
    Copy the full SHA
    7eb20ab View commit details
  6. dynlight fix

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5135 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 11, 2015
    Copy the full SHA
    3da8e6f View commit details
  7. gl version check fix

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5136 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 11, 2015
    Copy the full SHA
    af520d4 View commit details
  8. map: nmp9 revamp

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5137 07af1644-1164-4067-b897-63bf4dc9b748
    nieb committed Jul 11, 2015
    Copy the full SHA
    9e867d0 View commit details
  9. fogdome fixes

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5138 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 11, 2015
    Copy the full SHA
    cedb68f View commit details
  10. map: nmp9 revamp

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5139 07af1644-1164-4067-b897-63bf4dc9b748
    nieb committed Jul 11, 2015
    Copy the full SHA
    a62219e View commit details

Commits on Jul 12, 2015

  1. shader texcoord cleanups

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5140 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 12, 2015
    Copy the full SHA
    22ef759 View commit details
  2. movie recording fixes

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5141 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 12, 2015
    Copy the full SHA
    f3c4b3d View commit details
  3. model lighting fixes

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5142 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 12, 2015
    Copy the full SHA
    333480c View commit details
  4. model glare fix

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5143 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 12, 2015
    Copy the full SHA
    0b60546 View commit details
  5. lightdir cleanups

    git-svn-id: http://svn.code.sf.net/p/sauerbraten/code@5144 07af1644-1164-4067-b897-63bf4dc9b748
    eihrul committed Jul 12, 2015
    Copy the full SHA
    bc99882 View commit details
Showing 860 changed files with 100,380 additions and 53,225 deletions.
71 changes: 71 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
#####
# OS X temporary files that should never be committed
.DS_Store
*.swp
*.lock
profile

#####
# DotEnv files
.env

####
# Xcode temporary files that should never be committed
*~.nib

####
# Objective-C/Swift specific
*.hmap
*.ipa

####
# Xcode build files
DerivedData/
build/
Builds/

#####
# Xcode private settings (window sizes, bookmarks, breakpoints, custom executables, smart groups)
*.pbxuser
*.mode1v3
*.mode2v3
*.perspectivev3
!default.pbxuser
!default.mode1v3
!default.mode2v3
!default.perspectivev3

####
# Xcode 4
xcuserdata
!xcschemes
# Xcode 4
*.moved-aside

####
# XCode 4 workspaces - more detailed
!xcshareddata
!default.xcworkspace
*.xcworkspacedata


####
# Xcode 5
*.xccheckout
*.xcuserstate

####
# Xcode 7
*.xcscmblueprint

####
# AppCode
.idea/

####
# Other Xcode files
profile
*.hmap
*.ipa


Loading